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": [ -"金焰绒翼龙暴君", -"深罪浸礼者", -"遗迹巨蛇", -"半永恒统辖矩阵", -"兆载永劫龙兽", -"无相之草", -"纯水精灵", -"熔岩辉龙像", -"科培琉司的劫罚", -"歌裴莉娅的葬送", -"无相之火", -"雷音权现", -"翠翎恐簟", -"风蚀沙虫", -"实验性场力发生装置", -"无相之雷", -"急冻树", -"爆炎树", -"古岩龙蜥", -"无相之水", -"掣电树", -"恒常机关阵列", -"魔偶剑鬼", -"贪食匿叶龙山王", -"铁甲熔火帝皇", -"无相之岩", -"千年珍珠骏麟", -"水形幻人", -"隐山猊兽", -"秘源机兵·构型械", -"灵觉隐修的迷者", -"深邃摹结株" +"爆炎树", +"半永恒统辖矩阵", +"掣电树", +"纯水精灵", +"翠翎恐簟", +"深罪浸礼者", +"深邃摹结株", +"风蚀沙虫", +"歌裴莉娅的葬送", +"古岩龙蜥", +"恒常机关阵列", +"急冻树", +"金焰绒翼龙暴君", +"科培琉司的劫罚", +"雷音权现", +"灵觉隐修的迷者", +"秘源机兵·构型械", +"魔偶剑鬼", +"千年珍珠骏麟", +"熔岩辉龙像", +"贪食匿叶龙山王", +"铁甲熔火帝皇", +"无相之草", +"无相之火", +"无相之雷", +"无相之水", +"无相之岩", +"水形幻人", +"实验性场力发生装置", +"遗迹巨蛇", +"隐山猊兽", +"兆载永劫龙兽" ] - }, {