Merge pull request icegreentee#333 from segfault-bilibili/revert-clic…

…kdisk-workaround 【6.2.1】回退国服magia盘点击不灵的临时措施
magirecoAutoBattle · May 23, 2022 · aeee5a1 · aeee5a1
2 parents 53bd4e1 + e9459fe
commit aeee5a1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 51 deletions.
diff --git a/floatUI.js b/floatUI.js
@@ -1017,33 +1017,16 @@ floatUI.main = function () {
 
     // float button
     var menu = floaty.rawWindow(
-        <frame id="container" w="44"><vertical>
-            <frame id="logo" w="44" h="44" alpha="0.4">
-                <img w="44" h="44" src="#ffffff" circle="true" />
-                <img
-                    id="img_logo"
-                    w="32"
-                    h="32"
-                    src={"file://"+files.join(files.join(files.cwd(), "images"), "qb.png")}
-                    layout_gravity="center"
-                />
-            </frame>
-            <frame id="clickDiskWorkaround" alpha="0.4" w="44" h="44">
-                <img w="44" h="44" src="#303030" circle="true" />
-                <vertical padding="0 6 0 6">
-                    <img
-                        id="img_magia"
-                        h="16"
-                        src={"file://"+files.join(files.join(files.cwd(), "images"), "magia.png")}
-                    />
-                    <img
-                        id="img_doppel"
-                        h="16"
-                        src={"file://"+files.join(files.join(files.cwd(), "images"), "doppel.png")}
-                    />
-                </vertical>
-            </frame>
-        </vertical></frame>
+        <frame id="logo" w="44" h="44" alpha="0.4">
+            <img w="44" h="44" src="#ffffff" circle="true" />
+            <img
+                id="img_logo"
+                w="32"
+                h="32"
+                src={"file://"+files.join(files.join(files.cwd(), "images"), "qb.png")}
+                layout_gravity="center"
+            />
+        </frame>
     );
 
     floatUI.floatyHangWorkaroundLock.lock();
@@ -1133,17 +1116,6 @@ floatUI.main = function () {
         }
         return true;
     });
