随机难度AI&初始化顺序整理

mobile/assets/changelog.html

@@ -22,12 +22,15 @@
 <pre>
     更新：
     1.更新ygo内核；
-    4.新卡SHVA+VJ；
+    2.增加AI按难易度随机加入功能；
+    3.新卡SHVA+CT15+VJ；
     修复：
     1.关键词输入数字无法搜索「No.」的问题；
+    2.部分机型打开残局闪退的问题；
     优化：
     1.属性、种族宣言时的易误触的问题；
     2.增加适配机型；
+    3.更新适配更能开关说明；
 </pre>
 </body>
 </html>
\ No newline at end of file

mobile/assets/data/conf/bot.conf

@@ -4,25 +4,40 @@
 # description
 # flags (avail flags: SUPPORT_MASTER_RULE_3, SUPPORT_NEW_MASTER_RULE)
 
+!随机-非常简单
+Random=AI_LV1
+主要是一些沙包。
+SUPPORT_NEW_MASTER_RULE
+
+!随机-简单
+Random=AI_LV2
+一些比较弱的卡组。
+SUPPORT_NEW_MASTER_RULE
+
+!随机-普通
+Random=AI_LV3
+一些环境里可以看到的卡组。
+SUPPORT_NEW_MASTER_RULE
+
 !谜之剑士LV4-龙骑星爆
 Name=谜之剑士LV4 Deck=Dragunity Dialog=swordsman.zh-CN
 龙骑轴星尘龙爆裂体卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !谜之剑士LV4-R5
 Name=谜之剑士LV4 Deck='Rank V' Dialog=swordsman.zh-CN
 5阶超量卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !谜之剑士LV4-异热同心武器
 Name=谜之剑士LV4 Deck='Zexal Weapons' Dialog=swordsman.zh-CN
 神装电光皇卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !琪露诺-彩虹
 Name=琪露诺 Deck=Rainbow Dialog=cirno.zh-CN
 全属性凡骨卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !琪露诺-饼蛙
 Name=琪露诺 Deck='Toadally Awesome' Dialog=cirno.zh-CN
@@ -32,7 +47,7 @@ SUPPORT_MASTER_RULE_3
 !复制植物-青眼
 Name=复制植物 Deck=Blue-Eyes Dialog=copy.zh-CN
 青眼卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !复制植物-十二兽
 Name=复制植物 Deck=Zoodiac Dialog=copy.zh-CN
@@ -42,64 +57,64 @@ SUPPORT_MASTER_RULE_3
 !尼亚-妖仙兽
 Name=尼亚 Deck=Yosenju Dialog=near.zh-CN
 妖仙兽卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !尼亚-机壳
 Name=尼亚 Deck=Qliphort Dialog=near.zh-CN
 机壳卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !尼亚-淘气仙星
 Name=尼亚 Deck=Trickstar Dialog=near.zh-CN
 淘气仙星卡组。
-SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE
 
 !永远之魂-削血
 Name=永远之魂 Deck=Burn Dialog=soul.zh-CN
 老式削血卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !永远之魂-青蛙
 Name=永远之魂 Deck=Frog Dialog=soul.zh-CN
 老式青蛙卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !永远之魂-荷鲁斯
 Name=永远之魂 Deck=Horus Dialog=soul.zh-CN
 老式龙族卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !悠悠
 Name=悠悠 Deck=MokeyMokey Dialog=mokey.zh-CN
 沙包。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !悠悠王
 Name=悠悠王 Deck=MokeyMokeyKing Dialog=mokey.zh-CN
 大沙包。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !试作型机器人1732
 Name=试作型机器人1732 Deck=ST1732 Dialog=zh-CN
 由三盒ST17和三盒SD32组成的卡组。
-SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_NEW_MASTER_RULE
 
 !奇異果
 Name=奇異果 Deck=LightswornShaddoldinosour Dialog=kiwi.zh-TW
 光道影依恐龙卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !奇魔果
 Name=奇魔果 Deck=DarkMagician Dialog=kiwi.zh-TW
 黑魔术师卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !燃血鬥士
 Name=燃血鬥士 Deck=ChainBurn Dialog=kiwi.zh-TW
 连锁烧卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !复制梁龙-闪刀姬
 Name=复制梁龙 Deck=SkyStriker Dialog=anothercopy.zh-CN
 纯闪刀姬卡组。
-SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE

mobile/assets/data/windbot/windbot/bot.conf

+#bots list
+# !name
+# command
+# description
+# flags (avail flags: SUPPORT_MASTER_RULE_3, SUPPORT_NEW_MASTER_RULE)
+
+!随机-非常简单
+Random=AI_LV1
+主要是一些沙包。
+SUPPORT_NEW_MASTER_RULE
+
+!随机-简单
+Random=AI_LV2
+一些比较弱的卡组。
+SUPPORT_NEW_MASTER_RULE
+
+!随机-普通
+Random=AI_LV3
+一些环境里可以看到的卡组。
+SUPPORT_NEW_MASTER_RULE
+
+!谜之剑士LV4-龙骑星爆
+Name=谜之剑士LV4 Deck=Dragunity Dialog=swordsman.zh-CN
+龙骑轴星尘龙爆裂体卡组。
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!谜之剑士LV4-R5
+Name=谜之剑士LV4 Deck='Rank V' Dialog=swordsman.zh-CN
+5阶超量卡组。
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!谜之剑士LV4-异热同心武器
+Name=谜之剑士LV4 Deck='Zexal Weapons' Dialog=swordsman.zh-CN
+神装电光皇卡组。
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!琪露诺-彩虹
+Name=琪露诺 Deck=Rainbow Dialog=cirno.zh-CN
+全属性凡骨卡组。
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!琪露诺-饼蛙
+Name=琪露诺 Deck='Toadally Awesome' Dialog=cirno.zh-CN
+大师规则三的全盛饼蛙卡组。
+SUPPORT_MASTER_RULE_3
+
+!复制植物-青眼
+Name=复制植物 Deck=Blue-Eyes Dialog=copy.zh-CN
+青眼卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!复制植物-十二兽
+Name=复制植物 Deck=Zoodiac Dialog=copy.zh-CN
+大师规则三的十四兽卡组。
+SUPPORT_MASTER_RULE_3
+
+!尼亚-妖仙兽
+Name=尼亚 Deck=Yosenju Dialog=near.zh-CN
+妖仙兽卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!尼亚-机壳
+Name=尼亚 Deck=Qliphort Dialog=near.zh-CN
+机壳卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!尼亚-淘气仙星
+Name=尼亚 Deck=Trickstar Dialog=near.zh-CN
+淘气仙星卡组。
+AI_LV3 SUPPORT_NEW_MASTER_RULE
+
+!永远之魂-削血
+Name=永远之魂 Deck=Burn Dialog=soul.zh-CN
+老式削血卡组。
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!永远之魂-青蛙
+Name=永远之魂 Deck=Frog Dialog=soul.zh-CN
+老式青蛙卡组。
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!永远之魂-荷鲁斯
+Name=永远之魂 Deck=Horus Dialog=soul.zh-CN
+老式龙族卡组。
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!悠悠
+Name=悠悠 Deck=MokeyMokey Dialog=mokey.zh-CN
+沙包。
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!悠悠王
+Name=悠悠王 Deck=MokeyMokeyKing Dialog=mokey.zh-CN
+大沙包。
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!试作型机器人1732
+Name=试作型机器人1732 Deck=ST1732 Dialog=zh-CN
+由三盒ST17和三盒SD32组成的卡组。
+AI_LV2 SUPPORT_NEW_MASTER_RULE
+
+!奇異果
+Name=奇異果 Deck=LightswornShaddoldinosour Dialog=kiwi.zh-TW
+光道影依恐龙卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!奇魔果
+Name=奇魔果 Deck=DarkMagician Dialog=kiwi.zh-TW
+黑魔术师卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!燃血鬥士
+Name=燃血鬥士 Deck=ChainBurn Dialog=kiwi.zh-TW
+连锁烧卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!复制梁龙-闪刀姬
+Name=复制梁龙 Deck=SkyStriker Dialog=anothercopy.zh-CN
+纯闪刀姬卡组。
+AI_LV3 SUPPORT_NEW_MASTER_RULE

