Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 30f9ed2c authored by fallenstardust's avatar fallenstardust
Browse files
Options

判断deckinfo不为null再执行

parent 7bc09cfa
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 27 deletions
mobile/src/main/java/cn/garymb/ygomobile/loader/DeckLoader.java
View file @ 30f9ed2c
...@@ -133,49 +133,63 @@ public class DeckLoader { ...@@ -133,49 +133,63 @@ public class DeckLoader {
int code; int code;
isChanged = false; isChanged = false;
for (Integer id : deck.getMainlist()) { for (Integer id : deck.getMainlist()) {
if (released_code_list.contains(tmp.get(id).getCode())) {//先查看id对应的卡片密码是否在正式数组中存在 if (tmp.get(id) != null) {
code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode()));//替换成对应先行数组里的code if (released_code_list.contains(tmp.get(id).getCode())) {//先查看id对应的卡片密码是否在正式数组中存在
if (cardLoader.readAllCardCodes().get(code) != null) {//万一他还没下载扩展卡包就不执行否则会空指错误 code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode()));//替换成对应先行数组里的code
if (cardLoader.readAllCardCodes().get(code) != null) {//万一他还没下载扩展卡包就不执行否则会空指错误
tmp.set(id, cardLoader.readAllCardCodes().get(code));
}
}//执行完后变成先行密码，如果constants对照表里存在该密码，则如下又转换一次，确保正式更新后不会出错，最好发布app后必须及时更新在线对照表
if (ArrayUtil.contains(oldIDsArray, tmp.get(id).getCode())) {
code = ArrayUtil.get(newIDsArray, ArrayUtil.indexOf(oldIDsArray, tmp.get(id).getCode()));
tmp.set(id, cardLoader.readAllCardCodes().get(code)); tmp.set(id, cardLoader.readAllCardCodes().get(code));
isChanged = true;
} }
}//执行完后变成先行密码，如果constants对照表里存在该密码，则如下又转换一次，确保正式更新后不会出错，最好发布app后必须及时更新在线对照表 deckInfo.addMainCards(id, tmp.get(id), type == DeckItemType.Pack);
if (ArrayUtil.contains(oldIDsArray, tmp.get(id).getCode())) { } else {
code = ArrayUtil.get(newIDsArray, ArrayUtil.indexOf(oldIDsArray, tmp.get(id).getCode())); Log.w("deckreader", "Card is unexpectedly null for id: " + id);
tmp.set(id, cardLoader.readAllCardCodes().get(code));
isChanged = true;
} }
deckInfo.addMainCards(id, tmp.get(id), type == DeckItemType.Pack);
} }
tmp = cardLoader.readCards(deck.getExtraList(), true); tmp = cardLoader.readCards(deck.getExtraList(), true);
for (Integer id : deck.getExtraList()) { for (Integer id : deck.getExtraList()) {
if (released_code_list.contains(tmp.get(id).getCode())) { if (tmp.get(id) != null) {
code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode())); if (released_code_list.contains(tmp.get(id).getCode())) {
if (cardLoader.readAllCardCodes().get(code) != null) { code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode()));
if (cardLoader.readAllCardCodes().get(code) != null) {
tmp.set(id, cardLoader.readAllCardCodes().get(code));
}
}
if (ArrayUtil.contains(oldIDsArray, tmp.get(id).getCode())) {
code = ArrayUtil.get(newIDsArray, ArrayUtil.indexOf(oldIDsArray, tmp.get(id).getCode()));
tmp.set(id, cardLoader.readAllCardCodes().get(code)); tmp.set(id, cardLoader.readAllCardCodes().get(code));
isChanged = true;
} }
deckInfo.addExtraCards(tmp.get(id));
} else {
Log.w("deckreader", "Card is unexpectedly null for id: " + id);
} }
if (ArrayUtil.contains(oldIDsArray, tmp.get(id).getCode())) {
code = ArrayUtil.get(newIDsArray, ArrayUtil.indexOf(oldIDsArray, tmp.get(id).getCode()));
tmp.set(id, cardLoader.readAllCardCodes().get(code));
isChanged = true;
}
deckInfo.addExtraCards(tmp.get(id));
} }
tmp = cardLoader.readCards(deck.getSideList(), true); tmp = cardLoader.readCards(deck.getSideList(), true);
// Log.i("kk", "desk:" + tmp.size()+"/"+side.size()); // Log.i("kk", "desk:" + tmp.size()+"/"+side.size());
for (Integer id : deck.getSideList()) { for (Integer id : deck.getSideList()) {
if (released_code_list.contains(tmp.get(id).getCode())) { if (tmp.get(id) != null) {
code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode())); if (released_code_list.contains(tmp.get(id).getCode())) {
if (cardLoader.readAllCardCodes().get(code) != null) { code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode()));
if (cardLoader.readAllCardCodes().get(code) != null) {
tmp.set(id, cardLoader.readAllCardCodes().get(code));
}
}
if (ArrayUtil.contains(oldIDsArray, tmp.get(id).getCode())) {
code = ArrayUtil.get(newIDsArray, ArrayUtil.indexOf(oldIDsArray, tmp.get(id).getCode()));
tmp.set(id, cardLoader.readAllCardCodes().get(code)); tmp.set(id, cardLoader.readAllCardCodes().get(code));
isChanged = true;
} }
deckInfo.addSideCards(tmp.get(id));
} else {
Log.w("deckreader", "Card is unexpectedly null for id: " + id);
} }
if (ArrayUtil.contains(oldIDsArray, tmp.get(id).getCode())) {
code = ArrayUtil.get(newIDsArray, ArrayUtil.indexOf(oldIDsArray, tmp.get(id).getCode()));
tmp.set(id, cardLoader.readAllCardCodes().get(code));
isChanged = true;
}
deckInfo.addSideCards(tmp.get(id));
} }
//Log.w("deck.source", deckInfo.toLongString()); //Log.w("deck.source", deckInfo.toLongString());
return deckInfo; return deckInfo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment