Merge pull request icegreentee#355 from segfault-bilibili/rollup-6.4.1

【6.4.1】镜层默认每隔15分钟重开;开荒改为识别new、自动点击语音下载
magirecoAutoBattle · Aug 30, 2022 · ebb310e · ebb310e
2 parents 9584564 + 16ddf83
commit ebb310e
Show file tree

Hide file tree

Showing 62 changed files with 257 additions and 93 deletions.
diff --git a/floatUI.js b/floatUI.js
diff --git a/images/initialAuto.png → images/apBtn.png b/images/initialAuto.png → images/apBtn.png
diff --git a/images/closeBtn.png b/images/closeBtn.png
diff --git a/images/downloadDataOKBtn.png b/images/downloadDataOKBtn.png
diff --git a/images/mirrorsEntranceBtn.png b/images/mirrorsEntranceBtn.png
diff --git a/images/newQuest.png b/images/newQuest.png
diff --git a/main.js b/main.js
@@ -410,6 +410,15 @@ ui.layout(
                                 <Switch id="mirrorsWatchman" w="*" margin="0 3" checked="true" textColor="#000000" text="镜层守夜人模式" />
                                 <text text="开启此项,则在BP耗尽且无BP药可使用时等待BP自回,然后再进入战斗。仅日服可用。" textColor="#000000" />
                             </vertical>
+                            <vertical id="MirrorsExtraSettings5" visibility="gone" padding="10 8 0 6" w="*" h="auto">
+                                <linear>
+                                    <text text="定时杀进程重开,每隔" textColor="#000000" />
+                                    <input maxLength="5" id="mirrorsRelaunchTime" hint="留空即不强关重开" text="900" textSize="14" inputType="number|none" />
+                                    <text text="秒" textColor="#000000" />
+                                </linear>
+                                <text text="MuMu模拟器(安卓6,非安卓9测试版)请务必在[默认脚本设置]的[闪退自动重开设置]中开启[优先使用root或adb权限杀进程]。" textColor="#ff0000" />
+                                <text text="为避免游戏内存泄漏导致整个系统卡死崩溃,默认每15分钟(900秒)杀进程重开一次游戏。仅日服可用。" textColor="#000000" />
+                            </vertical>
                         </vertical>
                     </vertical>
                     <vertical margin="0 5" bg="#ffffff" elevation="1dp" w="*" h="auto">
@@ -893,6 +902,7 @@ const persistParamList = [
     "mirrorsEnemyNumFactor",
     "useCVAutoBattle",
     "mirrorsWatchman",
+    "mirrorsRelaunchTime",
     "CVAutoBattleDebug",
     "CVAutoBattleClickAllSkills",
     "CVAutoBattleClickSkillsSinceTurn",

diff --git a/project.json b/project.json
@@ -5,7 +5,7 @@
         "build"
     ],
     "packageName": "top.momoe.auto",
-    "versionName": "6.4.0",
+    "versionName": "6.4.1",
     "versionInfo": "",
     "versionCode": 1,
     "icon":"./images/icon.png",

diff --git a/update/fileJson/10.json b/update/fileJson/10.json
diff --git a/update/fileJson/11.json b/update/fileJson/11.json
diff --git a/update/fileJson/12.json b/update/fileJson/12.json
diff --git a/update/fileJson/13.json b/update/fileJson/13.json
diff --git a/update/fileJson/14.json b/update/fileJson/14.json
diff --git a/update/fileJson/15.json b/update/fileJson/15.json
diff --git a/update/fileJson/16.json b/update/fileJson/16.json
diff --git a/update/fileJson/17.json b/update/fileJson/17.json
diff --git a/update/fileJson/18.json b/update/fileJson/18.json
diff --git a/update/fileJson/19.json b/update/fileJson/19.json
diff --git a/update/fileJson/20.json b/update/fileJson/20.json
diff --git a/update/fileJson/21.json b/update/fileJson/21.json
diff --git a/update/fileJson/22.json b/update/fileJson/22.json
diff --git a/update/fileJson/23.json b/update/fileJson/23.json
diff --git a/update/fileJson/24.json b/update/fileJson/24.json
diff --git a/update/fileJson/25.json b/update/fileJson/25.json
diff --git a/update/fileJson/26.json b/update/fileJson/26.json
diff --git a/update/fileJson/27.json b/update/fileJson/27.json
diff --git a/update/fileJson/28.json b/update/fileJson/28.json
diff --git a/update/fileJson/29.json b/update/fileJson/29.json
diff --git a/update/fileJson/30.json b/update/fileJson/30.json
diff --git a/update/fileJson/31.json b/update/fileJson/31.json
diff --git a/update/fileJson/32.json b/update/fileJson/32.json
diff --git a/update/fileJson/33.json b/update/fileJson/33.json
diff --git a/update/fileJson/34.json b/update/fileJson/34.json
diff --git a/update/fileJson/35.json b/update/fileJson/35.json
diff --git a/update/fileJson/36.json b/update/fileJson/36.json
diff --git a/update/fileJson/37.json b/update/fileJson/37.json
diff --git a/update/fileJson/38.json b/update/fileJson/38.json
diff --git a/update/fileJson/39.json b/update/fileJson/39.json
diff --git a/update/fileJson/40.json b/update/fileJson/40.json
diff --git a/update/fileJson/41.json b/update/fileJson/41.json
diff --git a/update/fileJson/42.json b/update/fileJson/42.json
diff --git a/update/fileJson/43.json b/update/fileJson/43.json
diff --git a/update/fileJson/44.json b/update/fileJson/44.json
diff --git a/update/fileJson/45.json b/update/fileJson/45.json
diff --git a/update/fileJson/46.json b/update/fileJson/46.json
diff --git a/update/fileJson/47.json b/update/fileJson/47.json
diff --git a/update/fileJson/48.json b/update/fileJson/48.json
diff --git a/update/fileJson/49.json b/update/fileJson/49.json
diff --git a/update/fileJson/5.json b/update/fileJson/5.json
diff --git a/update/fileJson/50.json b/update/fileJson/50.json
diff --git a/update/fileJson/51.json b/update/fileJson/51.json
diff --git a/update/fileJson/52.json b/update/fileJson/52.json
diff --git a/update/fileJson/53.json b/update/fileJson/53.json
diff --git a/update/fileJson/54.json b/update/fileJson/54.json
diff --git a/update/fileJson/55.json b/update/fileJson/55.json
diff --git a/update/fileJson/56.json b/update/fileJson/56.json
diff --git a/update/fileJson/6.json b/update/fileJson/6.json
diff --git a/update/fileJson/7.json b/update/fileJson/7.json
diff --git a/update/fileJson/8.json b/update/fileJson/8.json
diff --git a/update/fileJson/9.json b/update/fileJson/9.json
diff --git a/update/updateList.json b/update/updateList.json
diff --git a/update/updateList.json.sig.txt b/update/updateList.json.sig.txt
@@ -1 +1 @@
-kmQd/dtbieUANYvB89uwhjsLB/s5JXii5/Bq1hJRincOtfz+//T9dmTnhx5ePRcr3Z/UGligAHo4awNaXxijEf7SQTsNIuALFyLTqZZTVOe0H7KdcJMZqAU89BSW2EpOdpGQS+5zk4Citc3tYHgmQ0hVNlpMg6zbiWsv1p+GKY8eDorbZLxlTV2okYUq8j6n+EBP7Z0ny2OnNyiFOarQ+FG2r3nugEGO88m2Rv4F5DI4GXONmzNnYzTsFCIGiporM7bsg234MXq3uZuEysSy7b6qLJYecZp3VCrslRktas74UdROnrwizV9vyU/7zlhDz/ZCbve3DyQd95G6UKmJ1Q==
+hVTGYGSlT0kc1hJ5ijKcIqAPTQ49UcGJ3y77uut5/LXpHqoIG7ZB3plUJG3F8kC4uYyhmWBYlP6RteNqpb82iLOWl40OSgAA0dhh+vylgMSLYbHOfxytHOivp+4Apq2PoFTaMYM9qw6uQH9Qppng+EkgJFimN4jwJ/+dgVUlA9NJ44id+dxII1YKsGsaO5rdwGGJycBxJCjtgnKLXL1mNfThKQWbxOM2eUXIAk1Yaa5GZbPqvyTQiponpHeQmNG4jVm25fTuFdbuSEgt62c34dRbPQ3MpIjg6zdXQT/C483z1BmPrXwmbFAU5wPtwZX4yweWoxYGxBF9cdOLZeqWWw==