Skip to content

Y
YGOMobile
Commit 8b3e0b2d authored by feihuaduo's avatar feihuaduo
Browse files
Options

非效果怪兽卡查规则优化 

卡查主字段可搜索到子字段（例：英雄——元素英雄）
parent 7b7cc6b8
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 56 deletions
mobile/src/main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java
View file @ 8b3e0b2d
......@@ -130,64 +130,54 @@ class CardSearchInfo {
if (types.length > 0) {
boolean st = false;
for (long cardType : types) {
// if (cardType == CardType.Spell.value() || cardType == CardType.Trap.value()) {
// st = true;
// break;
// }
//非效果怪兽
if (cardType == CardType.Non_Effect.value()) {
//如果不是融合/仪式/同调/超量/连接
if ((card.Type & CardType.Fusion.value()) != CardType.Fusion.value()
&& (card.Type & CardType.Ritual.value()) != CardType.Ritual.value()
&& (card.Type & CardType.Synchro.value()) != CardType.Synchro.value()
&& (card.Type & CardType.Xyz.value()) != CardType.Xyz.value()
&& (card.Type & CardType.Link.value()) != CardType.Link.value()
if (cardType == CardType.Spell.value() || cardType == CardType.Trap.value()) {
st = true;
break;
}
}
for (long type : types) {
if (type > 0) {
if (st) {
//魔法
if (type == CardType.Normal.value()) {
//通常
if (card.isType(CardType.Normal)) {
//带通常的魔法陷阱
if (card.Type != (CardType.Spell.value() | CardType.Normal.value())
&& card.Type != (CardType.Trap.value() | CardType.Normal.value())) {
return false;
}
} else {
//只有魔法/陷阱
if (card.Type != CardType.Spell.value() && card.Type != CardType.Trap.value())
return false;
}
continue;
}
}
//如果是效果怪兽
if (type == CardType.Effect.value()) {
if ((card.Type & CardType.Effect.value()) == CardType.Effect.value()) {
//如果是融合/仪式/同调/超量/连接
if ((card.Type & CardType.Fusion.value()) == CardType.Fusion.value()
|| (card.Type & CardType.Ritual.value()) == CardType.Ritual.value()
|| (card.Type & CardType.Synchro.value()) == CardType.Synchro.value()
|| (card.Type & CardType.Xyz.value()) == CardType.Xyz.value()
|| (card.Type & CardType.Link.value()) == CardType.Link.value()
)
return false;
} else if ((card.Type & cardType) != cardType) {
return false;
}
}
//
// for (long type : types) {
// if (type > 0) {
// if (st) {
// //魔法
// if (type == CardType.Normal.value()) {
// //通常
// if (card.isType(CardType.Normal)) {
// //带通常的魔法陷阱
// if (card.Type != (CardType.Spell.value() | CardType.Normal.value())
// && card.Type != (CardType.Trap.value() | CardType.Normal.value())) {
// return false;
// }
// } else {
// //只有魔法/陷阱
// if (card.Type != CardType.Spell.value() && card.Type != CardType.Trap.value())
// return false;
// }
// continue;
// }
// }
// if ((card.Type & type) != type) {
// return false;
// }
// //如果是效果怪兽
// if (type == CardType.Effect.value()) {
// if ((card.Type & CardType.Effect.value()) == CardType.Effect.value()) {
// //如果是融合/仪式/同调/超量/连接
// if ((card.Type & CardType.Fusion.value()) == CardType.Fusion.value()
// || (card.Type & CardType.Ritual.value()) == CardType.Ritual.value()
// || (card.Type & CardType.Synchro.value()) == CardType.Synchro.value()
// || (card.Type & CardType.Xyz.value()) == CardType.Xyz.value()
// || (card.Type & CardType.Link.value()) == CardType.Link.value()
// )
// return false;
// }
// }
//
// }
// }
}
}else if (type == CardType.Non_Effect.value()) {
//非效果怪兽
if ((card.Type & CardType.Effect.value()) == CardType.Effect.value())
return false;
}else if ((card.Type & type) != type) {
return false;
}
}
}
}
//TODO setcode
if (setcode > 0) {
......
mobile/src/main/java/ocgcore/data/Card.java
View file @ 8b3e0b2d
......@@ -103,7 +103,11 @@ public class Card extends CardData implements Parcelable {
public boolean isSetCode(long _setcode) {
long[] setcodes = getSetCode();
for (long setcode : setcodes) {
if (setcode == _setcode) {
String setcode16=Long.toHexString(setcode);
if (setcode16.length()==4){
if (setcode16.endsWith(Long.toHexString(_setcode)))
return true;
}else if (setcode == _setcode) {
return true;
}
}
......
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