From bef1e1c517cb23fdc0e56a52c1d807d6f58b4305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E4=BA=91?= Date: Thu, 28 Aug 2025 23:59:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo/js/AutoHoeingOneDragon/main.js | 40 ++--------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js index 02ee4b61d..d5083800a 100644 --- a/repo/js/AutoHoeingOneDragon/main.js +++ b/repo/js/AutoHoeingOneDragon/main.js @@ -12,7 +12,6 @@ if (settings.activeDumperMode) { //处理泥头车信息 let gameRegion; let targetItemPath = "assets/targetItems"; let targetItems; -let isFourGod; const rollingDelay = (+settings.rollingDelay || 25); const pickupDelay = (+settings.pickupDelay || 100); @@ -160,21 +159,7 @@ let warnMessage = []; } log.info('当前队伍:' + teamStr); - if (improperTeam) { - warnMessage.push("配队不合理,请阅读readme中的锄地配队建议"); - warnMessage.push("如果已经阅读过,请忽略该警告"); - for (let i = 0; i < 5; i++) { - // 原始文本 - let originalMessage = " 配队不合理,请阅读readme中的锄地配队建议"; - // 计算轮替的偏移量,每次循环偏移一位 - let offset = i % originalMessage.length; // 每次循环偏移一位 - // 构造轮替后的文本 - let message = originalMessage.slice(-offset) + originalMessage.slice(0, -offset); - // 输出内容 - log.error(message); - await sleep(500); - } - } + log.info("开始运行锄地路线"); await updateRecords(pathings, accountName); await processPathingsByGroup(pathings, whitelistKeywords, blacklistKeywords, accountName); @@ -889,28 +874,7 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo } } - // 新增:warnTask 函数,与其他任务函数并列 - async function warnLoop() { - while (!state.completed && !state.cancelRequested) { - if (Array.isArray(warnMessage) && warnMessage.length) { - for (let i = 0; i < warnMessage.length; i++) { - log.error(warnMessage[i]); - } - } - for (let j = 0; j < 30; j++) { - if (state.completed || state.cancelRequested) { - break; - } - await sleep(1000); - } - if (state.completed || state.cancelRequested) { - break; - } - } - } - // 启动任务,变量名仍叫 warnTask - const warnTask = warnLoop(); // 启动路径文件执行任务 const pathTask = executePathFile(pathFilePath); @@ -929,7 +893,7 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo // 等待所有任务完成 try { - await Promise.allSettled([pathTask, ocrTask, dumperTask, warnTask]); + await Promise.allSettled([pathTask, ocrTask, dumperTask]); } catch (error) { console.error(`执行任务时发生错误:${error.message}`); state.cancelRequested = true; // 设置取消标志