mobile/build.gradle

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

mobile/src/main/java/cn/garymb/ygomobile/Constants.java

@@ -58,6 +58,7 @@ public interface Constants {
     String CORE_LIMIT_PATH = "lflist.conf";
     String CORE_CUSTOM_LIMIT_PATH = "expansions/lflist.conf";
     String CORE_SYSTEM_PATH = "system.conf";
+    String CORE_BOT_CONF_PATH = "bot.conf";
     String CORE_SKIN_PATH = "textures";
     String CORE_SKIN_PENDULUM_PATH = CORE_SKIN_PATH + "/extra";
     String CORE_DECK_PATH = "deck";

mobile/src/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java

 package cn.garymb.ygomobile.ui.home;
 
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.widget.Toast;
 
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
@@ -31,27 +21,20 @@ import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.utils.ComponentUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.NetUtils;
-import libwindbot.windbot.WindBot;
 
 import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
-import static cn.garymb.ygomobile.Constants.CORE_PICS_ZIP;
-import static cn.garymb.ygomobile.Constants.DATABASE_NAME;
 import static cn.garymb.ygomobile.Constants.NETWORK_IMAGE;
-import static cn.garymb.ygomobile.Constants.PREF_DEF_GAME_DIR;
-import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath;
 
 public class MainActivity extends HomeActivity {
     private GameUriManager mGameUriManager;
     private ImageUpdater mImageUpdater;
     private boolean enableStart;
-    MessageReceiver mReceiver = new MessageReceiver();
+    ResCheckTask mResCheckTask;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         YGOStarter.onCreated(this);
-        //checkWindbot();
-        han.sendEmptyMessage(0);
         mImageUpdater = new ImageUpdater(this);
         //资源复制
         checkResourceDownload((error, isNew) -> {
@@ -61,7 +44,7 @@ public class MainActivity extends HomeActivity {
                 enableStart = true;
             }
             if (isNew) {
-                if(!getGameUriManager().doIntent(getIntent())) {
+                if (!getGameUriManager().doIntent(getIntent())) {
                     new DialogPlus(this)
                             .setTitleText(getString(R.string.settings_about_change_log))
                             .loadUrl("file:///android_asset/changelog.html", Color.TRANSPARENT)
@@ -97,7 +80,8 @@ public class MainActivity extends HomeActivity {
     protected void onDestroy() {
         YGOStarter.onDestroy(this);
         super.onDestroy();
-        unregisterReceiver(mReceiver);
+        mResCheckTask.unregisterMReceiver();
+
     }
 
     @Override
@@ -126,11 +110,11 @@ public class MainActivity extends HomeActivity {
 
     @Override
     protected void checkResourceDownload(ResCheckTask.ResCheckListener listener) {
-        ResCheckTask task = new ResCheckTask(this, listener);
+        mResCheckTask = new ResCheckTask(this, listener);
         if (Build.VERSION.SDK_INT >= 11) {
-            task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            mResCheckTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         } else {
-            task.execute();
+            mResCheckTask.execute();
         }
     }
 
@@ -145,9 +129,9 @@ public class MainActivity extends HomeActivity {
 
     @Override
     public void updateImages() {
-        DialogPlus dialog  = DialogPlus.show(this, null, getString(R.string.message));
+        DialogPlus dialog = DialogPlus.show(this, null, getString(R.string.message));
         dialog.show();
-        VUiKit.defer().when(()->{
+        VUiKit.defer().when(() -> {
             if (IOUtils.hasAssets(this, ResCheckTask.getDatapath(Constants.CORE_PICS_ZIP))) {
                 try {
                     IOUtils.copyFilesFromAssets(this, ResCheckTask.getDatapath(Constants.CORE_PICS_ZIP),
@@ -156,52 +140,11 @@ public class MainActivity extends HomeActivity {
                     e.printStackTrace();
                 }
             }
-        }).done((rs)->{
+        }).done((rs) -> {
             dialog.dismiss();
         });
     }
 /*        checkResourceDownload((result, isNewVersion) -> {
             Toast.makeText(this, R.string.tip_reset_game_res, Toast.LENGTH_SHORT).show();
         });*/
-
-
-
-
-    public class MessageReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals("RUN_WINDBOT")) {
-                String args = intent.getStringExtra("args");
-                WindBot.runAndroid(args);
-            }
-        }
-    }
-
-    public void checkWindbot() {
-        Log.i("路径", getFilesDir().getPath());
-        Log.i("路径2", AppsSettings.get().getDataBasePath() + "/" + DATABASE_NAME);
-        try {
-            WindBot.initAndroid(getFilesDir().getPath(), AppsSettings.get().getDataBasePath() + "/" + DATABASE_NAME);
-        }catch (Throwable e){
-            e.printStackTrace();
-        }
-        IntentFilter filter = new IntentFilter();
-        filter.addAction("RUN_WINDBOT");
-        registerReceiver(mReceiver, filter);
-    }
-    Handler han = new Handler() {
-
-        @Override
-        public void handleMessage(Message msg) {
-            // TODO: Implement this method
-            super.handleMessage(msg);
-            switch (msg.what) {
-                case 0:
-                    checkWindbot();
-                    break;
-            }
-        }
-    };
-
 }

mobile/src/main/java/cn/garymb/ygomobile/ui/home/ResCheckTask.java

@@ -44,6 +44,7 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
     private DialogPlus dialog = null;
     private Handler handler;
     private boolean isNewVersion;
+    MessageReceiver mReceiver = new MessageReceiver();
 
     @SuppressWarnings("deprecation")
     public ResCheckTask(Context context, ResCheckListener listener) {
@@ -170,6 +171,10 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
                 IOUtils.copyFilesFromAssets(mContext, getDatapath(Constants.CORE_EXPANSIONS),
                         mSettings.getExpansionsPath().getAbsolutePath(), true, needsUpdate);
             }
+
+            //checkWindbot();
+            han.sendEmptyMessage(0);
+
         } catch (Exception e) {
             if (Constants.DEBUG)
                 Log.e(TAG, "check", e);
@@ -320,4 +325,49 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
     public interface ResCheckListener {
         void onResCheckFinished(int result, boolean isNewVersion);
     }
+
+    public void unregisterMReceiver(){
+        mContext.unregisterReceiver(mReceiver);
+    }
+
+    public void checkWindbot() {
+        Log.i("路径", mContext.getFilesDir().getPath());
+        Log.i("路径2", mSettings.getDataBasePath() + "/" + DATABASE_NAME);
+        try {
+            WindBot.initAndroid(mContext.getFilesDir().getPath(), mSettings.getDataBasePath() + "/" + DATABASE_NAME);
+        }catch (Throwable e){
+            e.printStackTrace();
+        }
+        MessageReceiver mReceiver = new MessageReceiver();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction("RUN_WINDBOT");
+        mContext.registerReceiver(mReceiver, filter);
+    }
+
+    public class MessageReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals("RUN_WINDBOT")) {
+                String args = intent.getStringExtra("args");
+                WindBot.runAndroid(args);
+            }
+        }
+    }
+
+    Handler han = new Handler() {
+
+        @Override
+        public void handleMessage(Message msg) {
+            // TODO: Implement this method
+            super.handleMessage(msg);
+            switch (msg.what) {
+                case 0:
+                    checkWindbot();
+                    break;
+            }
+        }
+    };
+
+
 }