Merge pull request icegreentee#450 from segfault-bilibili/rollup-7.3.3

【7.3.3】简化文字描述
magirecoAutoBattle · Aug 30, 2023 · 11c686f · 11c686f
2 parents ee36d45 + 75819c4
commit 11c686f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/floatUI.js b/floatUI.js
@@ -13234,14 +13234,9 @@ function algo_init() {
             startScreenCapture();
         }
 
-        toast("半自动辅助开荒脚本能够在一个章节(section)内自动选BATTLE进行周回；");
-        toast("且支持在第一回合自动凑连携（可在设置中关闭）；");
-        threads.start(function () {
-            // avoid exceeded toast quota
-            sleep(6000);
-            toast("以及支持地图型周回,但在找不到没打过(new)的关卡时不会自动拖动地图；");
-            toast("另外,不会嗑药,也不会处理掉线等情况。");
-        });
+        // take care of toast quota limit
+        toast("半自动辅助开荒脚本能够在一个章节(section)内自动选BATTLE进行周回；\n且支持在第一回合自动凑连携（可在设置中关闭）；");
+        toast("以及支持地图型周回,但在找不到没打过(new)的关卡时不会自动拖动地图；\n另外,不会嗑药,也不会处理掉线等情况。");
 
         while (true) {
             let newSectionOnMapPoint = null;

diff --git a/main.js b/main.js
@@ -427,12 +427,11 @@ ui.layout(
                             </vertical>
                             <vertical id="MirrorsExtraSettings3" visibility="gone" padding="10 8 0 6" w="*" h="auto">
                                 <linear>
-                                    <text text="对手人数因子" textColor="#000000" />
+                                    <text text="考虑对手人数" textColor="#000000" />
                                     <input maxLength="3" id="mirrorsEnemyNumFactor" hint="0" text="0" textSize="14" inputType="number|none" />
                                 </linear>
                                 <text text="可以认为对手人数越多越难打。" textColor="#000000" />
-                                <text text="取值范围0-100。典型情况一般设为10以下。比如对手是5人队,5-1=4,然后设为10时会乘1+0.4=1.4,设为100时会乘1+4=5。" textColor="#000000" />
-                                <text text="默认不考虑对手人数,即因子为0。" textColor="#000000" />
+                                <text text="取值范围0-100。默认为0,即不考虑对手人数。典型情况一般设为10以下。设为100时,即为直接乘上对手人数。" textColor="#000000" />
                             </vertical>
                             <vertical id="MirrorsExtraSettings4" visibility="gone" padding="10 8 0 6" w="*" h="auto">
                                 <Switch id="mirrorsWatchman" w="*" margin="0 3" checked="true" textColor="#000000" text="镜层守夜人模式" />

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