将效果以外作为卡片类型子条件

mobile/assets/changelog.html

@@ -15,7 +15,7 @@
     特别感谢： 菜菜,尸体,废话多,大毛,龙道香姐,晓L,幻兽L 的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.6.2</li>
+    <li style="color:#ffff00">3.6.3</li>
 </ul>
 <pre>
     更新：

mobile/assets/data/conf/strings.conf

@@ -205,7 +205,7 @@
 !system 1074 灵摆
 !system 1075 特殊召唤
 !system 1076 连接
-!system 1077 非效果怪兽
+!system 1077 效果以外
 !system 1080 (N/A)
 !system 1081 额外怪兽区
 #GUI

mobile/assets_en/data/conf/strings.conf

@@ -205,7 +205,7 @@
 !system 1074 Pendulum
 !system 1075 Special Summon
 !system 1076 Link
-!system 1077 非效果怪兽
+!system 1077 Non-Effect
 !system 1080 (N/A)
 !system 1081 Extra Monster Zone
 #GUI

mobile/assets_ko/data/conf/strings.conf

@@ -205,7 +205,7 @@
 !system 1074 펜듈럼
 !system 1075 특수 소환
 !system 1076 링크
-!system 1077 非效果怪兽
+!system 1077 효과 이외의
 !system 1080 (N/A)
 !system 1081 엑스트라 몬스터 존
 #GUI

mobile/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 360200123
-        versionName "3.6.2"
+        versionCode 360300221
+        versionName "3.6.3"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true
         ndk {

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

@@ -41,11 +41,11 @@ class CardSearchInfo {
             }
         } else if (!TextUtils.isEmpty(prefixWord) && !TextUtils.isEmpty(suffixWord)) {
             boolean has = false;
-            int i1=-1,i2=-1,i3,i4;
+            int i1 = -1, i2 = -1, i3, i4;
             if (card.Name != null) {
-                 i1 = card.Name.indexOf(prefixWord);
-                 i2 = card.Name.indexOf(suffixWord);
-                if (i1 >= 0 && i2 >= 0 ) {
+                i1 = card.Name.indexOf(prefixWord);
+                i2 = card.Name.indexOf(suffixWord);
+                if (i1 >= 0 && i2 >= 0) {
                     has = true;
                 }
             }
@@ -53,9 +53,9 @@ class CardSearchInfo {
                 if (card.Desc != null) {
                     i3 = card.Desc.indexOf(prefixWord);
                     i4 = card.Desc.indexOf(suffixWord);
-                    if ((i3>=0&&i4>=0)
-                    ||(i3>=0&&i2>=0)
-                    ||(i1>=0&&i4>=0)){
+                    if ((i3 >= 0 && i4 >= 0)
+                            || (i3 >= 0 && i2 >= 0)
+                            || (i1 >= 0 && i4 >= 0)) {
                         has = true;
                     }
                 }
@@ -135,16 +135,16 @@ class CardSearchInfo {
 //                    break;
 //                }
                 //非效果怪兽
-                if (cardType==CardType.No_Effect.value()){
+                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()
-                                    )
+                            && (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) {
+                } else if ((card.Type & cardType) != cardType) {
                     return false;
                 }
             }

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

@@ -39,6 +39,11 @@ import ocgcore.enums.LimitType;
 
 public class CardSearcher implements View.OnClickListener {
 
+    final String[] BtnVals = new String[9];
+    protected StringManager mStringManager;
+    protected LimitManager mLimitManager;
+    protected AppsSettings mSettings;
+    int lineKey;
     private EditText prefixWord;
     private EditText suffixWord;
     private Spinner otSpinner;
@@ -48,7 +53,6 @@ public class CardSearcher implements View.OnClickListener {
     private Spinner typeMonsterSpinner;
     private Spinner typeMonsterSpinner2;
     private Spinner typeSTSpinner;
-
     private Spinner setcodeSpinner;
     private Spinner categorySpinner;
     private Spinner raceSpinner;
@@ -64,12 +68,6 @@ public class CardSearcher implements View.OnClickListener {
     private View layout_monster;
     private ICardLoader dataLoader;
     private Context mContext;
-    protected StringManager mStringManager;
-    protected LimitManager mLimitManager;
-    protected AppsSettings mSettings;
-
-    final String[] BtnVals = new String[9];
-    int lineKey;
 
     public CardSearcher(View view, ICardLoader dataLoader) {
         this.view = view;
@@ -252,9 +250,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.Sp_Summon, CardType.Token,CardType.No_Effect
+                CardType.Dual, CardType.Tuner, CardType.Flip, CardType.Toon, CardType.Sp_Summon, CardType.Token
         });
-        initTypeSpinners(typeMonsterSpinner2, new CardType[]{CardType.None, CardType.Pendulum, CardType.Tuner
+        initTypeSpinners(typeMonsterSpinner2, new CardType[]{CardType.None, CardType.Pendulum, CardType.Tuner, CardType.Non_Effect
         });
         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

@@ -10,7 +10,7 @@ public enum CardType {
     Pendulum(0x1000000L),
     Xyz(0x800000L),
     Link(0x4000000L),
-    No_Effect(0x8000000L),
+    Non_Effect(0x8000000L),
 
     Spirit(0x200),
     Union(0x400),