From e3768cd818ff88546befcbe246cf38e9d1969d01 Mon Sep 17 00:00:00 2001 From: Tooltingsu <143606015+Tooltingsu@users.noreply.github.com> Date: Wed, 30 Apr 2025 19:46:38 +0800 Subject: [PATCH] =?UTF-8?q?js=E8=96=84=E8=8D=B7=E9=87=87=E9=9B=862.1=20(#6?= =?UTF-8?q?76)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Delete repo/js/Tool_mint/main.js * Delete repo/js/Tool_mint/manifest.json * Delete repo/js/Tool_mint/settings.json * Add files via upload --- repo/js/Tool_mint/main.js | 231 +++++++++++++++++++++++++++++--- repo/js/Tool_mint/manifest.json | 4 +- repo/js/Tool_mint/settings.json | 11 +- 3 files changed, 227 insertions(+), 19 deletions(-) diff --git a/repo/js/Tool_mint/main.js b/repo/js/Tool_mint/main.js index eb7aedbc..b563523e 100644 --- a/repo/js/Tool_mint/main.js +++ b/repo/js/Tool_mint/main.js @@ -12,13 +12,11 @@ const MintRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/Rec return; } const isRefresh = settings.isRefresh; + const routeOrder = settings.routeOrder || "效率顺序"; // 获取路线顺序选择，默认使用效率顺序 log.info(`已设置采集数量：${targetMint}`); - // 返回主界面 - genshin.returnMainUi(); - - // 定义任务数据，可从薄荷表格整理而来 -const sheet5Tasks = [ + // 定义效率顺序的任务数据 + const efficiencyTasks = [ { taskName: '薄荷E26-枫丹-佩特莉可镇', mintCount: 14 }, { taskName: '薄荷E08-枫丹-秋分山东侧', mintCount: 6 }, { taskName: '薄荷E23-枫丹-幽林雾道2', mintCount: 8 }, @@ -208,8 +206,209 @@ const sheet5Tasks = [ { taskName: '薄荷A37-雪山-寒天之钉', mintCount: 0}, { taskName: '薄荷A27-蒙德-蒙德城', mintCount: 0}, { taskName: '薄荷A21-蒙德-明冠峡3', mintCount: 0} - ]; + ]; + // 定义地图路线顺序的任务数据（假设从表格获取整理） + const mapOrderTasks = [ + {taskName: '薄荷A01-蒙德-望风角1', mintCount: 9}, + {taskName: '薄荷A02-蒙德-望风角2', mintCount: 13}, + {taskName: '薄荷A03-蒙德-望风山地1', mintCount: 6}, + {taskName: '薄荷A04-蒙德-望风山地2', mintCount: 6}, + {taskName: '薄荷A05-蒙德-摘星崖', mintCount: 3}, + {taskName: '薄荷A06-蒙德-星落湖', mintCount: 6}, + {taskName: '薄荷A07-蒙德-风起地1', mintCount: 5}, + {taskName: '薄荷A08-蒙德-风起地2', mintCount: 7}, + {taskName: '薄荷A09-蒙德-风起地3', mintCount: 3}, + {taskName: '薄荷A10-蒙德-鹰翔海滩', mintCount: 10}, + {taskName: '薄荷A11-蒙德-千风神殿', mintCount: 3}, + {taskName: '薄荷A12-蒙德-誓言岬', mintCount: 15}, + {taskName: '薄荷A13-蒙德-达达乌帕谷1', mintCount: 11}, + {taskName: '薄荷A14-蒙德-达达乌帕谷2', mintCount: 2}, + {taskName: '薄荷A15-蒙德-晨曦酒馆', mintCount: 8}, + {taskName: '薄荷A16-蒙德-奔狼领1', mintCount: 4}, + {taskName: '薄荷A17-蒙德-奔狼领2', mintCount: 3}, + {taskName: '薄荷A18-蒙德-奔狼领3', mintCount: 9}, + {taskName: '薄荷A19-蒙德-明冠峡1', mintCount: 5}, + {taskName: '薄荷A20-蒙德-明冠峡2', mintCount: 4}, + {taskName: '薄荷A21-蒙德-明冠峡3', mintCount: 0}, + {taskName: '薄荷A22-蒙德-风龙废墟1', mintCount: 7}, + {taskName: '薄荷A23-蒙德-风龙废墟2', mintCount: 7}, + {taskName: '薄荷A24-蒙德-风龙废墟3', mintCount: 9}, + {taskName: '薄荷A25-蒙德-风龙废墟4', mintCount: 5}, + {taskName: '薄荷A26-蒙德-清泉镇', mintCount: 8}, + {taskName: '薄荷A27-蒙德-蒙德城', mintCount: 0}, + {taskName: '薄荷A28-雪山-覆雪之路1', mintCount: 16}, + {taskName: '薄荷A29-雪山-覆雪之路2', mintCount: 7}, + {taskName: '薄荷A30-雪山-旧宫1', mintCount: 7}, + {taskName: '薄荷A31-雪山-旧宫2', mintCount: 4}, + {taskName: '薄荷A32-雪山-星荧洞窟1', mintCount: 19}, + {taskName: '薄荷A33-雪山-星荧洞窟2', mintCount: 5}, + {taskName: '薄荷A34-雪山-眠龙谷1', mintCount: 22}, + {taskName: '薄荷A35-雪山-眠龙谷2', mintCount: 15}, + {taskName: '薄荷A36-雪山-眠龙谷3', mintCount: 3}, + {taskName: '薄荷A37-雪山-寒天之钉', mintCount: 0}, + {taskName: '薄荷A38-雪山-近郊1', mintCount: 6}, + {taskName: '薄荷A39-雪山-近郊2', mintCount: 21}, + {taskName: '薄荷B01-璃月-石门1', mintCount: 19}, + {taskName: '薄荷B02-璃月-石门2', mintCount: 13}, + {taskName: '薄荷B03-璃月-无妄坡1', mintCount: 4}, + {taskName: '薄荷B04-璃月-无妄坡2', mintCount: 5}, + {taskName: '薄荷B05-璃月-无妄坡3', mintCount: 13}, + {taskName: '薄荷B06-璃月-无妄坡4', mintCount: 9}, + {taskName: '薄荷B07-璃月-荻花洲', mintCount: 14}, + {taskName: '薄荷B08-璃月-明藴镇1', mintCount: 13}, + {taskName: '薄荷B09-璃月-明藴镇2', mintCount: 13}, + {taskName: '薄荷B10-璃月-归离原1', mintCount: 10}, + {taskName: '薄荷B11-璃月-归离原2', mintCount: 14}, + {taskName: '薄荷B12-璃月-归离原3', mintCount: 7}, + {taskName: '薄荷B13-璃月-归离原4', mintCount: 13}, + {taskName: '薄荷B14-璃月-归离原5', mintCount: 7}, + {taskName: '薄荷B15-璃月-孤云阁', mintCount: 6}, + {taskName: '薄荷B16-璃月-渌华池1', mintCount: 3}, + {taskName: '薄荷B17-璃月-渌华池2', mintCount: 9}, + {taskName: '薄荷B18-璃月-渌华池3', mintCount: 14}, + {taskName: '薄荷B19-璃月-遁玉陵', mintCount: 14}, + {taskName: '薄荷B20-璃月-璃月港', mintCount: 1}, + {taskName: '薄荷B21-璃月-天衡山1', mintCount: 9}, + {taskName: '薄荷B22-璃月-天衡山2', mintCount: 7}, + {taskName: '薄荷B23-璃月-天衡山3', mintCount: 8}, + {taskName: '薄荷B24-璃月-青墟浦1', mintCount: 16}, + {taskName: '薄荷B25-璃月-青墟浦2', mintCount: 6}, + {taskName: '薄荷B26-璃月-灵矩关1', mintCount: 5}, + {taskName: '薄荷B27-璃月-灵矩关2', mintCount: 7}, + {taskName: '薄荷B28-璃月-灵矩关3', mintCount: 8}, + {taskName: '薄荷B29-璃月-天遒谷1', mintCount: 7}, + {taskName: '薄荷B30-璃月-天遒谷2', mintCount: 6}, + {taskName: '薄荷B31-璃月-翠玦坡1', mintCount: 24}, + {taskName: '薄荷B32-璃月-翠玦坡2', mintCount: 19}, + {taskName: '薄荷B33-璃月-奥藏山1', mintCount: 8}, + {taskName: '薄荷B34-璃月-奥藏山2', mintCount: 16}, + {taskName: '薄荷B35-璃月-绝云间1', mintCount: 18}, + {taskName: '薄荷B36-璃月-绝云间2', mintCount: 9}, + {taskName: '薄荷B37-璃月-绝云间3', mintCount: 9}, + {taskName: '薄荷B38-璃月-绝云间4', mintCount: 1}, + {taskName: '薄荷B39-璃月-庆云顶', mintCount: 5}, + {taskName: '薄荷B40-璃月-琥牢山1', mintCount: 8}, + {taskName: '薄荷B41-璃月-琥牢山2', mintCount: 6}, + {taskName: '薄荷B42-璃月-南天门', mintCount: 6}, + {taskName: '薄荷B43-璃月-采樵谷1', mintCount: 32}, + {taskName: '薄荷B44-璃月-采樵谷2', mintCount: 19}, + {taskName: '薄荷B45-沉玉谷-翘英庄1', mintCount: 6}, + {taskName: '薄荷B46-沉玉谷-翘英庄2', mintCount: 9}, + {taskName: '薄荷B47-沉玉谷-翘英庄3', mintCount: 11}, + {taskName: '薄荷B48-沉玉谷-灵濛山1', mintCount: 9}, + {taskName: '薄荷B49-沉玉谷-灵濛山2', mintCount: 4}, + {taskName: '薄荷B50-沉玉谷-药蝶谷', mintCount: 13}, + {taskName: '薄荷B51-沉玉谷-古茶树坡', mintCount: 8}, + {taskName: '薄荷B52-沉玉谷-赤璋城垣1', mintCount: 9}, + {taskName: '薄荷B53-沉玉谷-赤璋城垣2', mintCount: 5}, + {taskName: '薄荷B54-沉玉谷-赤璋城垣3', mintCount: 14}, + {taskName: '薄荷B55-沉玉谷-悬练山2', mintCount: 8}, + {taskName: '薄荷B56-沉玉谷-遗珑埠', mintCount: 5}, + {taskName: '薄荷B57-沉玉谷-暝垣山', mintCount: 8}, + {taskName: '薄荷B58-沉玉谷-宝玦口', mintCount: 9}, + {taskName: '薄荷B59-沉玉谷-赤望台1', mintCount: 10}, + {taskName: '薄荷B60-沉玉谷-赤望台2', mintCount: 17}, + {taskName: '薄荷B61-沉玉谷-赤望台3', mintCount: 10}, + {taskName: '薄荷B62-沉玉谷-赤望台4', mintCount: 7}, + {taskName: '薄荷C01-稻妻-鸣神岛-离岛', mintCount: 1}, + {taskName: '薄荷C02-稻妻-鸣神岛-荒海1', mintCount: 4}, + {taskName: '薄荷C03-稻妻-鸣神岛-荒海2', mintCount: 3}, + {taskName: '薄荷C04-稻妻-鸣神岛-绀田村', mintCount: 7}, + {taskName: '薄荷C05-稻妻-鸣神岛-神樱大社', mintCount: 1}, + {taskName: '薄荷C06-稻妻-鸣神岛-神里屋敷', mintCount: 3}, + {taskName: '薄荷C07-稻妻-鸣神岛-白狐之野', mintCount: 5}, + {taskName: '薄荷C08-稻妻-鸣神岛-稻妻城1', mintCount: 5}, + {taskName: '薄荷C09-稻妻-鸣神岛-稻妻城2', mintCount: 5}, + {taskName: '薄荷C10-稻妻-鸣神岛-堇色之庭', mintCount: 2}, + {taskName: '薄荷C11-稻妻-神无冢-九条阵屋1', mintCount: 6}, + {taskName: '薄荷C12-稻妻-神无冢-九条阵屋2', mintCount: 3}, + {taskName: '薄荷C13-稻妻-神无冢-无相之火', mintCount: 1}, + {taskName: '薄荷C14-稻妻-神无冢-踏鞴砂1', mintCount: 6}, + {taskName: '薄荷C15-稻妻-神无冢-踏鞴砂2', mintCount: 3}, + {taskName: '薄荷C16-稻妻-神无冢-踏鞴砂3', mintCount: 6}, + {taskName: '薄荷C17-稻妻-神无冢-踏鞴砂4', mintCount: 10}, + {taskName: '薄荷C18-稻妻-神无冢-名椎滩', mintCount: 5}, + {taskName: '薄荷C19-稻妻-八酝岛-无想刃狭间', mintCount: 6}, + {taskName: '薄荷C20-稻妻-八酝岛-藤兜砦1', mintCount: 7}, + {taskName: '薄荷C21-稻妻-八酝岛-藤兜砦2', mintCount: 5}, + {taskName: '薄荷C22-稻妻-八酝岛-绯木村', mintCount: 6}, + {taskName: '薄荷C23-稻妻-八酝岛-蛇神之首1', mintCount: 4}, + {taskName: '薄荷C24-稻妻-八酝岛-蛇神之首2', mintCount: 6}, + {taskName: '薄荷C25-稻妻-八酝岛-蛇骨矿洞1', mintCount: 8}, + {taskName: '薄荷C26-稻妻-八酝岛-蛇骨矿洞2', mintCount: 7}, + {taskName: '薄荷C27-稻妻-八酝岛-蛇骨矿洞3', mintCount: 12}, + {taskName: '薄荷C28-稻妻-海祇岛-水月池1', mintCount: 1}, + {taskName: '薄荷C29-稻妻-海祇岛-水月池2', mintCount: 2}, + {taskName: '薄荷C30-稻妻-海祇岛-曚云神社', mintCount: 5}, + {taskName: '薄荷C31-稻妻-海祇岛-珊瑚宫', mintCount: 11}, + {taskName: '薄荷C32-稻妻-海祇岛-望泷村1', mintCount: 6}, + {taskName: '薄荷C33-稻妻-海祇岛-望泷村2', mintCount: 8}, + {taskName: '薄荷C34-稻妻-清籁岛-越石村', mintCount: 6}, + {taskName: '薄荷C35-稻妻-清籁岛-平海砦', mintCount: 2}, + {taskName: '薄荷C35-稻妻-清籁岛-平海砦', mintCount: 2}, + {taskName: '薄荷C36-稻妻-清籁岛-天云峠1', mintCount: 3}, + {taskName: '薄荷C37-稻妻-清籁岛-天云峠2', mintCount: 7}, + {taskName: '薄荷C38-稻妻-清籁岛-浅濑神社', mintCount: 20}, + {taskName: '薄荷C39-稻妻-鹤观-知比山', mintCount: 7}, + {taskName: '薄荷C40-稻妻-鹤观-笈名海滨', mintCount: 7}, + {taskName: '薄荷C41-稻妻-鹤观-茂知祭场1', mintCount: 6}, + {taskName: '薄荷C42-稻妻-鹤观-茂知祭场2', mintCount: 4}, + {taskName: '薄荷C43-稻妻-鹤观-茂知祭场3', mintCount: 7}, + {taskName: '薄荷C44-稻妻-鹤观-茂知祭场4', mintCount: 3}, + {taskName: '薄荷C45-稻妻-鹤观-惑饲滩', mintCount: 3}, + {taskName: '薄荷C46-稻妻-鸣神岛-镇守之森', mintCount: 1}, + {taskName: '薄荷E01-枫丹-海露港', mintCount: 2}, + {taskName: '薄荷E02-枫丹-厄里那斯1', mintCount: 3}, + {taskName: '薄荷E03-枫丹-厄里那斯2', mintCount: 8}, + {taskName: '薄荷E04-枫丹-厄里那斯3', mintCount: 7}, + {taskName: '薄荷E05-枫丹-厄里那斯4', mintCount: 4}, + {taskName: '薄荷E06-枫丹-厄里那斯5', mintCount: 5}, + {taskName: '薄荷E07-枫丹-秋分山西侧', mintCount: 5}, + {taskName: '薄荷E08-枫丹-秋分山东侧', mintCount: 6}, + {taskName: '薄荷E09-枫丹-枫丹廷1', mintCount: 6}, + {taskName: '薄荷E10-枫丹-枫丹廷2', mintCount: 6}, + {taskName: '薄荷E11-枫丹-芒索斯山东麓', mintCount: 1}, + {taskName: '薄荷E12-枫丹-新枫丹科学院1', mintCount: 6}, + {taskName: '薄荷E13-枫丹-新枫丹科学院2', mintCount: 7}, + {taskName: '薄荷E14-枫丹-新枫丹科学院3', mintCount: 17}, + {taskName: '薄荷E15-枫丹-新枫丹科学院4', mintCount: 6}, + {taskName: '薄荷E16-枫丹-新枫丹科学院5', mintCount: 11}, + {taskName: '薄荷E17-枫丹-中央实验室遗址1', mintCount: 9}, + {taskName: '薄荷E18-枫丹-中央实验室遗址2', mintCount: 11}, + {taskName: '薄荷E19-枫丹-中央实验室遗址3', mintCount: 5}, + {taskName: '薄荷E20-枫丹-优兰尼娅湖1', mintCount: 15}, + {taskName: '薄荷E21-枫丹-茉洁站', mintCount: 10}, + {taskName: '薄荷E22-枫丹-幽林雾道1', mintCount: 12}, + {taskName: '薄荷E23-枫丹-幽林雾道2', mintCount: 8}, + {taskName: '薄荷E24-枫丹-湖中垂柳', mintCount: 15}, + {taskName: '薄荷E25-枫丹-卡布狄斯堡遗迹', mintCount: 4}, + {taskName: '薄荷E26-枫丹-佩特莉可镇', mintCount: 14}, + {taskName: '薄荷F01-纳塔-回声之子', mintCount: 0}, + {taskName: '薄荷F02-纳塔-流泉之众1', mintCount: 2}, + {taskName: '薄荷F03-纳塔-流泉之众2', mintCount: 1}, + {taskName: '薄荷F04-纳塔-流泉之众3', mintCount: 0}, + {taskName: '薄荷F05-纳塔-流泉之众4', mintCount: 1}, + {taskName: '薄荷F06-纳塔-流泉之众5', mintCount: 1}, + {taskName: '薄荷F07-纳塔-烟密主1', mintCount: 1}, + {taskName: '薄荷F08-纳塔-烟密主2', mintCount: 2}, + {taskName: '薄荷F09-纳塔-烟密主3', mintCount: 1}, + {taskName: '薄荷F10-纳塔-烟密主4', mintCount: 1}, + {taskName: '薄荷F11-纳塔-花语会1', mintCount: 2}, + {taskName: '薄荷F12-纳塔-花语会2', mintCount: 5}, + {taskName: '薄荷F13-纳塔-花语会3', mintCount: 3}, + {taskName: '薄荷F14-纳塔-花语会4', mintCount: 2}, + {taskName: '薄荷F15-纳塔-花语会5', mintCount: 6}, + {taskName: '薄荷F16-纳塔-花语会6', mintCount: 4} + ]; + + // 根据路线顺序选择重新排列任务数据 + let orderedTasks = []; + if (routeOrder === "效率顺序") { + orderedTasks = efficiencyTasks; + } else if (routeOrder === "地图顺序") { + orderedTasks = mapOrderTasks; + } // 读取/初始化进度文件（存储上次执行到的任务索引），假设file模块有相关功能 let currentIndex = 0; @@ -217,7 +416,7 @@ const sheet5Tasks = [ try { const progress = await file.readText("mint_progress.txt"); currentIndex = parseInt(progress); - if (isNaN(currentIndex) || currentIndex < 0 || currentIndex >= sheet5Tasks.length) { + if (isNaN(currentIndex) || currentIndex < 0 || currentIndex >= orderedTasks.length) { currentIndex = 0; } } catch (error) { @@ -238,18 +437,21 @@ const sheet5Tasks = [ await file.writeText("mint_progress.txt", "0"); await file.writeText("last_execution_date.txt", currentDate); currentIndex = 0; + log.info("自动检测到薄荷刷新，将从头开始执行路线"); } else { // 更新执行日期，假设file模块有相关功能 await file.writeText("last_execution_date.txt", currentDate); } + //返回主界面 + genshin.returnMainUi(); + // 记录初始薄荷数量 const initialMintCount = await getMintCount(); - let collected = 0; let taskIndex = currentIndex; while (collected < targetMint) { - const currentTask = sheet5Tasks[taskIndex]; + const currentTask = orderedTasks[taskIndex]; if (!currentTask) { taskIndex = 0; continue; @@ -261,7 +463,7 @@ const sheet5Tasks = [ } catch (error) { log.info(`未检测到脚本 ${currentTask.taskName}，跳过该任务`); taskIndex++; - if (taskIndex >= sheet5Tasks.length) { + if (taskIndex >= orderedTasks.length) { taskIndex = 0; } continue; @@ -271,18 +473,15 @@ const sheet5Tasks = [ dispatcher.addTimer(new RealtimeTimer("AutoPick")); await pathingScript.runFile(scriptPath); await sleep(1000); - // 识别当前薄荷数量 const currentMintCount = await getMintCount(); const mintCollectedThisRoute = currentMintCount - initialMintCount - collected; collected += mintCollectedThisRoute; - log.info(`已完成${currentTask.taskName}路线，该路线已采集${mintCollectedThisRoute}个薄荷，共采集${collected}个薄荷`); - taskIndex++; // 记录进度，假设file模块有相关功能 await file.writeText("mint_progress.txt", taskIndex.toString()); - if (taskIndex >= sheet5Tasks.length) { + if (taskIndex >= orderedTasks.length) { taskIndex = 0; } if (collected >= targetMint) { @@ -304,7 +503,6 @@ async function getMintCount() { await sleep(1000); keyPress("B"); await sleep(1500); - let mintCount = 0; let materials = captureGameRegion().find(MaterialsRo); let materialsSelected = captureGameRegion().find(MaterialsSelectedRo); @@ -315,7 +513,6 @@ async function getMintCount() { materialsSelected.click(); await sleep(1500); } - for (let i = 0; i < 10; i++) { let mint = captureGameRegion().find(MintRo); if (mint.isExist()) { @@ -323,6 +520,8 @@ async function getMintCount() { for (let j = 0; j < resList.count; j++) { let mintResult = resList[j]; mintCount = parseInt(mintResult.text); + // 输出日志 + log.info(`检测到薄荷数量：${mintCount}`); break; } if (mintCount > 0) { diff --git a/repo/js/Tool_mint/manifest.json b/repo/js/Tool_mint/manifest.json index a457c94b..a0973c02 100644 --- a/repo/js/Tool_mint/manifest.json +++ b/repo/js/Tool_mint/manifest.json @@ -1,9 +1,9 @@ { "manifest_version": 1, "name": "薄荷采集", - "version": "2.0", + "version": "2,1", "bgi_version": "0.44.7", - "description": "按薄荷效率大小顺序执行地图追踪脚本采集薄荷，支持断点续传", + "description": "自动执行地图追踪脚本采集薄荷", "authors": [ { "name": "Tool_tingsu", diff --git a/repo/js/Tool_mint/settings.json b/repo/js/Tool_mint/settings.json index 03b9ffc8..91a65ee1 100644 --- a/repo/js/Tool_mint/settings.json +++ b/repo/js/Tool_mint/settings.json @@ -1,4 +1,13 @@ [ +{ + "name": "routeOrder", + "type": "select", + "label": "路线顺序选择（默认：效率顺序）", + "options": [ + "效率顺序", + "地图顺序" + ] +}, { "name": "targetMintCount", "type": "input-text", @@ -7,6 +16,6 @@ { "name": "isRefresh", "type": "checkbox", - "label": "是否刷新" + "label": "是否刷新（薄荷每天0时刷新）" } ] \ No newline at end of file