From 349a5288d53910b99a0de30bd9dc9fda516e543e Mon Sep 17 00:00:00 2001 From: yan Date: Sun, 18 Jan 2026 20:49:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(auto-tools):=20=E6=B7=BB=E5=8A=A0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=89=A7=E8=A1=8C=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 RecordPathList 数组用于存储路径记录 - 修改数据结构使用 RecordPathList 替代原有的 Record.paths - 优化路径匹配逻辑，调整条件判断返回值 - 更新文件保存机制，异步保存路径记录和普通记录 - 重构路径执行流程，改进异常处理和状态管理 - 添加日志输出增强调试信息 - 修复路径数据解析和查找逻辑 - 移除部分 continue 语句改用异常抛出机制 --- .../config/PathRecord.json | 1 - repo/js/FullyAutoAndSemiAutoTools/main.js | 80 ++++++++++--------- 2 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 repo/js/FullyAutoAndSemiAutoTools/config/PathRecord.json diff --git a/repo/js/FullyAutoAndSemiAutoTools/config/PathRecord.json b/repo/js/FullyAutoAndSemiAutoTools/config/PathRecord.json deleted file mode 100644 index 9e26dfeeb..000000000 --- a/repo/js/FullyAutoAndSemiAutoTools/config/PathRecord.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/repo/js/FullyAutoAndSemiAutoTools/main.js b/repo/js/FullyAutoAndSemiAutoTools/main.js index 5ccc40c7f..2486e7506 100644 --- a/repo/js/FullyAutoAndSemiAutoTools/main.js +++ b/repo/js/FullyAutoAndSemiAutoTools/main.js @@ -39,6 +39,7 @@ const json_path_name = { // let RecordText = `${config_root}\\record.json` // let RecordPathText = `${config_root}\\PathRecord.json` let RecordList = new Array() +let RecordPathList = new Array() let RecordLast = { uid: "", data: undefined, @@ -542,7 +543,7 @@ async function initRun(config_run) { if (cd.open && matchedPaths.length > 0) { let recordPaths = []; try { - recordPaths = Array.from(Record.paths); + recordPaths = Array.from(RecordPath.paths); } catch (e) { } @@ -552,12 +553,12 @@ async function initRun(config_run) { const timeConfig = timeConfigs.find(cfg => item.fullPathNames.includes(cfg.name) ); - if (!timeConfig) return false; + if (!timeConfig) return true; const record = recordPaths.find(r => r.path.includes(item.path) ); - if (!record || !record.timestamp) return false; + if (!record || !record.timestamp) return true; const now = Date.now(); @@ -576,7 +577,7 @@ async function initRun(config_run) { return next && now >= next; } default: - return false; + return true; } }); @@ -751,7 +752,8 @@ async function init() { await main() } } finally { - saveRecord(); + await saveRecordPaths(); + await saveRecord(); } })() @@ -841,15 +843,23 @@ async function saveRecordPaths() { })); })() }; + + // 确保 RecordPathList 是数组 + if (!Array.isArray(RecordPathList)) { + RecordPathList = []; + } + + RecordPathList.push(recordToSave) // 将记录列表转换为JSON字符串并同步写入文件 - file.writeTextSync(json_path_name.RecordText, JSON.stringify(recordToSave)) + file.writeTextSync(json_path_name.RecordPathText, JSON.stringify(RecordPathList)) + log.info("saveRecordPath保存记录文件成功") } /** * 保存当前记录到记录列表并同步到文件 * 该函数在保存前会将Set类型的数据转换为数组格式，确保JSON序列化正常进行 */ -function saveRecord() { +async function saveRecord() { // 保存前将 Set 转换为数组 // 创建一个新的记录对象，包含原始记录的所有属性 const recordToSave = { @@ -871,6 +881,7 @@ function saveRecord() { RecordList.push(recordToSave) // 将记录列表转换为JSON字符串并同步写入文件 file.writeTextSync(json_path_name.RecordText, JSON.stringify(RecordList)) + log.info("saveRecord保存记录文件成功") } /** @@ -956,7 +967,7 @@ async function initRecord() { try { // 尝试读取记录文件 // 读取后将数组转换回 Set，处理特殊的数据结构 - RecordPath = JSON.parse(file.readTextSync(json_path_name.RecordPathText), (key, value) => { + RecordPathList = JSON.parse(file.readTextSync(json_path_name.RecordPathText), (key, value) => { // 处理分组路径集合，保持嵌套的Set结构 if (key === 'paths') { return new Set(value.map(item => ({ @@ -965,8 +976,8 @@ async function initRecord() { }))); } return value; - }).find(item => item.uid === Record.uid) ?? RecordPath - + }) ?? RecordPathList + RecordPath = RecordPathList.find(item => item.uid === Record.uid) ?? RecordPath } catch (e) { // 如果读取文件出错，则忽略错误（可能是文件不存在或格式错误） } @@ -1338,29 +1349,24 @@ async function runPath(path) { } } } - - //切换队伍-end + log.info("开始执行路径: {path}", path) + await pathingScript.runFile(path) try { - log.info("开始执行路径: {path}", path) - await pathingScript.runFile(path) - if (team.fight) { - //启用战斗 - // await dispatcher.runAutoFightTask(new AutoFightParam()); - await realTimeMissions(false) - } - log.debug("路径执行完成: {path}", path) - - } catch (error) { - log.error("路径执行失败: {path}, 错误: {error}", path, error.message) - } finally { - if (team.fight) { - // 重置战斗状态 - team.fight = false - } + await sleep(1) + } catch (e) { + throw new Error(e.message) } + if (team.fight) { + //启用战斗 + // await dispatcher.runAutoFightTask(new AutoFightParam()); + await realTimeMissions(false) + // 重置战斗状态 + team.fight = false + } + log.debug("路径执行完成: {path}", path) if (auto.semi && auto.run) { log.warn(`[{mode}] 路径执行完成: {path}, 请按{key}继续`, settings.mode, path, auto.key) @@ -1407,18 +1413,14 @@ async function runList(list = [], key = "", current_name = "", parent_name = "") try { // 执行单个路径，并传入停止标识 await runPath(path); - RecordPath.paths.add(value) - await saveRecordPaths() - Record.paths.add(path) - Record.errorPaths.delete(path) } catch (error) { log.error('执行路径列表中的路径失败: {path}, 错误: {error}', path, error.message); - RecordPath.paths.delete(value) - await saveRecordPaths() - Record.paths.delete(path) Record.errorPaths.add(path) - continue; // 继续执行列表中的下一个路径 + throw new Error(error.message) + // continue; // 继续执行列表中的下一个路径 } + Record.paths.add(path) + RecordPath.paths.add(value) } log.debug(`[{mode}] 路径列表执行完成`, settings.mode); @@ -1460,13 +1462,13 @@ async function runMap(map = new Map()) { await runList(one.paths, key, one.current_name, one.parent_name); - Record.groupPaths.add(group) log.debug(`[{0}] 任务[{1}]执行完成`, settings.mode, key); } catch (error) { - Record.groupPaths.delete(group) log.error(`[{0}] 任务[{1}]执行失败: {error}`, settings.mode, key, error.message); - continue; // 继续执行下一个任务 + // continue; // 继续执行下一个任务 + throw new Error(error.message) } + Record.groupPaths.add(group) } log.debug(`[{mode}] 任务Map执行完成`, settings.mode);