From 6c9c7545ef249c4c814e4ae206d27582e68e449e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E6=9D=B0=E6=B3=BD?= <1351705036@qq.com> Date: Sun, 1 Dec 2024 15:24:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=A7=98=E5=A2=83=E8=84=9A=E6=9C=AC=E3=80=82=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=A4=8D=E6=B4=BB=E5=90=8E=E9=87=8D=E6=96=B0=E6=88=98=E6=96=97?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo/js/AutoDomain/main.js | 36 ++++++++++++++++++++++++-------- repo/js/AutoDomain/manifest.json | 6 +++--- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/repo/js/AutoDomain/main.js b/repo/js/AutoDomain/main.js index 1f8d3bd4..49697b8e 100644 --- a/repo/js/AutoDomain/main.js +++ b/repo/js/AutoDomain/main.js @@ -266,16 +266,34 @@ let domainInfo = domainList.find(function (domain) { return domain.name === domainName; }); - await genshin.tp(domainInfo.position[2], domainInfo.position[0]); - await sleep(1000); + while(true){ + try{ + await genshin.tp(domainInfo.position[2], domainInfo.position[0]); + await sleep(1000); - // 向前走 - keyDown("w"); - await sleep(2500); - keyUp("w"); + // 向前走 + keyDown("w"); + await sleep(2500); + keyUp("w"); - await sleep(500); + await sleep(500); - // 执行自动秘境 - await dispatcher.runTask(new SoloTask("AutoDomain")); + // 执行自动秘境 + await dispatcher.runTask(new SoloTask("AutoDomain")); + await sleep(500); + break; + }catch (ex) + { + if (ex.message.includes("检测到复苏界面")) + { + log.info("复活后,继续执行自动秘境。"); + continue; + } + else + { + // 如果不包含 "检测到复苏界面",则继续抛出异常 + throw ex; + } + } + } })(); \ No newline at end of file diff --git a/repo/js/AutoDomain/manifest.json b/repo/js/AutoDomain/manifest.json index d19430c1..48ab91bb 100644 --- a/repo/js/AutoDomain/manifest.json +++ b/repo/js/AutoDomain/manifest.json @@ -1,11 +1,11 @@ { "manifest_version": 1, "name": "传送并自动秘境", - "version": "1.2", - "description": "BetterGI自带脚本,用于传送后并执行自动秘境", + "version": "1.3", + "description": "BetterGI自带脚本,用于传送后并执行自动秘境。秘境中角色死亡复活后继续回去战斗。", "authors": [ { - "name": "huiyadanli", + "name": "huiyadanli&iris", "link": "https://github.com/huiyadanli" } ],