From 93306aeb261481714ea4de033f465f4364ca0c6d Mon Sep 17 00:00:00 2001 From: segfault-bilibili Date: Thu, 25 Aug 2022 08:27:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E6=9D=BF?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E9=80=82=E5=BA=94=E6=97=A5=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- floatUI.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/floatUI.js b/floatUI.js index bdfe2eb5..2fb8220a 100644 --- a/floatUI.js +++ b/floatUI.js @@ -8676,8 +8676,8 @@ function algo_init() { bottomRight: { x: 1076, y: 303, pos: "center" } }, floor: { - topLeft: { x: 1048, y: 518, pos: "center" }, - bottomRight: { x: 1168, y: 575, pos: "center" } + topLeft: { x: 1068, y: 498, pos: "center" }, + bottomRight: { x: 1188, y: 555, pos: "center" } } }, their: { @@ -8686,8 +8686,8 @@ function algo_init() { bottomRight: { x: 259, y: 304, pos: "center" } }, floor: { - topLeft: { x: 258, y: 520, pos: "center" }, - bottomRight: { x: 361, y: 573, pos: "center" } + topLeft: { x: 238, y: 500, pos: "center" }, + bottomRight: { x: 341, y: 553, pos: "center" } } }, //our From 2f7e3c7929f5e947ea780bda08f0f0890a0ad4cc Mon Sep 17 00:00:00 2001 From: segfault-bilibili Date: Thu, 25 Aug 2022 09:11:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=95=E8=BF=87?= =?UTF-8?q?=E6=97=A5=E6=9C=8D=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- floatUI.js | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/floatUI.js b/floatUI.js index 2fb8220a..066d7c13 100644 --- a/floatUI.js +++ b/floatUI.js @@ -163,6 +163,10 @@ floatUI.scripts = [ name: "自动点击行动盘(无脑123盘)", fn: tasks.simpleAutoBattle, }, + { + name: "绕过Play检测", + fn: tasks.fakeJPInstallSource, + }, { name: "理子活动脚本", fn: tasks.dungeonEvent, @@ -11903,6 +11907,40 @@ function algo_init() { //导出这个函数 floatUI.recoverLastWork = recoverLastWork; + function fakeJPInstallSourceRunnable() { + let dialogResult = dialogs.confirm("绕过Play检测", + "要伪装安装来源为Google Play Store来绕过日服的检测吗？\n警告：将会强行停止游戏！"); + if (!dialogResult) { + toastLog("取消绕过Play检测"); + return; + } + toastLog("尝试绕过Play检测..."); + let result = privShell("pm path com.aniplex.magireco"); + if (result.code != 0) { + log(result.code, result.error); + result = privShell("cmd package path com.aniplex.magireco"); + } + if (result.code != 0) { + log(result.code, result.error); + toastLog("绕过Play检测出错"); + return; + } + let apkPath = result.result.match(/\/.+\.apk/); + if (apkPath != null) apkPath = apkPath[0]; + log("apkPath", apkPath); + if (apkPath == null) { + toastLog("未找到日服"); + return; + } + result = privShell("pm install -r -i com.android.vending \"" + apkPath.replace(new RegExp("\"", "g"), "\\\"") + "\""); + if (result.code != 0) { + log(result.code, result.error); + toastLog("绕过Play检测出错"); + return; + } + toastLog("绕过Play检测完成"); + } + return { default: taskDefault, default3_6_0: taskDefault3_6_0, @@ -11919,6 +11957,7 @@ function algo_init() { testSupportSel: testSupportPicking, testReLaunch: testReLaunchRunnable, captureText: captureTextRunnable, + fakeJPInstallSource: fakeJPInstallSourceRunnable, }; } From 08e3ba5f4b0902177550029bddfc80e23fbf1d0b Mon Sep 17 00:00:00 2001 From: segfault-bilibili Date: Thu, 25 Aug 2022 09:12:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B3=A8=E6=98=8E=E6=9A=82=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=AC=AC=E4=B8=89=E4=B8=AA=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 66646539..0eb80378 100644 --- a/main.js +++ b/main.js @@ -424,7 +424,7 @@ ui.layout( - + From 7dc3bf9cb70cf7b245c9763d0da97681c9ec23ea Mon Sep 17 00:00:00 2001 From: segfault-bilibili Date: Thu, 25 Aug 2022 09:14:25 +0800 Subject: [PATCH 4/4] bump version & regenerate hashes --- project.json | 2 +- update/updateList.json | 2 +- update/updateList.json.sig.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.json b/project.json index 31ec3938..7cce4544 100644 --- a/project.json +++ b/project.json @@ -5,7 +5,7 @@ "build" ], "packageName": "top.momoe.auto", - "versionName": "6.2.6", + "versionName": "6.2.7", "versionInfo": "", "versionCode": 1, "icon":"./images/icon.png", diff --git a/update/updateList.json b/update/updateList.json index dc8d0e1e..ccb81256 100644 --- a/update/updateList.json +++ b/update/updateList.json @@ -1 +1 @@ -{"packageName":"top.momoe.auto","versionName":"6.2.6","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-cFnjpKsxorHv6Wqi98G6MgS8nLA/C0hq8hTG0e135FU="},{"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-MWgeUlXMBS6t/jBQGkaFPRzCRIAi2a+95PfyHAD/8O8="},{"src":"project.json","integrity":"sha256-6n/qN3muYeW5ZGOo8dsxLb0Dp3BqY6m7mPQrLYOk9vw="}]} \ No newline at end of file +{"packageName":"top.momoe.auto","versionName":"6.2.7","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-UXOIqBjWwFurNyE6k/Qt7zhkZKrFF0y6iDjROqwKTE4="},{"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-IcurH9rCXvcX4b4n2BlZtIgW7H+BJmIiWhtzn2LX0Og="},{"src":"project.json","integrity":"sha256-FC2COydoG4LMgc7XbQZrhwGA+tJt6/kGU6vBQwNL0SM="}]} \ No newline at end of file diff --git a/update/updateList.json.sig.txt b/update/updateList.json.sig.txt index a4ff2045..9cc82a83 100644 --- a/update/updateList.json.sig.txt +++ b/update/updateList.json.sig.txt @@ -1 +1 @@ -SN2TA/g3IykHFdeZF8OIZEm1vn8+5m1uuZcXoE/BuZFmMJxJ992f6POsBjzuXDjZ52IqKTNzxHPk6s6wXjgDvZe6kjoZcnysynIe477D44ejUkYTq1/q1G1v9bugqZL2cDH39uIC3r7O2LsU3yP3iYIlfyPKvW/rSTAc6J0/5Jsr5l/MvCaxD5UcvTBB3WP28uEqSS+DuayK3hXRjVVpjUlAoVMhZPBlnFOaT2ZYcSeyuJ7LgtuSR/J6L3VMtHXlkPRXC9JHd+oy7lq+zzbC97m2Z+vdmCre8X2ZPHJmiSbNb/L0hPnqnJKEZgSaW/y5fKcAJewaUPeEgBmUR8mEKA== \ No newline at end of file +MJSP5oBtlQwyP9NNr2IA1PPF0q5sg3rnx5RBJAjjxKIVWREs3pUnmGMTqcov8q6+SJEoALzkl5P7K4qIYWKphYclZmoiyWTP3JSudrxuCVVSQ4HaGjPyHO2RwDIRkt0lIny3ZWZ28vwwE251+iKnxrod/b+NHkJulNp7Hs+fl44Rh/u95f3i9oAKP8daU7gg8lOrvYL36XXME9t5Gnjzf+wS9r+3PfqC+cRDoW+dj+YkqbpVAlkBXJBa//Zr+SEZ+BAaAsman4w/af/6hjFko2rjWY3H05edUDQ7ua1VmWZKsGvt8kcb5ww6+6y1oNc0Mc845Hikkt1tFDAKEUntWw== \ No newline at end of file