-    var clickDiskWorkaroundThread = null;
-    menu.clickDiskWorkaround.setOnTouchListener(function (self, event) {
-        switch (event.getAction()) {
-            case event.ACTION_UP:
-                if (clickDiskWorkaroundThread == null || !clickDiskWorkaroundThread.isAlive()) {
-                    clickDiskWorkaroundThread = threads.start(tasks.clickDiskWorkaround);
-                }
-                break;
-        }
-        return true;
-    });
 
     //转屏时设置悬浮窗的位置和大小
     var receiver = new BroadcastReceiver({
@@ -11344,14 +11316,6 @@ function algo_init() {
 
     /* ~~~~~~~~ 镜界自动战斗 结束 ~~~~~~~~ */
 
-    function clickDiskWorkaroundRunnable() {
-        const point = capture("请点击行动盘。若仍无反应，\n"
-            +"可尝试修改“识图自动战斗脚本”脚本设置中的\n"
-            +"“按下后等待多少毫秒后再松开行动盘”").pos_up;
-        //国服2.1.10更新后出现无法点击magia盘的问题，从click改成swipe即可绕开问题
-        swipe(point.x, point.y, point.x, point.y, parseInt(limit.CVAutoBattleClickDiskDuration));
-    }
-
     /* ~~~~~~~~ 来自3.6.0版(以及点SKIP跳过剧情bug修正)的备用周回脚本 开始 ~~~~~~~~ */
 
     // strings constants
@@ -11892,7 +11856,6 @@ function algo_init() {
         testSupportSel: testSupportPicking,
         testReLaunch: testReLaunchRunnable,
         captureText: captureTextRunnable,
-        clickDiskWorkaround: clickDiskWorkaroundRunnable,
     };
 }
 

diff --git a/main.js b/main.js
@@ -443,7 +443,7 @@ ui.layout(
                                     <input maxLength="3" id="CVAutoBattleClickDiskDuration" hint="50" text="50" textSize="14" inputType="number|none" />
                                     <text text="毫秒后再松开行动盘" textColor="#000000" />
                                 </linear>
-                                <text text="国服2.1.10版更新后出现magia盘点不下去的问题,默认按住50毫秒后松开即可绕开这个问题,如果还有问题可以尝试调整这个数值。" textColor="#000000" />
+                                <text text="国服2.1.10a版更新后出现magia盘点不下去的问题,默认按住50毫秒后松开即可绕开这个问题,如果还有问题可以尝试调整这个数值。" textColor="#000000" />
                             </vertical>
                         </vertical>
                     </vertical>

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

diff --git a/update/updateList.json b/update/updateList.json
@@ -1 +1 @@
-{"packageName":"top.momoe.auto","versionName":"6.2.0","fileRootNode":[[{"src":"bin/scrcap2bmp-arm","integrity":"sha256-EPmaVWp++E7F9AgvYOm9LJlPt516LG44El752+rlEJk="},{"src":"bin/scrcap2bmp-arm64","integrity":"sha256-eVXMCpt1I99OnClUHHp34D0EXXw9enmPafrvIXWXKmg="},{"src":"bin/scrcap2bmp-x86","integrity":"sha256-mXCcEoSnrvQBjKZACQiSICQp3uVq9VMSxs6NbQnET+g="},{"src":"bin/scrcap2bmp-x86_64","integrity":"sha256-7CkgvLdJdYL1z/KB3XnN+rHimb4IJbWgJK85M0xokPg="},{"src":"bin/scrcap2bmp.c","integrity":"sha256-nR6KCZHaA1mS5N+teR517IsC6PTbanq9WIEejKwH+hk="}],{"src":"floatUI.js","integrity":"sha256-2ijJz0MlcnKlOkkrD4pOdH4fDvQnGgpXokFlbT50Mc8="},{"src":"gen.js","integrity":"sha256-Qi/jmYvCvwzjM7o2DhBt3OIdGwgUDi5pCwiSjwHhTlI="},[{"src":"images/accel.png","integrity":"sha256-UlrQwrRe8dOBxiMk2NDcFxeG2LSI4bG3nMgaPt8zbKQ="},{"src":"images/blast.png","integrity":"sha256-nmYrh9JgPImqNtp3UgP9fo5LmZMKtd4Tel1w/4dpefU="},{"src":"images/charge.png","integrity":"sha256-BmTzqEMGLoFPrJKMd0s+vR7fVZqJ79a4u02vvlLe6XE="},{"src":"images/connectIndicator.png","integrity":"sha256-aJPx9ulXXUZIBDfM9Z5vhctfN7NlcxBsvw1azTBcdzU="},{"src":"images/connectIndicatorBtnDown.png","integrity":"sha256-U3gXx2AasIjmjZDmk/l2tFjl+t5U29EaTVA0gbKRR+o="},{"src":"images/dark.png","integrity":"sha256-wz4LbTyP/DyyYkyfHa3jkcPEga59h/MMRClFxGwyTIE="},{"src":"images/darkBtnDown.png","integrity":"sha256-lu3FuVUDdZKN6Bt5R+wgj+B/KgaJvSvIgBmdzaExTTQ="},{"src":"images/doppel.png","integrity":"sha256-UfHzavfCcMrYsBlrblN84DsdkRaqIxAzn0GsJJTl3Q0="},{"src":"images/fire.png","integrity":"sha256-yzm1z5MCw5B5+emWjIcnH+MJSO9r7n0FPNCbYFM8Two="},{"src":"images/fireBtnDown.png","integrity":"sha256-fGrOcH9LMSZRkkSRFiia9ixdKvQdTJ2QTB2wG+5VXgQ="},{"src":"images/icon.png","integrity":"sha256-nCS4XyLVff1lOyqflpX9mzKzyWTXgHyn+99ShSWYp2s="},{"src":"images/light.png","integrity":"sha256-y5kbLsEw4i1hHj79FRM4rYr8/cI2APMZwRCKfz8g0nI="},{"src":"images/lightBtnDown.png","integrity":"sha256-QnG5sE/fnwPJC2ZsR6rxOQP1ntMMclI3tx80PlTq+Xo="},{"src":"images/magia.png","integrity":"sha256-+QTCSTSq0j9GTwUBmvUc9wbg3zyCjj/mXPVzhHuAp2I="},{"src":"images/mirrorsLose.png","integrity":"sha256-d8h2EWUc3o29ZPv5g6xT6zj8rU3SY3SNFw+bKHCSd5I="},{"src":"images/mirrorsWinLetterI.png","integrity":"sha256-WHubrQ5sgWJYfg96s+JS2PjoUSiXvh56Zm5VpsnQVMQ="},{"src":"images/none.png","integrity":"sha256-IK8U+DkPSBV7MSx5W++j1EgVSFmWexoYf51ipBWsL1g="},{"src":"images/noneBtnDown.png","integrity":"sha256-brVs5j2DsDi02kndGiosXVTFeAhZ96vhoHxY3Diy4SU="},{"src":"images/OKButton.png","integrity":"sha256-KFuIDf/NSJ9udU26WP8NTXjnommz76tuPIc0cfnQ9hw="},{"src":"images/OKButtonGray.png","integrity":"sha256-PeGWvERvcXqCHXpAH/PiDHgZkTgqxizrjbATWZ/Qbco="},{"src":"images/qb.png","integrity":"sha256-8j2wlTdvM0alP+BSFpna+tlFyaqGhwT4yhh7alqy+9w="},{"src":"images/skillEmptyCHS.png","integrity":"sha256-JAptr6ngZeVGE400WHStdUEtUCiT8Gwnil1WmRXTlSI="},{"src":"images/skillEmptyCHT.png","integrity":"sha256-zYKfj2CiuqhPg3hncyEFczqQ+cqExFmnbGE9EUHk0wU="},{"src":"images/skillEmptyJP.png","integrity":"sha256-iupPfmSYlfBO6+L8v1VaLlSUsqhZf0UzCoJgM/PfzqE="},{"src":"images/skillLocked.png","integrity":"sha256-3IDe9rTa1ph8L0NE2wLgWjQ/lO51wj157nqZt0nNs+U="},{"src":"images/start.jpg","integrity":"sha256-J5brNdm2qmrbdgUN7XcI9UcvBt+9MuGdob1ZU9HN8FY="},{"src":"images/water.png","integrity":"sha256-IZHLtWilwZubGYwwIJ5JCc8UAMBzE9E+PqKqN0Mwvp8="},{"src":"images/waterBtnDown.png","integrity":"sha256-16JL5HtrREbiEIfuUME4ozmHo9wB8wlP0JJNxmxqgAY="},{"src":"images/wood.png","integrity":"sha256-CueYQz07Rb8HYWxYO/b30+ux8OeMIHbSXf4cPpZel9M="},{"src":"images/woodBtnDown.png","integrity":"sha256-CqJWlGHeBZn62bCc7KR9d7RPbjIyAzW4tOh1kLzcxFs="}],{"src":"main.js","integrity":"sha256-JJ0MmezmwcmONUOIjRubO8D72M6/c9/EUIjA5THzb8s="},{"src":"project.json","integrity":"sha256-kgAwi3ChrjpbzJQMZ2/C+i005/Hpf/FduhzZLfp2abM="}]}
+{"packageName":"top.momoe.auto","versionName":"6.2.1","fileRootNode":[[{"src":"bin/scrcap2bmp-arm","integrity":"sha256-EPmaVWp++E7F9AgvYOm9LJlPt516LG44El752+rlEJk="},{"src":"bin/scrcap2bmp-arm64","integrity":"sha256-eVXMCpt1I99OnClUHHp34D0EXXw9enmPafrvIXWXKmg="},{"src":"bin/scrcap2bmp-x86","integrity":"sha256-mXCcEoSnrvQBjKZACQiSICQp3uVq9VMSxs6NbQnET+g="},{"src":"bin/scrcap2bmp-x86_64","integrity":"sha256-7CkgvLdJdYL1z/KB3XnN+rHimb4IJbWgJK85M0xokPg="},{"src":"bin/scrcap2bmp.c","integrity":"sha256-nR6KCZHaA1mS5N+teR517IsC6PTbanq9WIEejKwH+hk="}],{"src":"floatUI.js","integrity":"sha256-bCS5MqH7x4TIxeEGWOzpaPjeINiQfAJWjgmdaRr6PD8="},{"src":"gen.js","integrity":"sha256-Qi/jmYvCvwzjM7o2DhBt3OIdGwgUDi5pCwiSjwHhTlI="},[{"src":"images/accel.png","integrity":"sha256-UlrQwrRe8dOBxiMk2NDcFxeG2LSI4bG3nMgaPt8zbKQ="},{"src":"images/blast.png","integrity":"sha256-nmYrh9JgPImqNtp3UgP9fo5LmZMKtd4Tel1w/4dpefU="},{"src":"images/charge.png","integrity":"sha256-BmTzqEMGLoFPrJKMd0s+vR7fVZqJ79a4u02vvlLe6XE="},{"src":"images/connectIndicator.png","integrity":"sha256-aJPx9ulXXUZIBDfM9Z5vhctfN7NlcxBsvw1azTBcdzU="},{"src":"images/connectIndicatorBtnDown.png","integrity":"sha256-U3gXx2AasIjmjZDmk/l2tFjl+t5U29EaTVA0gbKRR+o="},{"src":"images/dark.png","integrity":"sha256-wz4LbTyP/DyyYkyfHa3jkcPEga59h/MMRClFxGwyTIE="},{"src":"images/darkBtnDown.png","integrity":"sha256-lu3FuVUDdZKN6Bt5R+wgj+B/KgaJvSvIgBmdzaExTTQ="},{"src":"images/doppel.png","integrity":"sha256-UfHzavfCcMrYsBlrblN84DsdkRaqIxAzn0GsJJTl3Q0="},{"src":"images/fire.png","integrity":"sha256-yzm1z5MCw5B5+emWjIcnH+MJSO9r7n0FPNCbYFM8Two="},{"src":"images/fireBtnDown.png","integrity":"sha256-fGrOcH9LMSZRkkSRFiia9ixdKvQdTJ2QTB2wG+5VXgQ="},{"src":"images/icon.png","integrity":"sha256-nCS4XyLVff1lOyqflpX9mzKzyWTXgHyn+99ShSWYp2s="},{"src":"images/light.png","integrity":"sha256-y5kbLsEw4i1hHj79FRM4rYr8/cI2APMZwRCKfz8g0nI="},{"src":"images/lightBtnDown.png","integrity":"sha256-QnG5sE/fnwPJC2ZsR6rxOQP1ntMMclI3tx80PlTq+Xo="},{"src":"images/magia.png","integrity":"sha256-+QTCSTSq0j9GTwUBmvUc9wbg3zyCjj/mXPVzhHuAp2I="},{"src":"images/mirrorsLose.png","integrity":"sha256-d8h2EWUc3o29ZPv5g6xT6zj8rU3SY3SNFw+bKHCSd5I="},{"src":"images/mirrorsWinLetterI.png","integrity":"sha256-WHubrQ5sgWJYfg96s+JS2PjoUSiXvh56Zm5VpsnQVMQ="},{"src":"images/none.png","integrity":"sha256-IK8U+DkPSBV7MSx5W++j1EgVSFmWexoYf51ipBWsL1g="},{"src":"images/noneBtnDown.png","integrity":"sha256-brVs5j2DsDi02kndGiosXVTFeAhZ96vhoHxY3Diy4SU="},{"src":"images/OKButton.png","integrity":"sha256-KFuIDf/NSJ9udU26WP8NTXjnommz76tuPIc0cfnQ9hw="},{"src":"images/OKButtonGray.png","integrity":"sha256-PeGWvERvcXqCHXpAH/PiDHgZkTgqxizrjbATWZ/Qbco="},{"src":"images/qb.png","integrity":"sha256-8j2wlTdvM0alP+BSFpna+tlFyaqGhwT4yhh7alqy+9w="},{"src":"images/skillEmptyCHS.png","integrity":"sha256-JAptr6ngZeVGE400WHStdUEtUCiT8Gwnil1WmRXTlSI="},{"src":"images/skillEmptyCHT.png","integrity":"sha256-zYKfj2CiuqhPg3hncyEFczqQ+cqExFmnbGE9EUHk0wU="},{"src":"images/skillEmptyJP.png","integrity":"sha256-iupPfmSYlfBO6+L8v1VaLlSUsqhZf0UzCoJgM/PfzqE="},{"src":"images/skillLocked.png","integrity":"sha256-3IDe9rTa1ph8L0NE2wLgWjQ/lO51wj157nqZt0nNs+U="},{"src":"images/start.jpg","integrity":"sha256-J5brNdm2qmrbdgUN7XcI9UcvBt+9MuGdob1ZU9HN8FY="},{"src":"images/water.png","integrity":"sha256-IZHLtWilwZubGYwwIJ5JCc8UAMBzE9E+PqKqN0Mwvp8="},{"src":"images/waterBtnDown.png","integrity":"sha256-16JL5HtrREbiEIfuUME4ozmHo9wB8wlP0JJNxmxqgAY="},{"src":"images/wood.png","integrity":"sha256-CueYQz07Rb8HYWxYO/b30+ux8OeMIHbSXf4cPpZel9M="},{"src":"images/woodBtnDown.png","integrity":"sha256-CqJWlGHeBZn62bCc7KR9d7RPbjIyAzW4tOh1kLzcxFs="}],{"src":"main.js","integrity":"sha256-RGENfsdU1gCRh0xM/vA/DTRJBV9960sIvtP8wdBARvk="},{"src":"project.json","integrity":"sha256-8BkIP1x1wpbgheAM1NSAnH5l8Fm6afyVkb8HxckVeb0="}]}
diff --git a/update/updateList.json.sig.txt b/update/updateList.json.sig.txt
@@ -1 +1 @@
-UH2oweppm26J+yJOr/bKBKBI3dQeGVEZQU9QtL1SkZtA0uvTD9pHUuvLmSrQZRvmaLqIzibKjDRQ210AaX3fqW4JA6e5DBE5XWTJodX7PmgpV+z2GfrivXhb+MrZ7t7dQ2lxDlMz/+KHx6vB5y7LUnNvP0hSBt2N7NhhHTbi89Il2ttIoMznAigIE78RFgcC14ifmDleZUVM6gsQG2mhcXvpaGR6cpGQUJ6eYI8sMSLBds12OCBLRh+95N+kBAIWFPCPMNwfpghtOJ33zYHYDci7IR0k1EWB+z0/5E+Lmk90kwSogLPQ85lLyUBoZFryzxV8TC8+sTa7JGU5Vjqx2g==
+eH5uk8QBqR4w35QwF06dKvai5aKBoARWHPnFSVKiyFBlp52qbS7V95aCdcFoI3i+LVEuJHHhQ0FgXj73+0CCR+l8UnhSBwIj71hTSCuxEEAcE/eQvgwSo1xx/XJQcfLDTLhjPt6Xg6EyxdxFO40rNIf9ajtvguk5BHHF7R/AMtwxST/VFoCtpKBXmSvJkYTt3PgP8fM4eIYNWMYyUsK6dOPT41MM2RyxAbeMSrHQkffW1mUHDTrMVIW+8/pSc1DPmUmhbwlHAHUTrfBrFYWT8uUInus9yr8n1ExmsQt3bwWlXtJ+gnS+MBQz/EEhWq3vOE086jxwcgmuhE1PLC+/7A==