diff --git a/repo/js/自动小怪锄地规划/info.xlsx b/repo/js/自动小怪锄地规划/info.xlsx index ee99b5a5..822a1c76 100644 Binary files a/repo/js/自动小怪锄地规划/info.xlsx and b/repo/js/自动小怪锄地规划/info.xlsx differ diff --git a/repo/js/自动小怪锄地规划/main.js b/repo/js/自动小怪锄地规划/main.js index 69bbc0fc..7b7dd8cd 100644 --- a/repo/js/自动小怪锄地规划/main.js +++ b/repo/js/自动小怪锄地规划/main.js @@ -6,11 +6,13 @@ const excludeHighRisk = !!settings.excludeHighRisk; // 默认值为false（默认不排除） const weight = parseFloat(settings.weight || 2); // 默认值为2 const disableAutoPick = !!settings.disableAutoPick; // 默认值为false（默认不禁用） - const enableCooldownCheck = !!settings.enableCooldownCheck; // 默认值为false（默认不启用） + const disableCooldownCheck = !!settings.disableCooldownCheck; // 默认值为false（默认不禁用CD检测） + const accountName = settings.accountName || "一个账户名"; // 新增账户名，默认值为“默认账户” const pathingDir = 'pathing/'; // 初始化pathingDir参数 + const enableCooldownCheck = !disableCooldownCheck; // 如果 disableCooldownCheck 未设置或为 false，则 enableCooldownCheck 为 true // 初始化用于计数的变量 - let outputFolderName = ""; // 初始化为空 + let outputFolderName = accountName; // 初始化为空 let totalMonsterCount = 0; // 筛选出的怪物总数 let selectedRoutes = []; // 筛选出的路线数组 let successCount = 0; // 成功复制的文件数量 @@ -34,9 +36,28 @@ `${excludeWaterFree ? '排除水免（默认：不排除）' : '包含水免（默认）'}，` + `${excludeHighRisk ? '排除高危（默认：不排除）' : '包含高危（默认）'}，` + `权重=${weight}（默认2），` + - `自动拾取=${disableAutoPick ? '禁用' : '启用'}` + `自动拾取=${disableAutoPick ? '禁用' : '启用'}，` + + `CD检测=${disableCooldownCheck ? '禁用' : '启用'}，` + + `账户名=${accountName}` ); + // 检查是否所有配置都是默认状态 + const isDefaultConfig = ( + operationMode === "生成路径文件" && + requiredMonsterCount === 1750 && + !excludeWaterFree && + !excludeHighRisk && + weight === 2 && + !disableAutoPick && + enableCooldownCheck && + accountName === "一个账户名" + ); + + if (isDefaultConfig) { + log.warn(`你没有修改自定义配置，请在配置组界面中右键本js以修改自定义配置`); + } + + // 验证配置参数 if ( isNaN(requiredMonsterCount) || @@ -52,9 +73,6 @@ return; } - // 文件夹/文件名称，则使用默认规则命名 - outputFolderName = `${requiredMonsterCount}${excludeWaterFree ? '排除水免' : '包含水免'}${excludeHighRisk ? '排除高危' : '包含高危'}权重${weight}`; - // 根据自定义配置，如果没有禁用自动拾取，则启用自动拾取 if (!disableAutoPick) { log.info("启用自动拾取的实时任务"); @@ -62,77 +80,77 @@ } // 判断操作模式是否为“执行路径文件”，若是则执行路径文件 -if (operationMode === "执行路径文件") { - try { - // 定义路径组文件的路径，使用 outputFolderName - const pathGroupFilePath = `route/${outputFolderName}.txt`; + if (operationMode === "执行路径文件") { + try { + // 定义路径组文件的路径，使用 outputFolderName + const pathGroupFilePath = `route/${outputFolderName}.txt`; - const pathGroupContent = await file.readText(pathGroupFilePath); - const savedRoutes = pathGroupContent.trim().split('\n'); - for (let i = 0; i < savedRoutes.length; i++) { - const routeWithTimestamp = savedRoutes[i].trim(); - const [routeName, routeTimestamp] = routeWithTimestamp.split('::'); - log.info(`当前任务为第 ${i + 1}/${savedRoutes.length} 个`); - const now = new Date(); // 获取开始时间 - const startTime = now.toISOString(); + const pathGroupContent = await file.readText(pathGroupFilePath); + const savedRoutes = pathGroupContent.trim().split('\n'); + for (let i = 0; i < savedRoutes.length; i++) { + const routeWithTimestamp = savedRoutes[i].trim(); + const [routeName, routeTimestamp] = routeWithTimestamp.split('::'); + log.info(`当前任务为第 ${i + 1}/${savedRoutes.length} 个`); + const now = new Date(); // 获取开始时间 + const startTime = now.toISOString(); -// 更新 runtime 变量 - runtime6 = runtime5; - runtime5 = runtime4; - runtime4 = runtime3; - runtime3 = runtime2; - runtime2 = runtime1; - runtime1 = now.getTime(); + // 更新 runtime 变量 + runtime6 = runtime5; + runtime5 = runtime4; + runtime4 = runtime3; + runtime3 = runtime2; + runtime2 = runtime1; + runtime1 = now.getTime(); - // 检查时间差条件 - if ((runtime1 - runtime2) < 500 && - (runtime2 - runtime3) < 500 && - (runtime3 - runtime4) < 500 && - (runtime4 - runtime5) < 500 && - (runtime5 - runtime6) < 500) { - log.info(`连续五次时间差小于 500 毫秒，循环终止。`); - break; // 如果连续五次时间差小于 500 毫秒，退出循环 - } + // 检查时间差条件 + if ((runtime1 - runtime2) < 500 && + (runtime2 - runtime3) < 500 && + (runtime3 - runtime4) < 500 && + (runtime4 - runtime5) < 500 && + (runtime5 - runtime6) < 500) { + log.info(`连续五次时间差小于 500 毫秒，循环终止。`); + break; // 如果连续五次时间差小于 500 毫秒，退出循环 + } - if (enableCooldownCheck && startTime < routeTimestamp) { - log.info(`当前路线 ${routeName} 未刷新，跳过任务`); - await sleep(500); - continue; // 跳过当前循环 - } - log.info(`当前路线 ${routeName} 已刷新或未启用CD检测，执行任务`); + if (enableCooldownCheck && startTime < routeTimestamp) { + log.info(`当前路线 ${routeName} 未刷新，跳过任务`); + await sleep(500); + continue; // 跳过当前循环 + } + log.info(`当前路线 ${routeName} 已刷新或未启用CD检测，执行任务`); - // 拼接路径文件的完整路径 - const pathingFilePath = `pathing/${routeName}.json`; - // 执行路径文件 - await pathingScript.runFile(pathingFilePath); + // 拼接路径文件的完整路径 + const pathingFilePath = `pathing/${routeName}.json`; + // 执行路径文件 + await pathingScript.runFile(pathingFilePath); - // 如果启用了CD检测，获取结束时间并判断时间差 - if (enableCooldownCheck) { - const endTime = new Date(); // 获取结束时间 - const timeDiff = endTime - now; // 计算时间差（单位：毫秒） - if (timeDiff > 10000) { // 如果时间差大于10秒（10000毫秒） - // 计算新的时间戳，增加12小时 - const newTimestamp = new Date(startTime).getTime() + 12 * 60 * 60 * 1000; - const formattedNewTimestamp = new Date(newTimestamp).toISOString(); - const nextAvailableTime = new Date(formattedNewTimestamp).toLocaleString(); // 转换为本地时间格式 - log.info(`任务 ${routeName} 运行超过10秒且当前启用刷新CD检测，下一次可用时间为 ${nextAvailableTime}`); - log.info(`新的时间戳为：${formattedNewTimestamp}`); + // 如果启用了CD检测，获取结束时间并判断时间差 + if (enableCooldownCheck) { + const endTime = new Date(); // 获取结束时间 + const timeDiff = endTime - now; // 计算时间差（单位：毫秒） + if (timeDiff > 10000) { // 如果时间差大于10秒（10000毫秒） + // 计算新的时间戳，增加12小时 + const newTimestamp = new Date(startTime).getTime() + 12 * 60 * 60 * 1000; + const formattedNewTimestamp = new Date(newTimestamp).toISOString(); + const nextAvailableTime = new Date(formattedNewTimestamp).toLocaleString(); // 转换为本地时间格式 + log.info(`任务 ${routeName} 运行超过10秒且当前启用刷新CD检测，下一次可用时间为 ${nextAvailableTime}`); + log.info(`新的时间戳为：${formattedNewTimestamp}`); - // 更新 savedRoutes 中对应部分的时间戳 - savedRoutes[i] = `${routeName}::${formattedNewTimestamp}`; + // 更新 savedRoutes 中对应部分的时间戳 + savedRoutes[i] = `${routeName}::${formattedNewTimestamp}`; - // 立即将更新后的内容写回文件 - const updatedContent = savedRoutes.join('\n'); - await file.writeText(pathGroupFilePath, updatedContent); + // 立即将更新后的内容写回文件 + const updatedContent = savedRoutes.join('\n'); + await file.writeText(pathGroupFilePath, updatedContent); + } } } + } catch (error) { + log.error(`读取或写入路径组文件时出错: ${error}`); } - } catch (error) { - log.error(`读取或写入路径组文件时出错: ${error}`); } -} - // 筛选、排序并选取路线 + // 筛选、排序并选取路线 const indexPath = `index.txt`; try { const indexContent = await file.readText(indexPath); @@ -173,43 +191,45 @@ if (operationMode === "执行路径文件") { log.warn(`数量不足，最多可以包含 ${totalMonsterCount} 只怪物，不满足所需的 ${requiredMonsterCount} 只怪物`); } - // 根据操作模式执行相应的操作 -if (operationMode === "生成路径文件") { - const pathGroupName = `${requiredMonsterCount}${excludeWaterFree ? '排除水免' : '包含水免'}${excludeHighRisk ? '排除高危' : '包含高危'}权重${weight}.txt`; - const pathGroupFilePath = `route/${pathGroupName}`; + // 根据操作模式执行相应的操作 + if (operationMode === "生成路径文件") { + // 使用 outputFolderName 作为路径组文件的名称，并添加 .txt 扩展名 + const pathGroupName = `${outputFolderName}.txt`; + const pathGroupFilePath = `route/${pathGroupName}`; - // 初始化CD信息的时间戳 - const initialCDTimestamp = "::2000-01-01T00:00:00.000Z"; - // 按照 index.txt 中的顺序依次检验每个路线是否需要写入文件 - const resultContent = pathingFiles - .filter(route => selectedRoutes.includes(route.name)) - .map(route => `${route.name}${initialCDTimestamp}`) - .join('\n'); + // 初始化CD信息的时间戳 + const initialCDTimestamp = "::2000-01-01T00:00:00.000Z"; - await file.writeText(pathGroupFilePath, resultContent); - log.info(`生成成功，共计 ${selectedRoutes.length} 条路线，路径组文件已保存到 ${pathGroupFilePath}，请将js自定义配置中操作模式改为执行路径文件以执行`); -} else if (operationMode === "输出地图追踪文件") { - const pathingOutDir = `pathingout/${outputFolderName}/`; // 输出文件夹路径 + // 按照 index.txt 中的顺序依次检验每个路线是否需要写入文件 + const resultContent = pathingFiles + .filter(route => selectedRoutes.includes(route.name)) + .map(route => `${route.name}${initialCDTimestamp}`) + .join('\n'); - // 将选中的地图追踪文件复制到对应的输出文件夹 - for (const routeName of selectedRoutes) { - const sourceFilePath = `${pathingDir}${routeName}.json`; - const targetFilePath = `${pathingOutDir}${routeName}.json`; - try { - const fileContent = await file.readText(sourceFilePath); - await file.writeText(targetFilePath, fileContent); - // log.debug(`文件 ${routeName}.json 已复制到 ${pathingOutDir}`); - successCount++; - } catch (error) { - log.warn(`复制文件 ${routeName}.json 时出错: ${error}`); - failCount++; + await file.writeText(pathGroupFilePath, resultContent); + log.info(`生成成功，共计 ${selectedRoutes.length} 条路线，路径组文件已保存到 ${pathGroupFilePath}，请将js自定义配置中操作模式改为执行路径文件以执行`); + } else if (operationMode === "输出地图追踪文件") { + const pathingOutDir = `pathingout/${outputFolderName}/`; // 输出文件夹路径 + + // 将选中的地图追踪文件复制到对应的输出文件夹 + for (const routeName of selectedRoutes) { + const sourceFilePath = `${pathingDir}${routeName}.json`; + const targetFilePath = `${pathingOutDir}${routeName}.json`; + try { + const fileContent = await file.readText(sourceFilePath); + await file.writeText(targetFilePath, fileContent); + // log.debug(`文件 ${routeName}.json 已复制到 ${pathingOutDir}`); + successCount++; + } catch (error) { + log.warn(`复制文件 ${routeName}.json 时出错: ${error}`); + failCount++; + } + } + + log.info(`筛选完成，共计 ${selectedRoutes.length} 条路线。`); + log.info(`文件复制完成：成功 ${successCount} 个，失败 ${failCount} 个。`); } - } - - log.info(`筛选完成，共计 ${selectedRoutes.length} 条路线。`); - log.info(`文件复制完成：成功 ${successCount} 个，失败 ${failCount} 个。`); -} } catch (error) { log.error(`读取路径文件索引文件 ${indexPath} 时出错: ${error}`); } diff --git a/repo/js/自动小怪锄地规划/route/1750包含水免包含高危权重2.txt b/repo/js/自动小怪锄地规划/route/一个账户名.txt similarity index 100% rename from repo/js/自动小怪锄地规划/route/1750包含水免包含高危权重2.txt rename to repo/js/自动小怪锄地规划/route/一个账户名.txt diff --git a/repo/js/自动小怪锄地规划/settings.json b/repo/js/自动小怪锄地规划/settings.json index 5fa89e91..0e2629ba 100644 --- a/repo/js/自动小怪锄地规划/settings.json +++ b/repo/js/自动小怪锄地规划/settings.json @@ -20,9 +20,9 @@ "label": "是否排除高危路线（默认：不排除）" }, { - "name": "enableCooldownCheck", + "name": "disableCooldownCheck", "type": "checkbox", - "label": "是否启用刷新CD检测（默认：不启用）" + "label": "是否禁用刷新CD检测（默认：不禁用）" }, { "name": "disableAutoPick", @@ -32,11 +32,16 @@ { "name": "requiredMonsterCount", "type": "input-text", - "label": "所需怪物数量（0-2000，默认1800）" + "label": "所需怪物数量（0-2000，默认1750）" }, { "name": "weight", "type": "input-text", "label": "权重（数值越大越强调效率而不是总收益，默认2）" + }, + { + "name": "accountName", + "type": "input-text", + "label": "账户名，用于区分不同账号的信息" } ] diff --git a/repo/js/自动小怪锄地规划/~$info.xlsx b/repo/js/自动小怪锄地规划/~$info.xlsx deleted file mode 100644 index 1e0c8b3a..00000000 Binary files a/repo/js/自动小怪锄地规划/~$info.xlsx and /dev/null differ diff --git a/repo/js/自动精英锄地规划/main.js b/repo/js/自动精英锄地规划/main.js index 2dd02d6a..664da0c5 100644 --- a/repo/js/自动精英锄地规划/main.js +++ b/repo/js/自动精英锄地规划/main.js @@ -5,21 +5,47 @@ let selectTagsForPathGroup2 = settings.selectTagsForPathGroup2 || ""; // 路径组2选择标签 let selectTagsForPathGroup3 = settings.selectTagsForPathGroup3 || ""; // 路径组3选择标签 const disableAutoPickup = settings.disableAutoPickup || false; // 是否禁用自动拾取 - const enableRouteCdCheck = settings.enableRouteCdCheck || false; // 是否启用路线CD检测 + const disableRouteCdCheck = settings.disableRouteCdCheck || false; // 是否禁用路线CD检测 const requiredMonsterCount = parseInt(settings.requiredMonsterCount, 10) || 405; // 目标怪物数量 const minSecPerMonster = parseFloat(settings.minSecPerMonster) || 0.1; // 最低秒均 + const accountName = settings.accountName || "一个账户名"; // 账户名 // 新增全局排除关键词的配置 const excludeTagsForAll = settings.excludeTagsForAll || ""; // 全局排除关键词 const excludeTagsForAllArray = excludeTagsForAll.split('；').map(tag => tag.trim()).filter(tag => tag !== ""); - // 生成默认的文件夹/文件名 - let outputFolderName = `${requiredMonsterCount}-${excludeTagsForPathGroup1}-${selectTagsForPathGroup2}-${selectTagsForPathGroup3}-${minSecPerMonster}`; + // 生成默认的文件夹/文件名，现在默认为 accountName + let outputFolderName = accountName; // 日志输出配置信息 - log.info(`配置信息：操作类型=${operationType}, 路径组1排除标签=${excludeTagsForPathGroup1}, 路径组2选择标签=${selectTagsForPathGroup2}, 路径组3选择标签=${selectTagsForPathGroup3}, 是否禁用自动拾取=${disableAutoPickup}, 是否启用路线CD检测=${enableRouteCdCheck}, 目标怪物数量=${requiredMonsterCount}, 最低秒均=${minSecPerMonster}, 全局排除关键词=${excludeTagsForAll}`); + log.info(`配置信息：操作类型=${operationType}, 路径组1排除标签=${excludeTagsForPathGroup1}, 路径组2选择标签=${selectTagsForPathGroup2}, 路径组3选择标签=${selectTagsForPathGroup3}, 是否禁用自动拾取=${disableAutoPickup}, 是否禁用路线CD检测=${disableRouteCdCheck}, 目标怪物数量=${requiredMonsterCount}, 最低秒均=${minSecPerMonster}, 全局排除关键词=${excludeTagsForAll}, 账户名=${accountName}`); log.info(`解析的全局排除关键词：${excludeTagsForAllArray.join(', ')}`); + // 根据 disableRouteCdCheck 的值设置 enableRouteCdCheck + const enableRouteCdCheck = !disableRouteCdCheck; // 如果 disableRouteCdCheck 为 true，则 enableRouteCdCheck 为 false，反之亦然 + + // 新增校验：检查所有配置是否都是默认状态 + const defaultSettings = { + operationType: "生成路径组文件", + excludeTagsForPathGroup1: "", + selectTagsForPathGroup2: "", + selectTagsForPathGroup3: "", + disableAutoPickup: false, + disableRouteCdCheck: false, + requiredMonsterCount: 405, + minSecPerMonster: 0.1, + accountName: "一个账户名", + excludeTagsForAll: "" + }; + + const isAllDefault = Object.entries(defaultSettings).every(([key, defaultValue]) => { + return settings[key] === undefined || settings[key] === defaultValue; + }); + + if (isAllDefault) { + log.warn("所有配置项均为默认状态，请检查是否需要调整配置你没有修改自定义配置，请在配置组界面中右键本js以修改自定义配置。"); + } + // 定义六个运行时变量，初始值分别为 2000、1000、0、0、0、0 let runtime1 = 2000; let runtime2 = 1000; @@ -342,7 +368,7 @@ } log.info(`路径组${i + 1}复制完成：成功 ${successCount} 个，失败 ${failCount} 个`); } - log.info(`怪物总数${totalMonsterCount}，请前往pathingout文件夹提取文件`); + log.info(`怪物总数${totalMonsterCount}，请前往pathingout文件夹提取文件`); } } catch (error) { log.error(`读取索引文件失败：${error}`); diff --git a/repo/js/自动精英锄地规划/settings.json b/repo/js/自动精英锄地规划/settings.json index 3252c146..9c126451 100644 --- a/repo/js/自动精英锄地规划/settings.json +++ b/repo/js/自动精英锄地规划/settings.json @@ -32,9 +32,9 @@ "label": "是否禁用自动拾取（默认不禁用）" }, { - "name": "enableRouteCdCheck", + "name": "disableRouteCdCheck", "type": "checkbox", - "label": "是否启用路线CD检测（默认不启用）" + "label": "是否禁用路线CD检测（默认不禁用）" }, { "name": "requiredMonsterCount", @@ -50,5 +50,10 @@ "name": "excludeTagsForAll", "type": "input-text", "label": "全局排除关键词（使用中文分号分隔）" + }, + { + "name": "accountName", + "type": "input-text", + "label": "账户名，用于区分不同的账户" } ]