diff --git a/repo/js/AutoLeyLineOutcrop/3_generate_ley_line_data.py b/repo/js/AutoLeyLineOutcrop/3_generate_ley_line_data.py index ab146f280..dd4578984 100644 --- a/repo/js/AutoLeyLineOutcrop/3_generate_ley_line_data.py +++ b/repo/js/AutoLeyLineOutcrop/3_generate_ley_line_data.py @@ -20,6 +20,7 @@ REGION_ORDER = { "须弥": 4, "枫丹": 5, "纳塔": 6, + "挪德卡莱": 7, "未知区域": 99 # 未知区域放最后 } diff --git a/repo/js/AutoLeyLineOutcrop/LeyLineOutcropData.json b/repo/js/AutoLeyLineOutcrop/LeyLineOutcropData.json index f9154cb3b..37bada35e 100644 --- a/repo/js/AutoLeyLineOutcrop/LeyLineOutcropData.json +++ b/repo/js/AutoLeyLineOutcrop/LeyLineOutcropData.json @@ -783,6 +783,46 @@ "x": 9839.57, "y": -1290.01 } + }, + { + "id": 99, + "region": "挪德卡莱", + "position": { + "x": 9351.94, + "y": 2104.08 + } + }, + { + "id": 100, + "region": "挪德卡莱", + "position": { + "x": 9224.76, + "y": 2246.71 + } + }, + { + "id": 101, + "region": "挪德卡莱", + "position": { + "x": 10789.0, + "y": 2277.67 + } + }, + { + "id": 102, + "region": "挪德卡莱", + "position": { + "x": 10828.34, + "y": 1936.04 + } + }, + { + "id": 103, + "region": "挪德卡莱", + "position": { + "x": 9426.45, + "y": 3051.57 + } } ], "blossoms": [ @@ -2689,6 +2729,86 @@ "x": 9984.24, "y": -876.43 } + }, + { + "id": 1238, + "region": "挪德卡莱1-1", + "position": { + "x": 9405.06, + "y": 2047.5 + } + }, + { + "id": 1239, + "region": "挪德卡莱1-2", + "position": { + "x": 9310.67, + "y": 2116.95 + } + }, + { + "id": 1240, + "region": "挪德卡莱2-1", + "position": { + "x": 9132.02, + "y": 2155.61 + } + }, + { + "id": 1241, + "region": "挪德卡莱2-2", + "position": { + "x": 9018.5, + "y": 2146.22 + } + }, + { + "id": 1242, + "region": "挪德卡莱3-1", + "position": { + "x": 10799.37, + "y": 2240.19 + } + }, + { + "id": 1243, + "region": "挪德卡莱3-2", + "position": { + "x": 10819.83, + "y": 2170.72 + } + }, + { + "id": 1244, + "region": "挪德卡莱3-3", + "position": { + "x": 10874.92, + "y": 2110.37 + } + }, + { + "id": 1245, + "region": "挪德卡莱3-4", + "position": { + "x": 10986.27, + "y": 1943.02 + } + }, + { + "id": 1246, + "region": "挪德卡莱4-1", + "position": { + "x": 9454.46, + "y": 3008.55 + } + }, + { + "id": 1247, + "region": "挪德卡莱4-3", + "position": { + "x": 9461.06, + "y": 3200.05 + } } ], "edges": [ @@ -4381,6 +4501,66 @@ "source": 1236, "target": 1237, "route": "assets/pathing/纳塔9-翘枝崖-4.json" + }, + { + "source": 99, + "target": 1238, + "route": "assets/pathing/挪德卡莱1-苔骨荒原-1.json" + }, + { + "source": 99, + "target": 1239, + "route": "assets/pathing/挪德卡莱1-苔骨荒原-2.json" + }, + { + "source": 1238, + "target": 1239, + "route": "assets/pathing/挪德卡莱1-苔骨荒原-2.json" + }, + { + "source": 100, + "target": 1240, + "route": "assets/pathing/挪德卡莱2-蓝泊湖-1.json" + }, + { + "source": 1240, + "target": 1241, + "route": "assets/pathing/挪德卡莱2-蓝泊湖-2.json" + }, + { + "source": 101, + "target": 1242, + "route": "assets/pathing/挪德卡莱3-希汐岛-1.json" + }, + { + "source": 1242, + "target": 1243, + "route": "assets/pathing/挪德卡莱3-希汐岛-2.json" + }, + { + "source": 1243, + "target": 1244, + "route": "assets/pathing/挪德卡莱3-希汐岛-3.json" + }, + { + "source": 102, + "target": 1245, + "route": "assets/pathing/挪德卡莱3-希汐岛-4.json" + }, + { + "source": 1244, + "target": 1245, + "route": "assets/pathing/挪德卡莱3-希汐岛-4.json" + }, + { + "source": 103, + "target": 1246, + "route": "assets/pathing/挪德卡莱4-月矩力试验设计局-1.json" + }, + { + "source": 1246, + "target": 1247, + "route": "assets/pathing/挪德卡莱4-月矩力试验设计局-3.json" } ], "indexes": { @@ -5282,6 +5462,40 @@ ], "1236": [ 1237 + ], + "99": [ + 1238, + 1239 + ], + "1238": [ + 1239 + ], + "100": [ + 1240 + ], + "1240": [ + 1241 + ], + "101": [ + 1242 + ], + "1242": [ + 1243 + ], + "1243": [ + 1244 + ], + "102": [ + 1245 + ], + "1244": [ + 1245 + ], + "103": [ + 1246 + ], + "1246": [ + 1247 ] }, "edgesByTarget": { @@ -6098,6 +6312,38 @@ ], "1237": [ 1236 + ], + "1238": [ + 99 + ], + "1239": [ + 99, + 1238 + ], + "1240": [ + 100 + ], + "1241": [ + 1240 + ], + "1242": [ + 101 + ], + "1243": [ + 1242 + ], + "1244": [ + 1243 + ], + "1245": [ + 102, + 1244 + ], + "1246": [ + 103 + ], + "1247": [ + 1246 ] } } diff --git a/repo/js/AutoLeyLineOutcrop/README.md b/repo/js/AutoLeyLineOutcrop/README.md index cc51bae1c..fb55bc2ce 100644 --- a/repo/js/AutoLeyLineOutcrop/README.md +++ b/repo/js/AutoLeyLineOutcrop/README.md @@ -33,12 +33,12 @@ ### 一运行就报错退出了 根据错误提示自行排查原因 ### 找不到地脉花 / 找到地脉花,未找到策略 -脚本配置里最下面强制运行路线里看一下有没有,有请将出错的完整游戏界面截图反馈,没有请等待脚本更新。 +脚本还未适配,请等待脚本更新。 +如果不是,请将出错的**完整游戏界面截图**反馈。 注意:为了方便截图反馈,出现该错误时不会关闭大地图界面!也不会将关闭的自定义标记按钮打开! ### 走到地脉花旁边就开始战斗了,没有开启地脉花 -wgc的bug,请使用bitblt截图方式,脚本只支持这个 -如果一定要用wgc,请自行修改所有地图追踪文件的坐标 -如果后续bgi没有修复这个bug的打算,可能会出一个wgc专版 +请使用bitblt截图方式,脚本只支持这个 +切换ocr引擎为v4 ### 路线中途跳过了一个点位 当地脉花打完后,下一个点位已经存在另一类型的地脉花,则下一朵地脉花将跳过这个点,刷新在下一个位置。 脚本会跳过这个被占用的点位。 @@ -48,6 +48,8 @@ wgc的bug,请使用bitblt截图方式,脚本只支持这个 打开大地图,点击左下角设置,开启自定义标记。 脚本非正常结束运行时会出现该问题。 ## 更新日志 +### 4.2 +- 新增挪德卡莱区域 ### 4.1 - 新增通过冒险之证寻找地脉花 - 修复部分报错 @@ -722,7 +724,7 @@ wgc的bug,请使用bitblt截图方式,脚本只支持这个 3 | 第一波:幼鳍游龙x3、鳍游龙x1、流刃勇士·掷叉猎手x1、流刃勇士·游击人x1
第二波:鳍游龙x2、流刃勇士·掷叉猎手x1、鳍游龙武士·裂礁之涛x1 4 | 第一波:幼鳍游龙x3、鳍游龙x1、鳍游龙武士·穿浪之梭x1
第二波:幼鳍游龙x2、鳍游龙x1、流刃勇士·掷叉猎手x1、流刃勇士·游击人x1 -- [] 11. 呼呼丘 +- [x] 11. 呼呼丘 **地脉花总数:3** @@ -732,7 +734,7 @@ wgc的bug,请使用bitblt截图方式,脚本只支持这个 2 | 第一波:疾叶·大灵显化身
第二波:疾叶·大灵显化身 3 | 第一波:幼绒翼龙x3、绒翼龙x1、结羽勇士·驭空客x1
第二波:幼绒翼龙x1、绒翼龙x2、结羽勇士·削羽人x1、结羽勇士·腾空士x1 -- [] 12. 浪浪湾 +- [x] 12. 浪浪湾 **地脉花总数:3** @@ -742,6 +744,46 @@ wgc的bug,请使用bitblt截图方式,脚本只支持这个 2 | 第一波:幼嵴锋龙x1、嵴锋龙x1、铸砂勇士·叩问人x1、铸砂勇士·投矛手x1
第二波::幼嵴锋龙x1、嵴锋龙x2、嵴锋龙武士·碎晶打者x1 3 | 第一波:秘源机兵·寻捕械x1
第二波:秘源机兵·寻捕械x1 +### 挪德卡莱 +- [x] 1. ‍苔骨荒原 + +**地脉花总数:2** + +顺序 | 怪物 +--- | --- +1 | 第一波:
第二波: +2 | 第一波:
第二波: + +- [x] 2. ‍蓝泊湖 + +**地脉花总数:2** + +顺序 | 怪物 +--- | --- +1 | 第一波:
第二波: +2 | 第一波:
第二波: + +- [x] 3. ‍希汐岛 + +**地脉花总数:4** + +顺序 | 怪物 +--- | --- +1 | 第一波:辉电·霜夜灵嗣×1
第二波:辉电·霜夜灵嗣×1 +2 | 第一波:愚人众特辖队·先锋士×2、愚人众特辖队·愈疗师×1、巡陆艇·近战斥候型×1
第二波:???×1、愚人众特辖队·先锋士×2、巡陆艇·强侦斥候型×1 +3 | 第一波:荒野幽徒×3
第二波:荒野幽徒×2、荒野狂狩士×1 +4 | 第一波:愚人众特辖队·榴铳手×2、愚人众特辖队·先锋士×1、愚人众特辖队·愈疗师×1
第二波:???×2、愚人众特辖队·冰雹重炮手×1、巡陆艇·强侦攻坚型×1 + +- [x] 4. ‍月矩力试验设计局 + +**地脉花总数:3** + +顺序 | 怪物 +--- | --- +1 | 第一波:愚人众特辖队·线列军×2、巡陆艇·近战斥候型×2
第二波:巡陆艇·近战斥候型×1、愚人众特辖队·支援兵×1、愚人众特辖队·冰雹重炮手×1 +2 | 第一波:愚人众特辖队·支援兵×1、巡陆艇·近战攻坚型×1、巡陆艇·强侦攻坚型×1
第二波:愚人众特辖队·线列军×1、巡陆艇·强侦攻坚型×1、愚人众特辖队·火刃突击队×1 +3 | 第一波:蕴光刃犀×1
第二波:蕴光刃犀×1 + ## 特别感谢 - 感谢 平面镜 制作的枫丹地脉花脚本,~~抄了很多代码,~~以及枫丹路线! - 感谢 秋云 在脚本制作期间提供了很多功能实现的思路,开放了很多非常方便的方法,并修改优化了大量代码,这个脚本说是他写的也不为过! diff --git a/repo/js/AutoLeyLineOutcrop/assets/mapPositions.json b/repo/js/AutoLeyLineOutcrop/assets/mapPositions.json index 147b84ac0..d40f42f95 100644 --- a/repo/js/AutoLeyLineOutcrop/assets/mapPositions.json +++ b/repo/js/AutoLeyLineOutcrop/assets/mapPositions.json @@ -40,6 +40,11 @@ { "x": 8582, "y": -2675, "name": "溶水域七天神像" }, { "x": 9548, "y": -1117, "name": "花羽会上方锚点" }, { "x": 14655, "y": 559, "name": "浪浪湾左下锚点" } + ], + "挪德卡莱": [ + { "x": 9452, "y": 1662, "name": "挪德卡莱" }, + { "x": 10525, "y": 1933, "name": "沐光之台右下锚点" }, + { "x": 9447, "y": 3058, "name": "月矩力试验设计局新月神像" } ] } } diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/README.md b/repo/js/AutoLeyLineOutcrop/assets/pathing/README.md index 7fb43f542..15d53793b 100644 --- a/repo/js/AutoLeyLineOutcrop/assets/pathing/README.md +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/README.md @@ -9,7 +9,5 @@ `assets\pathing\rerun` ## 录制 - 1号花的第一个点位必须是传送 -- 使用target走到地脉花位置,执行战斗策略keypress(f) -- 往旁边走一到两步,添加一个战斗的点位,防止奖励花影响战斗 -- 如果奖励花出现的位置与地脉花相同,复制一下,动作无;如果不一样就录一个奖励花的点位,也是target +- 使用target走到地脉花位置 - 后续的花如果从现在的位置走过去更近就直接走,也就是第一个点位不能是传送;如果传送更近就传送;可重跑模式的第一个点位必须是传送 \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/rerun/挪德卡莱2-蓝泊湖-2-rerun.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/rerun/挪德卡莱2-蓝泊湖-2-rerun.json new file mode 100644 index 000000000..f7bdd8605 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/rerun/挪德卡莱2-蓝泊湖-2-rerun.json @@ -0,0 +1,98 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757822946823, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-蓝泊湖-2-rerun", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9099.5234375, + "y": 2296.4248046875 + }, + { + "action": "stop_flying", + "action_params": "", + "id": 2, + "move_mode": "fly", + "type": "path", + "x": 9094.8037109375, + "y": 2281.67529296875 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "dash", + "type": "path", + "x": 9068.869140625, + "y": 2268.197021484375 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "dash", + "type": "path", + "x": 9058.2861328125, + "y": 2253.7373046875 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "run", + "type": "path", + "x": 9041.37890625, + "y": 2250.19384765625 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "dash", + "type": "path", + "x": 9026.62109375, + "y": 2235.5322265625 + }, + { + "action": "", + "action_params": "", + "id": 7, + "move_mode": "dash", + "type": "path", + "x": 9024.693359375, + "y": 2198.438720703125 + }, + { + "action": "stop_flying", + "action_params": "1000", + "id": 8, + "move_mode": "fly", + "type": "path", + "x": 9018.0087890625, + "y": 2152.14990234375 + }, + { + "action": "", + "action_params": "", + "id": 9, + "move_mode": "walk", + "type": "target", + "x": 9018.50390625, + "y": 2146.216064453125 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱1-苔骨荒原-1.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱1-苔骨荒原-1.json new file mode 100644 index 000000000..0c8018c33 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱1-苔骨荒原-1.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757820705794, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱1-苔骨荒原-1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 9405.064453125, + "y": 2047.5048828125, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱1-苔骨荒原-2.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱1-苔骨荒原-2.json new file mode 100644 index 000000000..cb56ce0a0 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱1-苔骨荒原-2.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757820833416, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱1-苔骨荒原-2", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 9310.666015625, + "y": 2116.95166015625, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱2-蓝泊湖-1.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱2-蓝泊湖-1.json new file mode 100644 index 000000000..1202c64eb --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱2-蓝泊湖-1.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757822564336, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-蓝泊湖-1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 9132.021484375, + "y": 2155.611328125, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱2-蓝泊湖-2.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱2-蓝泊湖-2.json new file mode 100644 index 000000000..6170e3e88 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱2-蓝泊湖-2.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757822738516, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-蓝泊湖-2", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 9018.50390625, + "y": 2146.216064453125, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-1.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-1.json new file mode 100644 index 000000000..a6c2c4579 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-1.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087085941, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-希汐岛-1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 10799.373046875, + "y": 2240.192138671875, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-2.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-2.json new file mode 100644 index 000000000..09c5dbee0 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-2.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087116506, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-希汐岛-2", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 10819.8251953125, + "y": 2170.7158203125, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-3.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-3.json new file mode 100644 index 000000000..da215ea3e --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-3.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087376711, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-希汐岛-3", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 10874.9189453125, + "y": 2110.371826171875, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-4.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-4.json new file mode 100644 index 000000000..c1f37da06 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱3-希汐岛-4.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087596498, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-希汐岛-4", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 10986.2744140625, + "y": 1943.01904296875, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱4-月矩力试验设计局-1.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱4-月矩力试验设计局-1.json new file mode 100644 index 000000000..e0ee18051 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱4-月矩力试验设计局-1.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087772319, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱4-月矩力试验设计局-1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 9454.455078125, + "y": 3008.55322265625, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱4-月矩力试验设计局-3.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱4-月矩力试验设计局-3.json new file mode 100644 index 000000000..95bc88c69 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/target/挪德卡莱4-月矩力试验设计局-3.json @@ -0,0 +1,24 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758088156049, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱4-月矩力试验设计局-3", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "id": 1, + "x": 9461.056640625, + "y": 3200.0498046875, + "type": "target", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱1-苔骨荒原-1.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱1-苔骨荒原-1.json new file mode 100644 index 000000000..e233b1e99 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱1-苔骨荒原-1.json @@ -0,0 +1,44 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757820705794, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱1-苔骨荒原-1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9351.943359375, + "y": 2104.082763671875 + }, + { + "action": "stop_flying", + "action_params": "", + "id": 2, + "move_mode": "fly", + "type": "path", + "x": 9403.0390625, + "y": 2049.711669921875 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "walk", + "type": "target", + "x": 9405.064453125, + "y": 2047.5048828125 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱1-苔骨荒原-2.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱1-苔骨荒原-2.json new file mode 100644 index 000000000..9947e3c1d --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱1-苔骨荒原-2.json @@ -0,0 +1,35 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757820833416, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱1-苔骨荒原-2", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9351.943359375, + "y": 2104.082763671875 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "walk", + "type": "target", + "x": 9310.666015625, + "y": 2116.95166015625 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱2-蓝泊湖-1.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱2-蓝泊湖-1.json new file mode 100644 index 000000000..d9e2f6373 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱2-蓝泊湖-1.json @@ -0,0 +1,71 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757822564336, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-蓝泊湖-1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9224.7578125, + "y": 2246.707763671875 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "fly", + "type": "path", + "x": 9205.7548828125, + "y": 2251.530029296875 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "dash", + "type": "path", + "x": 9173.1875, + "y": 2203.66357421875 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "path", + "x": 9171.44921875, + "y": 2194.17431640625 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "jump", + "type": "path", + "x": 9169.55859375, + "y": 2191.260986328125 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "dash", + "type": "target", + "x": 9132.021484375, + "y": 2155.611328125 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱2-蓝泊湖-2.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱2-蓝泊湖-2.json new file mode 100644 index 000000000..4a40f41ae --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱2-蓝泊湖-2.json @@ -0,0 +1,53 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757822738516, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-蓝泊湖-2", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "dash", + "type": "path", + "x": 9112.3154296875, + "y": 2140.863037109375 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "walk", + "type": "path", + "x": 9078.291015625, + "y": 2140.27880859375 + }, + { + "action": "stop_flying", + "action_params": "1000", + "id": 3, + "move_mode": "fly", + "type": "path", + "x": 9020.7421875, + "y": 2146.327392578125 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "target", + "x": 9018.50390625, + "y": 2146.216064453125 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-1.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-1.json new file mode 100644 index 000000000..c09e69874 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-1.json @@ -0,0 +1,35 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087085941, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-希汐岛-1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 10788.998046875, + "y": 2277.666748046875 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "dash", + "type": "target", + "x": 10799.373046875, + "y": 2240.192138671875 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-2.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-2.json new file mode 100644 index 000000000..dea3e98d2 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-2.json @@ -0,0 +1,35 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087116506, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-希汐岛-2", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "dash", + "type": "path", + "x": 10818.2099609375, + "y": 2185.25927734375 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "walk", + "type": "target", + "x": 10819.8251953125, + "y": 2170.7158203125 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-3.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-3.json new file mode 100644 index 000000000..456ce3df9 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-3.json @@ -0,0 +1,35 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087376711, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-希汐岛-3", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "dash", + "type": "path", + "x": 10841.2421875, + "y": 2139.8251953125 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "walk", + "type": "target", + "x": 10874.9189453125, + "y": 2110.371826171875 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-4.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-4.json new file mode 100644 index 000000000..3152ebbb7 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱3-希汐岛-4.json @@ -0,0 +1,53 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087596498, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱3-希汐岛-4", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 10828.3359375, + "y": 1936.0439453125 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "dash", + "type": "path", + "x": 10879.04296875, + "y": 1926.43359375 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "dash", + "type": "path", + "x": 10951.078125, + "y": 1935.921875 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "target", + "x": 10986.2744140625, + "y": 1943.01904296875 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱4-月矩力试验设计局-1.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱4-月矩力试验设计局-1.json new file mode 100644 index 000000000..94f40d9d0 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱4-月矩力试验设计局-1.json @@ -0,0 +1,44 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758087772319, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱4-月矩力试验设计局-1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9426.44921875, + "y": 3051.57177734375 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "dash", + "type": "path", + "x": 9438.470703125, + "y": 3039.76953125 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "dash", + "type": "target", + "x": 9454.455078125, + "y": 3008.55322265625 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱4-月矩力试验设计局-3.json b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱4-月矩力试验设计局-3.json new file mode 100644 index 000000000..3342ca730 --- /dev/null +++ b/repo/js/AutoLeyLineOutcrop/assets/pathing/挪德卡莱4-月矩力试验设计局-3.json @@ -0,0 +1,35 @@ +{ + "info": { + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758088156049, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱4-月矩力试验设计局-3", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "dash", + "type": "path", + "x": 9463.578125, + "y": 3170.335205078125 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "dash", + "type": "target", + "x": 9461.056640625, + "y": 3200.0498046875 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoLeyLineOutcrop/config.json b/repo/js/AutoLeyLineOutcrop/config.json index 4ddb65aa1..52e9a4580 100644 --- a/repo/js/AutoLeyLineOutcrop/config.json +++ b/repo/js/AutoLeyLineOutcrop/config.json @@ -152,9 +152,98 @@ "y": 559, "name": "浪浪湾左下锚点" } + ], + "挪德卡莱": [ + { + "x": 9452, + "y": 1662, + "name": "挪德卡莱" + }, + { + "x": 10525, + "y": 1933, + "name": "沐光之台右下锚点" + }, + { + "x": 9447, + "y": 3058, + "name": "月矩力试验设计局新月神像" + } ] }, "leyLinePositions": { + "挪德卡莱": [ + { + "x": 9405, + "y": 2047, + "strategy": "挪德卡莱1-苔骨荒原", + "steps": 2, + "order": 1 + }, + { + "x": 9310, + "y": 2116, + "strategy": "挪德卡莱1-苔骨荒原", + "steps": 2, + "order": 2 + }, + { + "x": 9132, + "y": 2155, + "strategy": "挪德卡莱3-蓝泊湖", + "steps": 2, + "order": 1 + }, + { + "x": 9018, + "y": 2146, + "strategy": "挪德卡莱3-蓝泊湖", + "steps": 2, + "order": 2 + }, + { + "x": 10799, + "y": 2240, + "strategy": "挪德卡莱3-希汐岛", + "steps": 4, + "order": 1 + }, + { + "x": 10819, + "y": 2170, + "strategy": "挪德卡莱3-希汐岛", + "steps": 4, + "order": 2 + }, + { + "x": 10874, + "y": 2110, + "strategy": "挪德卡莱3-希汐岛", + "steps": 4, + "order": 3 + }, + { + "x": 10986, + "y": 1943, + "strategy": "挪德卡莱3-希汐岛", + "steps": 4, + "order": 4 + }, + { + "x": 9454, + "y": 3008, + "strategy": "挪德卡莱4-月矩力试验设计局", + "steps": 3, + "order": 1 + }, + { + "x": 9461, + "y": 3200, + "strategy": "挪德卡莱4-月矩力试验设计局", + "steps": 3, + "order": 3 + } + ], "枫丹": [ { "x": 4183, diff --git a/repo/js/AutoLeyLineOutcrop/manifest.json b/repo/js/AutoLeyLineOutcrop/manifest.json index 42559d354..378f9957c 100644 --- a/repo/js/AutoLeyLineOutcrop/manifest.json +++ b/repo/js/AutoLeyLineOutcrop/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "全自动地脉花", - "version": "4.1.6", + "version": "4.2", "tags": ["地脉花"], "bgi_version": "0.44.7", "description": "基于OCR图像识别的全自动刷取地脉花。\n💡更多信息请查看在线手册:https://hcnsvf0s8d0s.feishu.cn/wiki/Tb1twpThLi7UlykqcYOcuccTnjJ \n\n----------注意事项----------\n●仅支持BetterGI 0.44.7 及以上版本!\n●部分地脉花因特殊原因不支持全自动,具体的点位请在手册中查看。\n●树脂使用的优先级:2倍原粹树脂 > 浓缩树脂 > 原粹树脂。\n●运行时会传送到七天神像设置中设置的七天神像,需要关闭七天神像设置中的“是否就近七天神像恢复血量”,并指定七天神像。\n●战斗策略注意调度器设置中地图追踪行走配置里的“允许在JsSpript中使用”和“覆盖JS中的自动战斗配置”,只有在都打开的情况下脚本才会使用下面的战斗配置,否则会使用独立任务中的战斗策略。战斗超时时间不能大于脚本自定义配置中的时间。\n\n如果遇到问题,请先参照手册中的方法进行解决。", diff --git a/repo/js/AutoLeyLineOutcrop/settings.json b/repo/js/AutoLeyLineOutcrop/settings.json index 744ccca22..306bd90fe 100644 --- a/repo/js/AutoLeyLineOutcrop/settings.json +++ b/repo/js/AutoLeyLineOutcrop/settings.json @@ -23,7 +23,8 @@ "稻妻", "须弥", "枫丹", - "纳塔" + "纳塔", + "挪德卡莱" ], "default": "稻妻" }, diff --git a/repo/js/AutoLeyLineOutcrop/utils/findLeyLineOutcropByBook.js b/repo/js/AutoLeyLineOutcrop/utils/findLeyLineOutcropByBook.js index b4797ef28..43ee8185b 100644 --- a/repo/js/AutoLeyLineOutcrop/utils/findLeyLineOutcropByBook.js +++ b/repo/js/AutoLeyLineOutcrop/utils/findLeyLineOutcropByBook.js @@ -30,7 +30,7 @@ this.findLeyLineOutcropByBook = async function (country, type) { captureRegion1.dispose(); for (let i = 0; i < resList.count; i++) { let res = resList[i]; - if (res.text.includes(country)) { + if (res.text.includes(country) || res.text.includes("挪德")) { res.click(); } }