效果搜索

mobile/src/main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java

@@ -126,21 +126,22 @@ class CardSearchInfo {
         }
         if (types.length > 0) {
             boolean st = false;
+            boolean effect = false;
             for (long cardType : types) {
                 if (cardType == CardType.Spell.value() || cardType == CardType.Trap.value()) {
                     st = true;
                     break;
+                }else if(cardType == CardType.Effect.value()){
+                    effect = true;
+                    break;
                 }
             }
 
-            if(types.length == 2){
-                if(types[0] == types[1]){
-                    long type = types[0];
-                    if ((card.Type & type) != type) {
+            if(effect){
+                if (!card.isType(CardType.Effect)) {
                     return false;
                 }
             }
-            }
 
             for (long type : types) {
                 if (type > 0) {