diff --git a/repo/js/AutoArtifactsPro/README.md b/repo/js/AutoArtifactsPro/README.md index ccbb3493..3da06549 100644 --- a/repo/js/AutoArtifactsPro/README.md +++ b/repo/js/AutoArtifactsPro/README.md @@ -171,6 +171,9 @@ https://www.kdocs.cn/wo/sl/v13uXscL ## 更新日志 +### 1.6.6(2025.07.22) +1.尝试解决部分情况下结尾识别不到经验或摩拉 +2.现在只有鳄鱼好感会在好感中开启自动拾取了 ### 1.6.5(2025.07.21) 1.优化一些点位 ### 1.6.4(2025.07.20) diff --git a/repo/js/AutoArtifactsPro/main.js b/repo/js/AutoArtifactsPro/main.js index 91bfa049..154882ee 100644 --- a/repo/js/AutoArtifactsPro/main.js +++ b/repo/js/AutoArtifactsPro/main.js @@ -286,9 +286,6 @@ let enemyType = "无"; } } - // 启用自动拾取的实时任务 - dispatcher.addTimer(new RealtimeTimer("AutoPick")); - //切换至好感队 await switchPartyIfNeeded(friendshipPartyName); @@ -316,7 +313,7 @@ let enemyType = "无"; await AutoPath('愚人众-准备'); } if (enemyType === "鳄鱼") { - log.info(`导航到盗宝团触发点...`); + log.info(`导航到鳄鱼触发点...`); await AutoPath('鳄鱼-准备'); } //好感卡时间 @@ -389,6 +386,8 @@ let enemyType = "无"; // 开始运行狗粮路线 let runArtifactsResult = true; runArtifactsResult = await runArtifactsPaths(runRouteA, grindPartyName, settings.useABE); + await genshin.returnMainUi(); + await sleep(2000); artifactExperienceDiff += await processArtifacts(21); moraDiff += await mora(); log.info(`狗粮路线获取摩拉: ${moraDiff}`); @@ -553,6 +552,8 @@ async function runArtifactsPaths(runRouteA, grindPartyName, useABE) { // 运行额外路线 await runPathGroups(filePathExtra, "额外"); + dispatcher.ClearAllTriggers(); + return true; } @@ -659,6 +660,12 @@ async function AutoPath(locationName) { //好感度任务的逻辑 async function AutoFriendshipDev(times, ocrTimeout, fightTimeout, enemyType = "盗宝团", endTime) { + // 启用自动拾取的实时任务(只有鳄鱼好感启用) + //if (enemyType === "盗宝团") { + //if (enemyType === "愚人众") { + if (enemyType === "鳄鱼") { + dispatcher.addTimer(new RealtimeTimer("AutoPick")); + } let friendTimes = 0; for (let i = 0; i < times; i++) { @@ -754,7 +761,6 @@ async function AutoFriendshipDev(times, ocrTimeout, fightTimeout, enemyType = " ]); await pathTaskPromise; // 等待路径任务完成 cts.cancel(); - await battleTask; } catch (error) { cts.cancel(); if (error.message && error.message.includes("战斗超时")) { @@ -1270,4 +1276,4 @@ async function mora() { await genshin.returnMainUi(); } return Number(result); -} +} \ No newline at end of file diff --git a/repo/js/AutoArtifactsPro/manifest.json b/repo/js/AutoArtifactsPro/manifest.json index a2b3a53f..139a89c1 100644 --- a/repo/js/AutoArtifactsPro/manifest.json +++ b/repo/js/AutoArtifactsPro/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "自动狗粮重制版", - "version": "1.6.5", + "version": "1.6.6", "tags": [ "好感", "狗粮"