diff --git a/repo/js/AutoWoodcutting-Pathing/README.md b/repo/js/AutoWoodcutting-Pathing/README.md index 4e364137d..87391557b 100644 --- a/repo/js/AutoWoodcutting-Pathing/README.md +++ b/repo/js/AutoWoodcutting-Pathing/README.md @@ -4,7 +4,7 @@ 脚本内置的路径仅供参考,随着软件及地图的更新,可能**并非最佳**采集路径,如有更好的路径,欢迎贡献 -目前脚本已支持5.7版本之前的全部木材,清单如下:`桦木 萃华木 松木 垂香木 杉木 竹节 却砂木 梦见木 枫木 孔雀木 御伽木 证悟木 业果木 辉木 刺葵木 柽木 悬铃木 椴木 白梣木 香柏木 炬木 白栗栎木 燃爆木 灰灰楼林木 桃椰子木` +目前脚本已支持5.7版本之前的全部木材和6.0版本的部分木材,清单如下:`桦木 萃华木 松木 垂香木 杉木 竹节 却砂木 梦见木 枫木 孔雀木 御伽木 证悟木 业果木 辉木 刺葵木 柽木 悬铃木 椴木 白梣木 香柏木 炬木 白栗栎木 燃爆木 灰灰楼林木 桃椰子木 银冷衫木 桤木` ## 原理说明 diff --git a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/挪德卡莱-伦波岛-桤木-87个.json b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/挪德卡莱-伦波岛-桤木-87个.json new file mode 100644 index 000000000..7144b6b84 --- /dev/null +++ b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/挪德卡莱-伦波岛-桤木-87个.json @@ -0,0 +1,169 @@ +{ + "info": { + "authors": [ + { + "name": "起个名字好难的喵", + "links": "https://github.com/MisakaAldrich" + } + ], + "bgi_version": "0.51.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758884478137, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-伦波岛-桤木-87个", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9485.8906, + "y": 1738.4702 + }, + { + "action": "use_gadget", + "action_params": "", + "id": 2, + "move_mode": "dash", + "type": "path", + "x": 9501.9219, + "y": 1789.2451 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "walk", + "type": "path", + "x": 9513.9502, + "y": 1785.0293 + }, + { + "action": "use_gadget", + "id": 4, + "move_mode": "walk", + "type": "path", + "x": 9518.8877, + "y": 1786.7563 + }, + { + "action": "use_gadget", + "id": 5, + "move_mode": "walk", + "type": "path", + "x": 9507.2852, + "y": 1807.1196 + }, + { + "action": "use_gadget", + "id": 6, + "move_mode": "walk", + "type": "path", + "x": 9513.1045, + "y": 1814.0186 + }, + { + "action": "use_gadget", + "id": 7, + "move_mode": "walk", + "type": "path", + "x": 9532.875, + "y": 1808.0078 + }, + { + "action": "use_gadget", + "id": 8, + "move_mode": "walk", + "type": "path", + "x": 9532.7559, + "y": 1825.2852 + }, + { + "action": "use_gadget", + "id": 9, + "move_mode": "walk", + "type": "path", + "x": 9543.0293, + "y": 1820.4121 + }, + { + "action": "use_gadget", + "id": 10, + "move_mode": "walk", + "type": "path", + "x": 9563.1807, + "y": 1835.814 + }, + { + "action": "use_gadget", + "id": 11, + "move_mode": "walk", + "type": "path", + "x": 9561.6973, + "y": 1816.7271 + }, + { + "action": "use_gadget", + "id": 12, + "move_mode": "walk", + "type": "path", + "x": 9573.2451, + "y": 1830.5176 + }, + { + "action": "use_gadget", + "id": 13, + "move_mode": "walk", + "type": "path", + "x": 9571.9902, + "y": 1816.7856 + }, + { + "action": "use_gadget", + "id": 14, + "move_mode": "dash", + "type": "path", + "x": 9596.4492, + "y": 1823.5117 + }, + { + "action": "use_gadget", + "id": 15, + "move_mode": "walk", + "type": "path", + "x": 9603.4297, + "y": 1812.9282 + }, + { + "action": "use_gadget", + "id": 16, + "move_mode": "walk", + "type": "path", + "x": 9610.4883, + "y": 1808.5977 + }, + { + "action": "use_gadget", + "id": 17, + "move_mode": "jump", + "type": "path", + "x": 9624.6133, + "y": 1818.6108 + }, + { + "action": "use_gadget", + "id": 18, + "move_mode": "dash", + "type": "path", + "x": 9638.5078, + "y": 1838.0762 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/挪德卡莱-霜月之坊-银冷杉木-54个.json b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/挪德卡莱-霜月之坊-银冷杉木-54个.json new file mode 100644 index 000000000..9b8484eb9 --- /dev/null +++ b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/挪德卡莱-霜月之坊-银冷杉木-54个.json @@ -0,0 +1,114 @@ +{ + "info": { + "authors": [ + { + "name": "起个名字好难的喵", + "links": "https://github.com/MisakaAldrich" + } + ], + "bgi_version": "0.51.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758858955074, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-霜月之坊-银冷杉木-54个", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 10416.7285, + "y": 1657.3589 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "walk", + "type": "path", + "x": 10413.4434, + "y": 1661.9053 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "jump", + "type": "path", + "x": 10413.6045, + "y": 1686.2109 + }, + { + "action": "use_gadget", + "id": 4, + "move_mode": "dash", + "type": "path", + "x": 10422.3213, + "y": 1697.9927 + }, + { + "action": "use_gadget", + "id": 5, + "move_mode": "dash", + "type": "path", + "x": 10431.7363, + "y": 1735.708 + }, + { + "action": "use_gadget", + "id": 6, + "move_mode": "dash", + "type": "path", + "x": 10416.3809, + "y": 1736.4238 + }, + { + "action": "use_gadget", + "id": 7, + "move_mode": "dash", + "type": "path", + "x": 10389.7129, + "y": 1744.458 + }, + { + "action": "use_gadget", + "id": 8, + "move_mode": "dash", + "type": "path", + "x": 10368.9961, + "y": 1746.2725 + }, + { + "action": "use_gadget", + "id": 9, + "move_mode": "dash", + "type": "path", + "x": 10371.748, + "y": 1751.9614 + }, + { + "action": "", + "action_params": "", + "id": 10, + "move_mode": "walk", + "type": "path", + "x": 10390.6035, + "y": 1752.7393 + }, + { + "action": "use_gadget", + "id": 11, + "move_mode": "dash", + "type": "path", + "x": 10384.123, + "y": 1771.0513 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoWoodcutting-Pathing/main.js b/repo/js/AutoWoodcutting-Pathing/main.js index ad1ebf244..aa5da2c22 100644 --- a/repo/js/AutoWoodcutting-Pathing/main.js +++ b/repo/js/AutoWoodcutting-Pathing/main.js @@ -1,6 +1,6 @@ (async function () { - const woodType = ["桦木", "萃华木", "松木", "垂香木", "杉木", "竹节", "却砂木", "梦见木", "枫木", "孔雀木", "御伽木", "证悟木", "业果木", "辉木", "刺葵木", "柽木", "悬铃木", "椴木", "白梣木", "香柏木", "炬木", "白栗栎木", "燃爆木", "灰灰楼林木", "桃椰子木"]; - const singleWoodType = ["桦木", "松木", "杉木", "竹节", "却砂木", "梦见木", "枫木", "孔雀木", "御伽木", "证悟木", "业果木", "辉木", "刺葵木", "柽木", "白梣木", "炬木", "白栗栎木", "燃爆木", "灰灰楼林木", "桃椰子木"]; + const woodType = ["桦木", "萃华木", "松木", "垂香木", "杉木", "竹节", "却砂木", "梦见木", "枫木", "孔雀木", "御伽木", "证悟木", "业果木", "辉木", "刺葵木", "柽木", "悬铃木", "椴木", "白梣木", "香柏木", "炬木", "白栗栎木", "燃爆木", "灰灰楼林木", "桃椰子木", "银冷杉木","桤木"]; + const singleWoodType = ["桦木", "萃华木", "松木", "杉木", "竹节", "却砂木", "梦见木", "枫木", "孔雀木", "御伽木", "证悟木", "业果木", "辉木", "刺葵木", "柽木", "白梣木", "炬木", "白栗栎木", "燃爆木", "灰灰楼林木", "桃椰子木", "银冷杉木","桤木"]; const woodNumberMap = new Map(woodType.map(key => [key, 0])); let woodNumberMapCopy = new Map(); @@ -140,7 +140,7 @@ async function woodCutting() { logRemainingItems(); await sleep(1000); - if (woodNumberMap.get('萃华木') > 0) { + if (woodNumberMap.get('萃华木') > 0 && woodNumberMap.get('香柏木') > 0) { let [x1, x2, x3, x4] = lpsolve1(woodNumberMap.get('垂香木'), woodNumberMap.get('萃华木'), woodNumberMap.get('香柏木')); await runPathingNTimes('垂香木', '垂香木', x1); await runPathingNTimes('萃华木', '萃华木', x2); @@ -379,7 +379,9 @@ '白栗栎木': { fileName: ['纳塔-踞石山-白栗栎木-36个', '纳塔-回声之子-白栗栎木-33个-燃爆木-27个'], folderName: '纳塔-白栗栎木-燃爆木' }, '灰灰楼林木': { fileName: ['纳塔-奥奇卡纳塔-灰灰楼林木-42个'] }, '燃爆木': { fileName: ['纳塔-隆崛坡-燃爆木-54个'] }, - '桃椰子木': { fileName: ['纳塔-浮土静界-桃椰子木-0个(大循环)', '纳塔-浮土静界-桃椰子木-36个(循环)'], folderName: '纳塔-桃椰子木' } + '桃椰子木': { fileName: ['纳塔-浮土静界-桃椰子木-0个(大循环)', '纳塔-浮土静界-桃椰子木-36个(循环)'], folderName: '纳塔-桃椰子木' }, + '银冷杉木': { fileName: ['挪德卡莱-霜月之坊-银冷杉木-54个'] }, + '桤木': { fileName: ['挪德卡莱-伦波岛-桤木-87个'] } }; const messages = [ diff --git a/repo/js/AutoWoodcutting-Pathing/manifest.json b/repo/js/AutoWoodcutting-Pathing/manifest.json index 46884f7f4..e0e42a60c 100644 --- a/repo/js/AutoWoodcutting-Pathing/manifest.json +++ b/repo/js/AutoWoodcutting-Pathing/manifest.json @@ -1,9 +1,9 @@ { "manifest_version": 1, "name": "自动伐木-地图追踪版", - "version": "2.1.1", + "version": "2.1.3", "description": "基于地图追踪的自动伐木,已支持5.7版本前的全部木材\n默认砍伐全部支持木材至2000上限\n自定义设置:\n-可更改砍伐木材种类和数量\n-可以单独设置每个木材数量\n-可设置队伍中是否包含一斗,按保底20%,计算砍伐数量时会除以1.2", - "bgi_version": "0.48.1", + "bgi_version": "0.51.0", "tags": [ "伐木", "地图追踪",