From a52ff9ca784834a4f2f72ad432eadfa551c6dd97 Mon Sep 17 00:00:00 2001
From: 5117600049 <511760049@qq.com>
Date: Fri, 25 Apr 2025 12:37:19 +0800
Subject: [PATCH] =?UTF-8?q?js=20=E8=84=9A=E6=9C=AC=EF=BC=9A=E9=A6=96?=
 =?UTF-8?q?=E9=A2=86=E8=AE=A8=E4=BC=90=E4=B8=80=E6=9D=A1=E9=BE=99=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8C=91=E6=88=98=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E4=B8=80=E6=AC=A1=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E5=B0=9D=E8=AF=95=E3=80=82=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B7=B1?=
 =?UTF-8?q?=E9=82=83=E6=91=B9=E7=BB=93=E6=A0=AA=E4=BC=A0=E9=80=81=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20(#643)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update main.js

* Update manifest.json

* Update settings.json

* Update 深邃摹结株前往.json
---
 .../首领讨伐一条龙/assets/深邃摹结株前往.json | 10 +--
 repo/js/首领讨伐一条龙/main.js                | 15 +++-
 repo/js/首领讨伐一条龙/manifest.json          |  2 +-
 repo/js/首领讨伐一条龙/settings.json          | 70 ++++++++++---------
 4 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/repo/js/首领讨伐一条龙/assets/深邃摹结株前往.json b/repo/js/首领讨伐一条龙/assets/深邃摹结株前往.json
index a509f8ac..bec0c9f7 100644
--- a/repo/js/首领讨伐一条龙/assets/深邃摹结株前往.json
+++ b/repo/js/首领讨伐一条龙/assets/深邃摹结株前往.json
@@ -16,15 +16,7 @@
       "x": 9352.87109375,
       "y": -1333.6162109375,
       "action_params": ""
-    },
- {
-      "id": 2,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "type": "teleport",
-      "x": 9352.87109375,
-      "y": -1333.6162109375,
-      "action_params": "钟离 moveMouseBy(500, 0),s(0.2),e(hold),w(7);"
     }
+
   ]
 }
diff --git a/repo/js/首领讨伐一条龙/main.js b/repo/js/首领讨伐一条龙/main.js
index 044e2aab..4d0354f9 100644
--- a/repo/js/首领讨伐一条龙/main.js
+++ b/repo/js/首领讨伐一条龙/main.js
@@ -35,7 +35,7 @@ const autoNavigateToReward = async () => {
         
         // 3. 前进一小步
         keyDown("w");
-        await sleep(900);
+        await sleep(800);
         keyUp("w");
         await sleep(100); // 等待角色移动稳定
     }
@@ -102,7 +102,7 @@ await pathingScript.runFile(`assets/${challengeName}前往.json`);
 await keyMouseScript.runFile(`assets/${challengeName}前往键鼠.json`);
 for (let i = 0;i < challengeNum; i++) {
  await sleep(1000);
-if(samePlace == 1&& i > 0){
+if(samePlace != "YES" && i > 0){
 log.info(`前往第${i+1}次恢复状态`);
 await pathingScript.runFile("assets/recover.json");//回复状态
 log.info(`前往第${i+1}次讨伐${challengeName}`);
@@ -110,13 +110,24 @@ await pathingScript.runFile(`assets/${challengeName}前往.json`);
 await keyMouseScript.runFile(`assets/${challengeName}前往键鼠.json`);
 }
 log.info(`开始第${i+1}次战斗`);
+try {
 await dispatcher.runTask(new SoloTask("AutoFight"));
+} catch (error) {
+//失败后最多只挑战一次，因为两次都打不过，基本上没戏，干脆直接报错结束
+log.info(`挑战失败，再来一次`);
+await pathingScript.runFile("assets/recover.json");//回复状态
+await pathingScript.runFile(`assets/${challengeName}前往.json`);
+await keyMouseScript.runFile(`assets/${challengeName}前往键鼠.json`);
+await dispatcher.runTask(new SoloTask("AutoFight"));
+}
+
 log.info(`等待一会儿，避免钟离柱子害人`);
 await sleep(10000);
 log.info(`第${i+1}次领奖`);
 await autoNavigateToReward();//前往地脉之花
 //await pathingScript.runFile(`assets/${challengeName}领奖.json`);
 await sleep(600);
+
 keyPress("F");
 await sleep(800);
 click(968, 759);//消耗树脂领取
diff --git a/repo/js/首领讨伐一条龙/manifest.json b/repo/js/首领讨伐一条龙/manifest.json
index ce6c1ea5..b7368495 100644
--- a/repo/js/首领讨伐一条龙/manifest.json
+++ b/repo/js/首领讨伐一条龙/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "首领连续讨伐",
-  "version": "1.1",
+  "version": "1.2",
   "description": "请看一看readme文件",
   "authors": [
     {
diff --git a/repo/js/首领讨伐一条龙/settings.json b/repo/js/首领讨伐一条龙/settings.json
index bc08d41d..81cde006 100644
--- a/repo/js/首领讨伐一条龙/settings.json
+++ b/repo/js/首领讨伐一条龙/settings.json
@@ -6,6 +6,8 @@
     "label": "请问你设置好相关参数了吗",
     "options": [
       "YES",
+      "YES",
+      "YES"
     ]
   },
 
@@ -14,7 +16,8 @@
     "type": "select",
     "label": "是否原地连续挑战(默认不使用)",
     "options": [
-      "YES"
+      "YES",
+      "NO"
     ]
   },
 
@@ -24,40 +27,39 @@
     "type": "select",
     "label": "请选择首领",
     "options": [
-"金焰绒翼龙暴君",
-"深罪浸礼者",
-"遗迹巨蛇",
-"半永恒统辖矩阵",
-"兆载永劫龙兽",
-"无相之草",
-"纯水精灵",
-"熔岩辉龙像",
-"科培琉司的劫罚",
-"歌裴莉娅的葬送",
-"无相之火",
-"雷音权现",
-"翠翎恐簟",
-"风蚀沙虫",
-"实验性场力发生装置",
-"无相之雷",
-"急冻树",
-"爆炎树",
-"古岩龙蜥",
-"无相之水",
-"掣电树",
-"恒常机关阵列",
-"魔偶剑鬼",
-"贪食匿叶龙山王",
-"铁甲熔火帝皇",
-"无相之岩",
-"千年珍珠骏麟",
-"水形幻人",
-"隐山猊兽",
-"秘源机兵·构型械",
-"灵觉隐修的迷者",
-"深邃摹结株"
+"爆炎树",  
+"半永恒统辖矩阵",  
+"掣电树",  
+"纯水精灵",  
+"翠翎恐簟",  
+"深罪浸礼者",  
+"深邃摹结株",  
+"风蚀沙虫",  
+"歌裴莉娅的葬送",  
+"古岩龙蜥",  
+"恒常机关阵列",  
+"急冻树",  
+"金焰绒翼龙暴君",  
+"科培琉司的劫罚",  
+"雷音权现",  
+"灵觉隐修的迷者",  
+"秘源机兵·构型械",  
+"魔偶剑鬼",  
+"千年珍珠骏麟",  
+"熔岩辉龙像",  
+"贪食匿叶龙山王",  
+"铁甲熔火帝皇",  
+"无相之草",  
+"无相之火",  
+"无相之雷",  
+"无相之水",  
+"无相之岩",  
+"水形幻人",  
+"实验性场力发生装置",  
+"遗迹巨蛇",  
+"隐山猊兽",  
+"兆载永劫龙兽"  
     ]
-
   },
 
   {