diff --git a/repo/js/ArtifactsGroupPurchasing/main.js b/repo/js/ArtifactsGroupPurchasing/main.js index 343757d22..cdb642f92 100644 --- a/repo/js/ArtifactsGroupPurchasing/main.js +++ b/repo/js/ArtifactsGroupPurchasing/main.js @@ -140,6 +140,11 @@ let skipRunning = false; } await genshin.tpToStatueOfTheSeven(); + if (skipRunning) { + log.info(`本次运行启用并触发了强迫症模式,需要重新上线`); + return; + } + if (settings.logName) { expGain = await processArtifacts() - expGain; log.info(`${settings.logName}:联机狗粮分解获得经验${expGain}`); @@ -332,6 +337,7 @@ async function runGroupPurchasing(runExtra) { log.warn("等待队友就绪超时"); if (settings.onlyRunPerfectly === "确认启用强迫症模式") { skipRunning = true; + doRunExtra = false; } return false; } @@ -763,6 +769,7 @@ async function autoEnter(autoEnterSettings) { notification.error(`超时未达到预定人数`); if (settings.onlyRunPerfectly === "确认启用强迫症模式") { skipRunning = true; + doRunExtra = false; } } diff --git a/repo/js/ArtifactsGroupPurchasing/manifest.json b/repo/js/ArtifactsGroupPurchasing/manifest.json index 7db6cf76c..e6742d53a 100644 --- a/repo/js/ArtifactsGroupPurchasing/manifest.json +++ b/repo/js/ArtifactsGroupPurchasing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮联机团购", - "version": "1.9.1", + "version": "1.10.0", "tags": [ "狗粮" ], diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js index a0ea0cb4d..0f1cf8a3e 100644 --- a/repo/js/AutoHoeingOneDragon/main.js +++ b/repo/js/AutoHoeingOneDragon/main.js @@ -1,4 +1,4 @@ -//当前js版本1.12.0 +//当前js版本1.13.1 let timeMoveUp; let timeMoveDown; @@ -63,8 +63,9 @@ let localeWorks; localeWorks = !isNaN(Date.parse(new Date().toLocaleString())); if (!localeWorks) { - log.warn('[WARN] 当前设备 toLocaleString 无法被 Date 解析'); + log.warn('[WARN] 当前设备本地时间格式无法解析'); log.warn('[WARN] 建议不要使用12小时时间制'); + log.warn('[WARN] 已将记录改为使用utc时间'); await sleep(5000); } @@ -164,38 +165,38 @@ let localeWorks; await updateRecords(pathings, accountName); } else if (operationMode === "运行锄地路线") { await switchPartyIfNeeded(partyName); - // 检测四神队伍并输出当前角色 - const avatars = getAvatars() || []; - const need = ['钟离', '芙宁娜', '纳西妲', '雷电将军']; - let improperTeam = true; - for (let i = 0; i < need.length; i++) { - let found = false; - for (let j = 0; j < avatars.length; j++) { - if (avatars[j] === need[i]) { - found = true; - break; - } - } - if (!found) { - improperTeam = false; - break; - } - } + const avatars = Array.from(getAvatars?.() || []); - // 手动拼接角色名,避免 join 报错 + // 拼接队伍字符串,放在 switch 之前 let teamStr = ''; for (let k = 0; k < avatars.length; k++) { teamStr += avatars[k]; - if (k < avatars.length - 1) { - teamStr += '、'; - } + if (k < avatars.length - 1) teamStr += '、'; } - log.info('当前队伍:' + teamStr); - if (improperTeam) { - log.warn("当前队伍不适合锄地,建议重新阅读readme相关部分"); - await sleep(5000); + + switch (true) { + case ['钟离', '芙宁娜', '纳西妲', '雷电将军'].every(n => avatars.includes(n)): + log.warn("四神队不适合锄地,建议重新阅读 readme 相关部分"); + await sleep(10000); + return; + + case avatars.includes('钟离'): + log.warn("当前队伍包含钟离,钟离不适合锄地,建议重新阅读 readme 相关部分"); + await sleep(5000); + break; + + case !['芙宁娜', '爱可菲', '玛薇卡'].some(n => avatars.includes(n)): + log.warn("未携带合适的输出角色(芙宁娜/爱可菲/玛薇卡),建议重新阅读 readme 相关部分"); + await sleep(5000); + break; + + case !['茜特菈莉', '伊涅芙', '莱依拉', '蓝砚', '白术', '琦良良', '迪希雅', '迪奥娜'] + .some(n => avatars.includes(n)): + log.warn("未携带合适的抗打断角色(茜特菈莉/伊涅芙/莱依拉/蓝砚/白术/琦良良/迪希雅/迪奥娜)"); + await sleep(5000); + break; } log.info("开始运行锄地路线"); diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json index 9c19836ca..bc0be6f7f 100644 --- a/repo/js/AutoHoeingOneDragon/manifest.json +++ b/repo/js/AutoHoeingOneDragon/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "锄地一条龙", - "version": "1.13.0", + "version": "1.13.1", "description": "一站式解决自动化锄地,支持只拾取狗粮,请仔细阅读README.md后使用", "authors": [ {