增加搜索分类[特殊召唤]&[效果]不显示仪式和额外的卡

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

@@ -126,20 +126,10 @@ 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(effect){
-                if (!card.isType(CardType.Effect)) {
-                    return false;
                 }
             }
 
@@ -166,6 +156,18 @@ class CardSearchInfo {
                     if ((card.Type & type) != type) {
                         return false;
                     }
+                    //如果是效果怪兽
+                    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;
+                    }
+
                 }
             }
         }

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java

@@ -255,9 +255,9 @@ public class CardSearcher implements View.OnClickListener {
         initTypeSpinners(typeSpinner, new CardType[]{CardType.None, CardType.Monster, CardType.Spell, CardType.Trap});
         initTypeSpinners(typeMonsterSpinner, new CardType[]{CardType.None, CardType.Normal, CardType.Effect, CardType.Fusion, CardType.Ritual,
                 CardType.Synchro, CardType.Pendulum, CardType.Xyz, CardType.Link, CardType.Spirit, CardType.Union,
-                CardType.Dual, CardType.Tuner, CardType.Flip, CardType.Toon, CardType.Token
+                CardType.Dual, CardType.Tuner, CardType.Flip, CardType.Toon, CardType.Sp_Summon,CardType.Token
         });
-        initTypeSpinners(typeMonsterSpinner2, new CardType[]{CardType.None, CardType.Pendulum, CardType.Tuner, CardType.Effect, CardType.Normal
+        initTypeSpinners(typeMonsterSpinner2, new CardType[]{CardType.None, CardType.Pendulum, CardType.Tuner
         });
         initTypeSpinners(typeSTSpinner, new CardType[]{CardType.None, CardType.Normal, CardType.QuickPlay, CardType.Ritual,
                 CardType.Continuous, CardType.Equip, CardType.Field, CardType.Counter

mobile/src/main/java/ocgcore/enums/CardType.java

@@ -17,6 +17,7 @@ public enum CardType {
     Tuner(0x1000),
     Flip(0x200000),
     Toon(0x400000),
+    Sp_Summon(0x2000000),
 
     QuickPlay(0x10000),
     Continuous(0x20000),