diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival.png deleted file mode 100644 index ea655a2e32..0000000000 Binary files a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival.png and /dev/null differ diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival1.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival1.png deleted file mode 100644 index 90d6e7ca89..0000000000 Binary files a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival1.png and /dev/null differ diff --git "a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/\345\244\215\350\213\217.png" "b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/\345\244\215\350\213\217.png" new file mode 100644 index 0000000000..06f8eb68c1 Binary files /dev/null and "b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/\345\244\215\350\213\217.png" differ diff --git a/repo/js/ArtifactsGroupPurchasing/main.js b/repo/js/ArtifactsGroupPurchasing/main.js index 3efbe6c3f5..118d4914fa 100644 --- a/repo/js/ArtifactsGroupPurchasing/main.js +++ b/repo/js/ArtifactsGroupPurchasing/main.js @@ -9,6 +9,7 @@ let rollingDelay = 50; let state; let gameRegion; let TMthreshold = +settings.TMthreshold || 0.9; +let doRunExtra = false; (async function () { setGameMetrics(1920, 1080, 1); @@ -120,8 +121,8 @@ let TMthreshold = +settings.TMthreshold || 0.9; await runGroupPurchasing(false); settings.forceGroupNumber = 0;//解除强制指定 } - //如果勾选了额外，在结束后再执行一次额外路线 - if (settings.runExtra) { + //如果勾选了额外，且本次自动运行当过房主成功进人，在结束后再执行一次额外路线 + if (settings.runExtra && doRunExtra) { await runGroupPurchasing(runExtra); } } @@ -690,6 +691,7 @@ async function autoEnter(autoEnterSettings) { while (attempts++ < 5) { if (permissionMode === "无条件通过") { if (await findAndClick(allowEnterRo)) { + doRunExtra = true; await waitForMainUI(true, 20 * 1000); enterCount++; break; @@ -703,6 +705,7 @@ async function autoEnter(autoEnterSettings) { enteredPlayers = [...new Set([...enteredPlayers, result])]; log.info(`允许 ${result} 加入`); notification.send(`允许 ${result} 加入`); + doRunExtra = true; if (await isYUI()) { keyPress("VK_ESCAPE"); await sleep(500); await genshin.returnMainUi(); } break; } else { @@ -923,6 +926,8 @@ async function getPlayerSign() { if (p2.isExist()) { log.info("识别结果为2P"); return 2; } if (p3.isExist()) { log.info("识别结果为3P"); return 3; } if (p4.isExist()) { log.info("识别结果为4P"); return 4; } + await genshin.returnMainUi(); + await sleep(250); } log.warn("超时仍未识别到队伍编号"); return -1; @@ -1127,7 +1132,7 @@ async function runPath(fullPath, targetItemPath) { })(); const errorProcessTask = (async () => { - const revivalRo1 = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/revival1.png")); + const revivalRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/复苏.png")); const readingRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/readingUI.png"), 72, 22, 133 - 72, 79 - 22); const dialogueRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/dialogueUI.png"), 187, 26, 233 - 130, 69); let errorCheckCount = 9; @@ -1137,7 +1142,7 @@ async function runPath(fullPath, targetItemPath) { if (errorCheckCount > 50) { errorCheckCount = 0; - if (await findAndClick(revivalRo1, 1)) { + if (await findAndClick(revivalRo, 1)) { log.info("识别到复苏按钮，点击复苏"); errorCheckCount = 50; } diff --git a/repo/js/ArtifactsGroupPurchasing/manifest.json b/repo/js/ArtifactsGroupPurchasing/manifest.json index b25bea0d6d..59e828fe75 100644 --- a/repo/js/ArtifactsGroupPurchasing/manifest.json +++ b/repo/js/ArtifactsGroupPurchasing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮联机团购", - "version": "1.5.18", + "version": "1.6.1", "tags": [ "狗粮" ], diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json index 621da3d41a..40cdc2250a 100644 --- a/repo/js/AutoHoeingOneDragon/manifest.json +++ b/repo/js/AutoHoeingOneDragon/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "锄地一条龙", - "version": "1.10.2", + "version": "1.10.3", "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用", "authors": [ { diff --git "a/repo/js/AutoHoeingOneDragon/pathing/0-\346\261\220\351\205\261/1-\347\262\276\350\213\261/418\343\200\220\346\262\231\346\232\264\343\200\221\351\241\273\345\274\245\346\262\231\346\274\240\344\270\211\350\277\220\346\262\263\344\271\213\345\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" "b/repo/js/AutoHoeingOneDragon/pathing/0-\346\261\220\351\205\261/1-\347\262\276\350\213\261/418\343\200\220\346\262\231\346\232\264\343\200\221\351\241\273\345\274\245\346\262\231\346\274\240\344\270\211\350\277\220\346\262\263\344\271\213\345\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" index 879b0f46df..a55a2c60a0 100644 --- "a/repo/js/AutoHoeingOneDragon/pathing/0-\346\261\220\351\205\261/1-\347\262\276\350\213\261/418\343\200\220\346\262\231\346\232\264\343\200\221\351\241\273\345\274\245\346\262\231\346\274\240\344\270\211\350\277\220\346\262\263\344\271\213\345\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" +++ "b/repo/js/AutoHoeingOneDragon/pathing/0-\346\261\220\351\205\261/1-\347\262\276\350\213\261/418\343\200\220\346\262\231\346\232\264\343\200\221\351\241\273\345\274\245\346\262\231\346\274\240\344\270\211\350\277\220\346\262\263\344\271\213\345\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" @@ -7,7 +7,7 @@ } ], "bgi_version": "0.45.0", - "description": " 路线信息：该路线预计用时131.36秒，包含以下怪物：1只遗迹重机、2只遗迹巡弋者、1只伸缩风蕈兽。", + "description": " 路线信息：该路线预计用时131.36秒，包含以下怪物：1只遗迹重机、2只遗迹巡弋者、0.5只伸缩风蕈兽。", "enable_monster_loot_split": false, "last_modified_time": 1762170381245, "map_match_method": "",