From f2799246b28444fd411de45956b888bb8bb0b9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B7=E4=B8=AA=E5=90=8D=E5=AD=97=E5=A5=BD=E9=9A=BE?= <25520958+MisakaAldrich@users.noreply.github.com> Date: Tue, 18 Mar 2025 09:39:49 +0800 Subject: [PATCH] =?UTF-8?q?JS=E8=84=9A=E6=9C=AC=EF=BC=9A=E4=BC=90=E6=9C=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A2=A6=E8=A7=81=E6=9C=A8=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=80=97=E6=97=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=EF=BC=8C=E5=88=B7=E8=82=89=E8=A1=A5=E5=85=85=E4=B8=80=E5=A4=84?= =?UTF-8?q?=E5=BB=B6=E8=BF=9F=20(#447)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * JS脚本：修改梦见木路径 * JS脚本：刷肉补充一处神像返回触发点延迟，伐木增加时长输出 --- .../稻妻-甘金岛-梦见木-0个(大循环).json | 99 +++++++++++++++ .../稻妻-甘金岛-梦见木-45个(大循环).json | 105 ---------------- .../稻妻-甘金岛-梦见木-45个(循环).json | 118 ++++++++++++------ repo/js/AutoWoodcutting-Pathing/main.js | 17 ++- repo/js/AutoWoodcutting-Pathing/manifest.json | 2 +- repo/js/Auto好感&刷兽肉/main.js | 1 + repo/js/Auto好感&刷兽肉/manifest.json | 2 +- 7 files changed, 199 insertions(+), 145 deletions(-) create mode 100644 repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-0个(大循环).json delete mode 100644 repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-45个(大循环).json diff --git a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-0个(大循环).json b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-0个(大循环).json new file mode 100644 index 00000000..b6e90a63 --- /dev/null +++ b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-0个(大循环).json @@ -0,0 +1,99 @@ +{ + "info": { + "name": "稻妻-甘金岛-梦见木-0个(大循环)", + "type": "collect", + "author": "起个名字好难", + "version": "1.1", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -4232.216796875, + "y": -3002.05078125, + "action": "", + "move_mode": "walk", + "type": "teleport", + "locked": false + }, + { + "id": 2, + "x": -4217.91015625, + "y": -2980.302734375, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "", + "locked": false + }, + { + "id": 3, + "x": -4151.078125, + "y": -2968.4287109375, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "" + }, + { + "id": 4, + "x": -4117.685546875, + "y": -2916.8291015625, + "type": "path", + "move_mode": "dash", + "action": "", + "action_params": "" + }, + { + "id": 5, + "x": -4011.484375, + "y": -2963.87109375, + "type": "path", + "move_mode": "dash", + "action": "", + "action_params": "", + "locked": false + }, + { + "id": 6, + "x": -4001.5341796875, + "y": -2960.849609375, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path", + "locked": false + }, + { + "id": 7, + "x": -3988.7275390625, + "y": -2963.3701171875, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path", + "locked": false + }, + { + "id": 8, + "x": -3981.16796875, + "y": -2985.267578125, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path", + "locked": false + }, + { + "id": 9, + "x": -3996.86328125, + "y": -2976.578125, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "orientation", + "locked": false + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-45个(大循环).json b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-45个(大循环).json deleted file mode 100644 index 107b1cdb..00000000 --- a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-45个(大循环).json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "info": { - "name": "稻妻-甘金岛-梦见木-45个", - "type": "collect", - "author": "起个名字好难", - "version": "1.0", - "description": "", - "bgiVersion": "0.35.1" - }, - "positions": [ - { - "id": 1, - "action": "", - "move_mode": "walk", - "type": "teleport", - "x": -4232.216796875, - "y": -3002.05078125 - }, - { - "x":-4224.681640625, - "y":-2989.810546875, - "type":"path", - "move_mode":"run" - }, - { - "id": 2, - "x": -4141.107421875, - "y": -2998.44140625, - "type": "path", - "move_mode": "run", - "action": "" - }, - { - "id": 3, - "x": -4003.716796875, - "y": -2969.8173828125, - "type": "path", - "move_mode": "run", - "action": "" - }, - { - "id": 4, - "x": -3996.86328125, - "y": -2976.578125, - "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z),wait(2.5)" - }, - { - "id": 5, - "x": -4010.0439453125, - "y": -2984.115234375, - "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z),wait(1.5)" - }, - { - "id": 6, - "x": -4031.265625, - "y": -3000.931640625, - "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z)" - }, - { - "id": 7, - "x": -4039.6923828125, - "y": -3022.5771484375, - "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z),wait(1.5)" - }, - { - "id": 8, - "x": -4020.197265625, - "y": -3013.8046875, - "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z),wait(1.8)" - }, - { - "id": 9, - "x": -4001.1005859375, - "y": -3007.08984375, - "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z),wait(1)" - }, - { - "id": 10, - "x": -3978.7841796875, - "y": -2991.3134765625, - "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z)" - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-45个(循环).json b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-45个(循环).json index db24edb4..9ef10dd8 100644 --- a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-45个(循环).json +++ b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/稻妻-梦见木/稻妻-甘金岛-梦见木-45个(循环).json @@ -1,75 +1,121 @@ { "info": { - "name": "稻妻-甘金岛-梦见木-45个", + "name": "稻妻-甘金岛-梦见木-45个(循环)", "type": "collect", "author": "起个名字好难", - "version": "1.0", + "version": "1.1", "description": "", - "bgiVersion": "0.35.1" + "bgiVersion": "0.42.3" }, "positions": [ { - "id": 4, + "id": 1, "x": -3996.86328125, "y": -2976.578125, - "type": "path", - "move_mode": "walk", "action": "combat_script", - "action_params": "keypress(VK_Z),wait(2.5)" + "move_mode": "walk", + "action_params": "keypress(VK_Z),wait(2)", + "type": "target", + "locked": false + }, + { + "id": 2, + "x": -4010.0439453125, + "y": -2984.115234375, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "orientation", + "locked": false + }, + { + "id": 3, + "x": -4010.0439453125, + "y": -2984.115234375, + "action": "combat_script", + "move_mode": "walk", + "action_params": "keypress(VK_Z),wait(1.5)", + "type": "path", + "locked": false + }, + { + "id": 4, + "x": -4031.265625, + "y": -3000.931640625, + "action": "combat_script", + "move_mode": "walk", + "action_params": "keypress(VK_Z)", + "type": "path", + "locked": false }, { "id": 5, - "x": -4010.0439453125, - "y": -2984.115234375, - "type": "path", - "move_mode": "walk", + "x": -4039.6923828125, + "y": -3022.5771484375, "action": "combat_script", - "action_params": "keypress(VK_Z),wait(1.5)" + "move_mode": "walk", + "action_params": "keypress(VK_Z),wait(1.5)", + "type": "path", + "locked": false }, { "id": 6, - "x": -4031.265625, - "y": -3000.931640625, - "type": "path", + "x": -4020.197265625, + "y": -3013.8046875, + "action": "", "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z)" + "action_params": "", + "type": "orientation", + "locked": false }, { "id": 7, - "x": -4039.6923828125, - "y": -3022.5771484375, - "type": "path", - "move_mode": "walk", + "x": -4020.197265625, + "y": -3013.8046875, "action": "combat_script", - "action_params": "keypress(VK_Z),wait(1.5)" + "move_mode": "walk", + "action_params": "keypress(VK_Z),wait(1.0)", + "type": "path", + "locked": false }, { "id": 8, - "x": -4020.197265625, - "y": -3013.8046875, - "type": "path", - "move_mode": "walk", + "x": -4006.0859375, + "y": -3000.724609375, "action": "combat_script", - "action_params": "keypress(VK_Z),wait(1.8)" + "move_mode": "walk", + "action_params": "keypress(VK_Z)", + "type": "target", + "locked": false }, { "id": 9, - "x": -4001.1005859375, - "y": -3007.08984375, + "x": -4001.9833984375, + "y": -2990.015625, "type": "path", "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(VK_Z),wait(1)" + "action": "", + "action_params": "" }, { "id": 10, - "x": -3978.7841796875, - "y": -2991.3134765625, - "type": "path", - "move_mode": "walk", + "x": -3981.384765625, + "y": -2985.6025390625, "action": "combat_script", - "action_params": "keypress(VK_Z)" + "move_mode": "walk", + "action_params": "keypress(VK_Z)", + "type": "path", + "locked": false + }, + { + "id": 11, + "x": -3996.86328125, + "y": -2976.578125, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "orientation", + "locked": false } ] } \ No newline at end of file diff --git a/repo/js/AutoWoodcutting-Pathing/main.js b/repo/js/AutoWoodcutting-Pathing/main.js index 39eea10b..07ba190c 100644 --- a/repo/js/AutoWoodcutting-Pathing/main.js +++ b/repo/js/AutoWoodcutting-Pathing/main.js @@ -113,11 +113,14 @@ await pathingScript.runFile(filePath); } log.info(`${pathingName} 第 ${i+1}/${n} 次循环执行完成`); + logTimeTaken(startTime); } log.info(`完成 ${pathingName} 循环路径, 获得${woodCountToStr(woodCount, n)}`); + logTimeTaken(startTime); woodCount.forEach((value, key) => { woodNumberMap.set(key, woodNumberMap.get(key)-value*n);}); log.info(`${pathingName} 伐木完成，将执行下一个`); + logTimeTaken(startTime); logRemainingItems(); } catch (error) { log.error(`在砍伐 ${pathingName} 时发生错误: ${error}`); @@ -215,7 +218,17 @@ return woodCount; } + function logTimeTaken(startTime) { + const currentTime = Date.now(); + const totalTimeInSeconds = (currentTime - startTime) / 1000; + const minutes = Math.floor(totalTimeInSeconds / 60); + const seconds = totalTimeInSeconds % 60; + const formattedTime = `${minutes}分${seconds.toFixed(0).padStart(2, '0')}秒`; + log.info(`当前运行总时长：${formattedTime}`); + } + // Set game environment settings + const startTime = Date.now(); setGameMetrics(1920, 1080, 1); //修改路线：除了 垂香木-萃华木-香柏木，悬铃木-椴木 以外，其他木材基本都是单独路线，可以替换 \assets\AutoPath 中的路径追踪脚本，然后修改 pathingMap 中的文件名即可。 // pathingMap 为木材路径追踪文件路径列表, 键名可以随意命名, 值的 fileName 属性为路线包含路径追踪文件名列表, 文件夹为'assets/AutoPath/', 如果还有子文件夹请添加 folderName 属性. 如果 fileName 数组中有两项以上, 并且第一个文件名包含 '大循环', 则会先执行一次大循环, 剩余的文件名视为循环路径, 将在每次循环中依次执行. @@ -229,7 +242,7 @@ '竹节': { fileName: ['璃月-轻策庄-竹节-0个(大循环)', '璃月-轻策庄-竹节-78个-29秒(循环)'], folderName: '璃月-竹节'}, '垂香木': { fileName: ['蒙德-风起地-垂香木-48个-萃华木-6个-57秒']}, '杉木': { fileName: ['蒙德-达达乌帕谷-杉木-0个(大循环)', '蒙德-达达乌帕谷-杉木-69个-58秒(循环)'], folderName: '蒙德-杉木'}, - '梦见木': { fileName: ['稻妻-甘金岛-梦见木-45个(大循环)', '稻妻-甘金岛-梦见木-45个(循环)'], folderName: '稻妻-梦见木'}, + '梦见木': { fileName: ['稻妻-甘金岛-梦见木-0个(大循环)', '稻妻-甘金岛-梦见木-45个(循环)'], folderName: '稻妻-梦见木'}, '枫木': { fileName: ['稻妻-绯木村-枫木-42个-83秒']}, '孔雀木': { fileName: ['稻妻-镇守之森-孔雀木-51个-御伽木-9个-萃华木-3个-60秒']}, '御伽木': { fileName: ['稻妻-水月池-御伽木-18个-90秒(大循环)', '稻妻-水月池-御伽木-57个-64秒(循环)'], folderName: '稻妻-御伽木'}, @@ -267,4 +280,4 @@ let hasItto = settings.hasItto? settings.hasItto : false; mapWoodsToNumbers(woodsArray, numbersArray, hasItto); await woodCutting(); -})(); +})(); \ No newline at end of file diff --git a/repo/js/AutoWoodcutting-Pathing/manifest.json b/repo/js/AutoWoodcutting-Pathing/manifest.json index 5404ccfe..fd88561d 100644 --- a/repo/js/AutoWoodcutting-Pathing/manifest.json +++ b/repo/js/AutoWoodcutting-Pathing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "自动伐木-地图追踪版", - "version": "1.0.6", + "version": "1.0.8", "description": "基于地图追踪的自动伐木，暂不支持'炬木'和'桃椰子木'\n默认砍伐全部支持木材至2000上限\n自定义设置:\n-可更改砍伐木材种类和数量\n-可以单独设置每个木材数量\n-可设置队伍中是否包含一斗，按保底20%，计算砍伐数量时会除以1.2", "authors": [ { diff --git a/repo/js/Auto好感&刷兽肉/main.js b/repo/js/Auto好感&刷兽肉/main.js index ff1e02c4..b13ec119 100644 --- a/repo/js/Auto好感&刷兽肉/main.js +++ b/repo/js/Auto好感&刷兽肉/main.js @@ -84,6 +84,7 @@ if ((i + 1) % statue_times === 0) { await genshin.tp(2297.60, -824.45); await AutoPath(`好感-张牙舞爪的恶党-触发位置(二净甸)`); + await sleep(10000); await ReopenTheGate(); log.info(`当前次数：${i + 1}/${times}`); logTimeTaken(startTime); diff --git a/repo/js/Auto好感&刷兽肉/manifest.json b/repo/js/Auto好感&刷兽肉/manifest.json index 056431df..c8d39eae 100644 --- a/repo/js/Auto好感&刷兽肉/manifest.json +++ b/repo/js/Auto好感&刷兽肉/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "好感-张牙舞爪的恶党(可用于刷兽肉)", - "version": "1.1", + "version": "1.1.1", "description": "通过突发事件:张牙舞爪的恶党刷好兽肉，并顺带获取好感度（超过10次后不再获取），请使用满员好感度队伍，并为全体队伍角色配置相应的战斗策略", "authors": [ {