增加检测口令&优化逻辑判断

Classes/ocgcore/field.cpp

@@ -1171,8 +1171,6 @@ void field::remove_effect(effect* peffect) {
 	} else {
 		if (peffect->type & EFFECT_TYPE_IGNITION)
 			effects.ignition_effect.erase(it);
-		else if (peffect->type & EFFECT_TYPE_ACTIVATE)
-			effects.activate_effect.erase(it);
 		else if (peffect->type & EFFECT_TYPE_TRIGGER_O)
 			effects.trigger_o_effect.erase(it);
 		else if (peffect->type & EFFECT_TYPE_TRIGGER_F)
@@ -1181,6 +1179,8 @@ void field::remove_effect(effect* peffect) {
 			effects.quick_o_effect.erase(it);
 		else if (peffect->type & EFFECT_TYPE_QUICK_F)
 			effects.quick_f_effect.erase(it);
+		else if (peffect->type & EFFECT_TYPE_ACTIVATE)
+			effects.activate_effect.erase(it);
 		else if (peffect->type & EFFECT_TYPE_CONTINUOUS)
 			effects.continuous_effect.erase(it);
 	}

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 33020621
+        versionCode 33020624
         versionName "3.3.2"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/main/java/cn/garymb/ygomobile/ui/plus/ServiceDuelAssistant.java

@@ -39,7 +39,20 @@ public class ServiceDuelAssistant extends Service {
 
     //是否可以移除悬浮窗上面的视图
     private boolean isdis = false;
-    String[] passwordPrefix = {"M,", "T,", "PR,", "AI,", "LF2,","M#", "T#", "PR#", "S#", "AI#","LF2#"};
+    String[] passwordPrefix = {
+            "M,", "m,",
+            "T,", "t,",
+            "PR,","pr,",
+            "AI,", "ai,",
+            "LF2,", "lf2,",
+            "M#", "m#",
+            "T#", "t#",
+            "PR#", "pr#",
+            "S#", "s#",
+            "AI#", "ai#",
+            "LF2#", "lf2#",
+            "R#","r#"
+    };
 
     //private List<Card> lc;