From bb40d3e0ba6f52ce44d81969312dfbb6d6f75ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8F=90=E7=93=A6=E7=89=B9=E9=92=93=E9=B1=BC=E7=8E=B3?= =?UTF-8?q?=E5=B8=88?= <144542161+Hijiwos@users.noreply.github.com> Date: Sat, 13 Sep 2025 07:14:17 +0800 Subject: [PATCH] =?UTF-8?q?JS=E8=84=9A=E6=9C=AC=EF=BC=9A=E6=8F=90=E7=93=A6?= =?UTF-8?q?=E7=89=B9=E5=85=A8=E8=87=AA=E5=8A=A8=E9=92=93=E9=B1=BC=E3=80=90?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E3=80=91=20(#1878)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo/js/AutoFishingTeyvat/README.md | 2 +- ...德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北.json | 49 ++++++++ .../挪德卡莱-垂钓点-伦波岛空寂走廊西北.json | 76 ++++++++++++ .../pathing/挪德卡莱-垂钓点-伦波岛蓝珀湖.json | 76 ++++++++++++ .../挪德卡莱-垂钓点-伦波岛那夏镇西南.json | 85 +++++++++++++ .../挪德卡莱-垂钓点-希汐岛沐光之台西南.json | 58 +++++++++ .../挪德卡莱-垂钓点-希汐岛霜月工坊东北.json | 67 +++++++++++ .../挪德卡莱-垂钓点-希汐岛霜月工坊西.json | 85 +++++++++++++ ...卡莱-垂钓点-帕哈岛月矩力实验设计局东南.json | 76 ++++++++++++ ...德卡莱-垂钓点-帕哈岛月矩力实验设计局北.json | 112 ++++++++++++++++++ .../pathing/稻妻-垂钓点-鹤观千来神祠西.json | 2 +- repo/js/AutoFishingTeyvat/main.js | 33 ++++-- repo/js/AutoFishingTeyvat/manifest.json | 2 +- repo/js/AutoFishingTeyvat/settings.json | 23 +++- 14 files changed, 733 insertions(+), 13 deletions(-) create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛空寂走廊西北.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛蓝珀湖.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛那夏镇西南.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛沐光之台西南.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛霜月工坊东北.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛霜月工坊西.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-帕哈岛月矩力实验设计局东南.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-帕哈岛月矩力实验设计局北.json diff --git a/repo/js/AutoFishingTeyvat/README.md b/repo/js/AutoFishingTeyvat/README.md index a61b05f96..90cdb4575 100644 --- a/repo/js/AutoFishingTeyvat/README.md +++ b/repo/js/AutoFishingTeyvat/README.md @@ -23,7 +23,7 @@ 3. 同时选择鱼类和鱼饵的情况下按照以下逻辑选择路线: 所有被选的鱼类会被加入任务列表，如果选择的鱼饵中某个鱼饵不是已选的任何一个鱼类的对应的鱼饵，那么这个鱼饵对应的所有鱼类将被添加到任务列表 4. JS脚本的设置内各设置项含有优先级，如果存在高优先级且选项不为默认，则只有最高优先级的设置项生效 5. 部分钓鱼点为路径追踪+键鼠脚本(GCM)的混合模式，可能会出现因键鼠脚本误差卡死的情况，如果出现这种情况，请在JS脚本设置禁用键鼠路线来禁用所有包含键鼠脚本的钓鱼点 -6. 请确保```F2```用于打开**多人游戏**窗口，否则会影响多人模式检测，导致CD记录出现误差 +6. 请确保```F2```不被占用(用于打开**多人游戏**窗口)，否则会影响多人模式检测，导致CD记录出现误差 ## 其它 diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北.json new file mode 100644 index 000000000..26d9d0dfb --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北.json @@ -0,0 +1,49 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 伦波岛叮铃哐啷蛋卷工坊北\n鱼类: 花鳉、蓝昼明眼鱼、夜色明眼鱼、无奇巨斧鱼、素素凶凶鲨\n饵类: 果酿饵、槲梭饵、清白饵\n附加信息: 普通", + "enable_monster_loot_split": false, + "last_modified_time": 1757698876612, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9967.056, + "y": 1832.201 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "run", + "type": "path", + "x": 9981.836, + "y": 1888.135 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 3, + "move_mode": "walk", + "type": "target", + "x": 9988.428, + "y": 1893.727 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛空寂走廊西北.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛空寂走廊西北.json new file mode 100644 index 000000000..995bf9345 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛空寂走廊西北.json @@ -0,0 +1,76 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 伦波岛空寂走廊西北\n鱼类: 花鳉、蓝昼明眼鱼、夜色明眼鱼\n饵类: 果酿饵、清白饵\n附加信息: 普通", + "enable_monster_loot_split": false, + "last_modified_time": 1757698231051, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-伦波岛空寂走廊西北", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9191.618, + "y": 2852.115 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "dash", + "type": "path", + "x": 9221.949, + "y": 2844.344 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "fly", + "type": "path", + "x": 9277.118, + "y": 2851.106 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "run", + "type": "path", + "x": 9332.383, + "y": 2852.561 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "dash", + "type": "path", + "x": 9363.834, + "y": 2855.759 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 6, + "move_mode": "walk", + "type": "target", + "x": 9368.078, + "y": 2862.31 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛蓝珀湖.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛蓝珀湖.json new file mode 100644 index 000000000..53b188d12 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛蓝珀湖.json @@ -0,0 +1,76 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 伦波岛蓝珀湖\n鱼类: 无奇巨斧鱼、冷冽巨斧鱼、炽铁巨斧鱼、素素凶凶鲨、虹光凶凶鲨\n饵类: 槲梭饵、清白饵\n附加信息: 普通", + "enable_monster_loot_split": false, + "last_modified_time": 1757698070779, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-伦波岛蓝珀湖", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9224.757, + "y": 2246.719 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "run", + "type": "path", + "x": 9225.006, + "y": 2226.401 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "fly", + "type": "path", + "x": 9221.068, + "y": 2220.08 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "dash", + "type": "path", + "x": 9200.402, + "y": 2211.892 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "run", + "type": "path", + "x": 9157.645, + "y": 2207.023 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 6, + "move_mode": "walk", + "type": "target", + "x": 9153.236, + "y": 2200.734 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛那夏镇西南.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛那夏镇西南.json new file mode 100644 index 000000000..b7ce14352 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-伦波岛那夏镇西南.json @@ -0,0 +1,85 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 伦波岛那夏镇西南\n鱼类: 花鳉、无奇巨斧鱼、冷冽巨斧鱼、夜色明眼鱼\n饵类: 果酿饵、槲梭饵、清白饵\n附加信息: 普通", + "enable_monster_loot_split": false, + "last_modified_time": 1757697907883, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-伦波岛那夏镇西南", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9367.148, + "y": 1435.647 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "run", + "type": "path", + "x": 9381.028, + "y": 1420.522 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "run", + "type": "path", + "x": 9403.083, + "y": 1441.625 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "run", + "type": "path", + "x": 9406.61, + "y": 1452.112 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "run", + "type": "path", + "x": 9490.526, + "y": 1452.938 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "run", + "type": "path", + "x": 9532.559, + "y": 1443.048 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 7, + "move_mode": "walk", + "type": "target", + "x": 9534.289, + "y": 1412.47 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛沐光之台西南.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛沐光之台西南.json new file mode 100644 index 000000000..99f6a7fd3 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛沐光之台西南.json @@ -0,0 +1,58 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 希汐岛沐光之台西南\n鱼类: 素素凶凶鲨、虹光凶凶鲨、蓝昼明眼鱼、夜色明眼鱼\n饵类: 槲梭饵、清白饵\n附加信息: 普通", + "enable_monster_loot_split": false, + "last_modified_time": 1757699235434, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-希汐岛沐光之台西南", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 10781.332, + "y": 1793.717 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "run", + "type": "path", + "x": 10719.904, + "y": 1798.853 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "run", + "type": "path", + "x": 10674.817, + "y": 1792.771 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 4, + "move_mode": "walk", + "type": "path", + "x": 10674.003, + "y": 1789.753 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛霜月工坊东北.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛霜月工坊东北.json new file mode 100644 index 000000000..2635c6319 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛霜月工坊东北.json @@ -0,0 +1,67 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 希汐岛霜月工坊东北\n鱼类: 冷冽巨斧鱼、蓝昼明眼鱼、夜色明眼鱼、虹光凶凶鲨\n饵类: 槲梭饵、清白饵\n附加信息: 普通", + "enable_monster_loot_split": false, + "last_modified_time": 1757699361714, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-希汐岛霜月工坊东北", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 10391.677, + "y": 1854.526 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "run", + "type": "path", + "x": 10357.532, + "y": 1848.046 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "walk", + "type": "path", + "x": 10325.887, + "y": 1831.462 + }, + { + "action": "stop_flying", + "action_params": "", + "id": 4, + "move_mode": "fly", + "type": "path", + "x": 10291.502, + "y": 1818.557 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 5, + "move_mode": "walk", + "type": "target", + "x": 10286.751, + "y": 1817.246 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛霜月工坊西.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛霜月工坊西.json new file mode 100644 index 000000000..0a43839ab --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-希汐岛霜月工坊西.json @@ -0,0 +1,85 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 希汐岛霜月工坊西\n鱼类: 花鳉、蓝昼明眼鱼、夜色明眼鱼\n饵类: 果酿饵、清白饵\n附加信息: 战斗", + "enable_monster_loot_split": false, + "last_modified_time": 1757699619826, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-希汐岛霜月工坊西", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 10553.259, + "y": 1793.794 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "dash", + "type": "path", + "x": 10574.745, + "y": 1793.934 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "run", + "type": "path", + "x": 10570.136, + "y": 1762.021 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "path", + "x": 10575.021, + "y": 1742.987 + }, + { + "action": "fight", + "action_params": "", + "id": 5, + "move_mode": "run", + "type": "path", + "x": 10580.639, + "y": 1735.303 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "run", + "type": "path", + "x": 10596.373, + "y": 1712.182 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 7, + "move_mode": "walk", + "type": "target", + "x": 10601.638, + "y": 1708.221 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-帕哈岛月矩力实验设计局东南.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-帕哈岛月矩力实验设计局东南.json new file mode 100644 index 000000000..278f64a6f --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-帕哈岛月矩力实验设计局东南.json @@ -0,0 +1,76 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 帕哈岛月矩力实验设计局东南\n鱼类: 花鳉、无奇巨斧鱼、冷冽巨斧鱼、夜色明眼鱼\n饵类: 花鳉、蓝昼明眼鱼、夜色明眼鱼\n附加信息: 普通", + "enable_monster_loot_split": false, + "last_modified_time": 1757698425971, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-帕哈岛月矩力实验设计局东南", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9701.777, + "y": 3144.46 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "run", + "type": "path", + "x": 9699.9, + "y": 3132.13 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "run", + "type": "path", + "x": 9683.13, + "y": 3127.013 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "run", + "type": "path", + "x": 9681.395, + "y": 3107.521 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "run", + "type": "path", + "x": 9683.746, + "y": 3084.727 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 6, + "move_mode": "walk", + "type": "target", + "x": 9676.053, + "y": 3081.713 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-帕哈岛月矩力实验设计局北.json b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-帕哈岛月矩力实验设计局北.json new file mode 100644 index 000000000..29ea702f4 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/挪德卡莱-垂钓点-帕哈岛月矩力实验设计局北.json @@ -0,0 +1,112 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "提瓦特钓鱼玳师" + } + ], + "bgi_version": "0.45.0", + "description": "地区: 挪德卡莱\n类型: 垂钓点\n详细位置: 帕哈岛月矩力实验设计局北\n鱼类: 花鳉、蓝昼明眼鱼、素素凶凶鲨、虹光凶凶鲨\n饵类: 果酿饵、清白饵\n附加信息: 普通", + "enable_monster_loot_split": false, + "last_modified_time": 1757700117290, + "map_match_method": "", + "map_name": "Teyvat", + "name": "挪德卡莱-垂钓点-帕哈岛月矩力实验设计局北", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 9874.777, + "y": 3589.157 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "run", + "type": "path", + "x": 9909.092, + "y": 3579.052 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "dash", + "type": "path", + "x": 9930.3, + "y": 3576.436 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "path", + "x": 9935.42, + "y": 3572.948 + }, + { + "action": "stop_flying", + "action_params": "", + "id": 5, + "move_mode": "fly", + "type": "path", + "x": 9992.982, + "y": 3513.94 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "run", + "type": "path", + "x": 9982.938, + "y": 3513.961 + }, + { + "action": "", + "action_params": "", + "id": 7, + "move_mode": "run", + "type": "path", + "x": 9980.477, + "y": 3502.879 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 8, + "move_mode": "run", + "type": "path", + "x": 9968.711, + "y": 3492.802 + }, + { + "action": "", + "action_params": "", + "id": 9, + "move_mode": "dash", + "type": "path", + "x": 9984.195, + "y": 3511.614 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 10, + "move_mode": "walk", + "type": "target", + "x": 9998.438, + "y": 3513.264 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/稻妻-垂钓点-鹤观千来神祠西.json b/repo/js/AutoFishingTeyvat/assets/pathing/稻妻-垂钓点-鹤观千来神祠西.json index e97cb6c3c..00d22935c 100644 --- a/repo/js/AutoFishingTeyvat/assets/pathing/稻妻-垂钓点-鹤观千来神祠西.json +++ b/repo/js/AutoFishingTeyvat/assets/pathing/稻妻-垂钓点-鹤观千来神祠西.json @@ -33,7 +33,7 @@ "type": "target", "move_mode": "walk", "action": "combat_script", - "action_params": "wait(0.5),keypress(f)wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)" + "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)" } ] } \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/main.js b/repo/js/AutoFishingTeyvat/main.js index 2ae6c34de..c1e054a4f 100644 --- a/repo/js/AutoFishingTeyvat/main.js +++ b/repo/js/AutoFishingTeyvat/main.js @@ -1,8 +1,8 @@ (async function () { // 多人模式不计CD，CD读写仍有优化空间 - const area_list = ['蒙德', '璃月', '稻妻', '须弥', '枫丹', '纳塔', '至冬', '层岩巨渊·地下矿区', '渊下宫'] - const fish_list = ['花鳉', '波波心羽鲈', '烘烘心羽鲈', '维护机关·水域清理者', '维护机关·态势控制者', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '维护机关·白金典藏型', '吹沙角鲀', '甜甜花鳉', '擒霞客', '水晶宴', '斗棘鱼', '炮鲀', '流纹褐蝶鱼', '锖假龙', '金赤假龙', '玉玉心羽鲈', '赤魔王', '长生仙', '苦炮鲀', '肺棘鱼', '流纹京紫蝶鱼', '琉璃花鳉', '伪装鲨鲨独角鱼', '繁花斗士急流鱼', '深潜斗士急流鱼', '晚霞翻车鲀', '青浪翻车鲀', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '鸩棘鱼', '流纹茶蝶鱼', '雪中君', '真果角鲀', '青金斧枪鱼', '暮云角鲀', '翡玉斧枪鱼', '沉波蜜桃', '雷鸣仙', '佛玛洛鳐', '迪芙妲鳐', '秘源机关·巡戒使'] - const bait_list = ['果酿饵', '酸桔饵', '维护机关频闪诱饵', '甘露饵', '赤糜饵', '飞蝇假饵', '蠕虫假饵', '澄晶果粒饵', '温火饵'] + const area_list = ['蒙德', '璃月', '稻妻', '须弥', '枫丹', '纳塔', '至冬', '挪德卡莱', '层岩巨渊·地下矿区', '渊下宫'] + const fish_list = ['花鳉', '波波心羽鲈', '烘烘心羽鲈', '维护机关·水域清理者', '维护机关·态势控制者', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '维护机关·白金典藏型', '吹沙角鲀', '甜甜花鳉', '擒霞客', '水晶宴', '斗棘鱼', '炮鲀', '流纹褐蝶鱼', '锖假龙', '金赤假龙', '玉玉心羽鲈', '赤魔王', '长生仙', '苦炮鲀', '肺棘鱼', '流纹京紫蝶鱼', '琉璃花鳉', '伪装鲨鲨独角鱼', '繁花斗士急流鱼', '深潜斗士急流鱼', '晚霞翻车鲀', '青浪翻车鲀', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '鸩棘鱼', '流纹茶蝶鱼', '雪中君', '真果角鲀', '青金斧枪鱼', '暮云角鲀', '翡玉斧枪鱼', '沉波蜜桃', '雷鸣仙', '佛玛洛鳐', '迪芙妲鳐', '秘源机关·巡戒使', '蓝昼明眼鱼', '冷冽巨斧鱼', '夜色明眼鱼', '炽铁巨斧鱼', '虹光凶凶鲨', '无奇巨斧鱼', '素素凶凶鲨'] + const bait_list = ['果酿饵', '酸桔饵', '维护机关频闪诱饵', '甘露饵', '赤糜饵', '飞蝇假饵', '蠕虫假饵', '澄晶果粒饵', '温火饵', '槲梭饵', '清白饵'] const material_msg = { "风缠": ["花鳉", "蓝染花鳉", "鸩棘鱼", "流纹茶蝶鱼"], "愿者": ["花鳉", "甜甜花鳉", "斗棘鱼", "流纹褐蝶鱼"], @@ -15,12 +15,13 @@ "竭泽": ["沉波蜜桃", "青金斧枪鱼", "翡玉斧枪鱼"], "原海鱼油": ["沉波蜜桃", "青金斧枪鱼", "翡玉斧枪鱼"], "灰河渡手": ["维护机关·白金典藏型", "波波心羽鲈", "烘烘心羽鲈", "海涛斧枪鱼"], - "马腾斯万能护养剂": ["维护机关·白金典藏型", "波波心羽鲈", "烘烘心羽鲈", "海涛斧枪鱼"] + "马腾斯万能护养剂": ["维护机关·白金典藏型", "波波心羽鲈", "烘烘心羽鲈", "海涛斧枪鱼"], + "谧晖白枝": ["无奇巨斧鱼", "素素凶凶鲨", "蓝昼明眼鱼", "夜色明眼鱼"] } const time_msg = { - '白天': ['烘烘心羽鲈', '维护机关·水域清理者', '吹沙角鲀', '水晶宴', '流纹褐蝶鱼', '赤魔王', '长生仙', '流纹京紫蝶鱼', '深潜斗士急流鱼', '青浪翻车鲀', '流纹茶蝶鱼', '真果角鲀', '沉波蜜桃'], - '夜晚': ['波波心羽鲈', '维护机关·态势控制者', '维护机关·白金典藏型', '擒霞客', '斗棘鱼', '肺棘鱼', '繁花斗士急流鱼', '晚霞翻车鲀', '鸩棘鱼', '雪中君', '暮云角鲀', '雷鸣仙'], - '全天': ['花鳉', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '甜甜花鳉', '炮鲀', '锖假龙', '金赤假龙', '玉玉心羽鲈', '苦炮鲀', '琉璃花鳉', '伪装鲨鲨独角鱼', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '青金斧枪鱼', '翡玉斧枪鱼', '佛玛洛鳐', '迪芙妲鳐', '秘源机关·巡戒使'] + '白天': ['烘烘心羽鲈', '维护机关·水域清理者', '吹沙角鲀', '水晶宴', '流纹褐蝶鱼', '赤魔王', '长生仙', '流纹京紫蝶鱼', '深潜斗士急流鱼', '青浪翻车鲀', '流纹茶蝶鱼', '真果角鲀', '沉波蜜桃', '蓝昼明眼鱼', '冷冽巨斧鱼'], + '夜晚': ['波波心羽鲈', '维护机关·态势控制者', '维护机关·白金典藏型', '擒霞客', '斗棘鱼', '肺棘鱼', '繁花斗士急流鱼', '晚霞翻车鲀', '鸩棘鱼', '雪中君', '暮云角鲀', '雷鸣仙', '夜色明眼鱼', '炽铁巨斧鱼', '虹光凶凶鲨'], + '全天': ['花鳉', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '甜甜花鳉', '炮鲀', '锖假龙', '金赤假龙', '玉玉心羽鲈', '苦炮鲀', '琉璃花鳉', '伪装鲨鲨独角鱼', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '青金斧枪鱼', '翡玉斧枪鱼', '佛玛洛鳐', '迪芙妲鳐', '秘源机关·巡戒使', '无奇巨斧鱼', '素素凶凶鲨'] } const fish_msg = { // 可能有误，需要检查 '花鳉': {'bait': '果酿饵', 'time': '全天'}, @@ -67,7 +68,14 @@ '雷鸣仙': {'bait': '蠕虫假饵', 'time': '夜晚'}, '佛玛洛鳐': {'bait': '飞蝇假饵', 'time': '全天'}, '迪芙妲鳐': {'bait': '飞蝇假饵', 'time': '全天'}, - '秘源机关·巡戒使': {'bait': '温火饵', 'time': '全天'} + '秘源机关·巡戒使': {'bait': '温火饵', 'time': '全天'}, + '蓝昼明眼鱼': {'bait': '清白饵', 'time': '白天'}, + '夜色明眼鱼': {'bait': '清白饵', 'time': '夜晚'}, + '无奇巨斧鱼': {'bait': '槲梭饵', 'time': '全天'}, + '素素凶凶鲨': {'bait': '清白饵', 'time': '全天'}, + '炽铁巨斧鱼': {'bait': '槲梭饵', 'time': '夜晚'}, + '虹光凶凶鲨': {'bait': '清白饵', 'time': '夜晚'}, + '冷冽巨斧鱼': {'bait': '槲梭饵', 'time': '白天'} } const path_pathing = [ '枫丹-垂钓点-伊黎耶林区幽林雾道西南-花鳉_波波心羽鲈_烘烘心羽鲈_维护机关·水域清理者_维护机关·态势控制者_维护机关·澄金领队型-果酿饵_酸橘饵_维护机关频闪诱饵-普通', @@ -147,6 +155,15 @@ '须弥-垂钓点-道成林须弥城南-擒霞客_吹沙角鲀_暮云角鲀_青金斧枪鱼-果酿饵_甘露饵-普通', '须弥-垂钓点-阿陀河谷奥摩斯港北-水晶宴_真果角鲀_吹沙角鲀_暮云角鲀_青金斧枪鱼_翡玉斧枪鱼-果酿饵_甘露饵-普通', '须弥-垂钓点-阿陀河谷降诸魔山-擒霞客_真果角鲀_暮云角鲀_翡玉斧枪鱼-果酿饵_甘露饵-普通', + '挪德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北-花鳉_蓝昼明眼鱼_夜色明眼鱼_无奇巨斧鱼_素素凶凶鲨-果酿饵_槲梭饵_清白饵-普通', + '挪德卡莱-垂钓点-伦波岛空寂走廊西北-花鳉_蓝昼明眼鱼_夜色明眼鱼-果酿饵_清白饵-普通', + '挪德卡莱-垂钓点-伦波岛蓝珀湖-无奇巨斧鱼_冷冽巨斧鱼_炽铁巨斧鱼_素素凶凶鲨_虹光凶凶鲨-槲梭饵_清白饵-普通', + '挪德卡莱-垂钓点-伦波岛那夏镇西南-花鳉_无奇巨斧鱼_冷冽巨斧鱼_夜色明眼鱼-果酿饵_槲梭饵_清白饵-普通', + '挪德卡莱-垂钓点-帕哈岛月矩力实验设计局北-花鳉_蓝昼明眼鱼_素素凶凶鲨_虹光凶凶鲨-果酿饵_清白饵-普通', + '挪德卡莱-垂钓点-帕哈岛月矩力实验设计局东南-花鳉_无奇巨斧鱼_冷冽巨斧鱼_夜色明眼鱼-花鳉_蓝昼明眼鱼_夜色明眼鱼-普通', + '挪德卡莱-垂钓点-希汐岛沐光之台西南-素素凶凶鲨_虹光凶凶鲨_蓝昼明眼鱼_夜色明眼鱼-槲梭饵_清白饵-普通', + '挪德卡莱-垂钓点-希汐岛霜月工坊东北-冷冽巨斧鱼_蓝昼明眼鱼_夜色明眼鱼_虹光凶凶鲨-槲梭饵_清白饵-普通', + '挪德卡莱-垂钓点-希汐岛霜月工坊西-花鳉_蓝昼明眼鱼_夜色明眼鱼-果酿饵_清白饵-战斗' ] const fishing_time_dic = { "全天": {"name": "All", "param": 0}, diff --git a/repo/js/AutoFishingTeyvat/manifest.json b/repo/js/AutoFishingTeyvat/manifest.json index 21799166b..1d510ea16 100644 --- a/repo/js/AutoFishingTeyvat/manifest.json +++ b/repo/js/AutoFishingTeyvat/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "提瓦特自动钓鱼（全流程+自选）", - "version": "2.2.7", + "version": "2.3.0", "bgi_version": "0.47.0", "description": "支持自动追踪并垂钓bgi支持的全提瓦特垂钓点", "authors": [ diff --git a/repo/js/AutoFishingTeyvat/settings.json b/repo/js/AutoFishingTeyvat/settings.json index e6d2aa225..f6ac5233e 100644 --- a/repo/js/AutoFishingTeyvat/settings.json +++ b/repo/js/AutoFishingTeyvat/settings.json @@ -32,6 +32,7 @@ "⚓盘缘⚓（须弥钓竿）", "⚓穿浪斗枪⚓（枫丹钓竿）", "⚓长犀圆鸟和扁鱼⚓（纳塔钓竿）", + "⚓谧晖白枝⚓（挪德卡莱钓竿）", "⚔渔获⚔（稻妻武器）", "✞赤穗酒枡✞（稻妻精炼材料）", "⚔竭泽⚔（须弥武器）", @@ -117,7 +118,16 @@ "须弥-垂钓点-道成林维摩庄北-普通", "须弥-垂钓点-道成林须弥城南-普通", "须弥-垂钓点-阿陀河谷奥摩斯港北-普通", - "须弥-垂钓点-阿陀河谷降诸魔山-普通" + "须弥-垂钓点-阿陀河谷降诸魔山-普通", + "挪德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北-普通", + "挪德卡莱-垂钓点-伦波岛空寂走廊西北-普通", + "挪德卡莱-垂钓点-伦波岛蓝珀湖-普通", + "挪德卡莱-垂钓点-伦波岛那夏镇西南-普通", + "挪德卡莱-垂钓点-帕哈岛月矩力实验设计局北-普通", + "挪德卡莱-垂钓点-帕哈岛月矩力实验设计局东南-普通", + "挪德卡莱-垂钓点-希汐岛沐光之台西南-普通", + "挪德卡莱-垂钓点-希汐岛霜月工坊东北-普通", + "挪德卡莱-垂钓点-希汐岛霜月工坊西-战斗" ] }, { @@ -355,7 +365,16 @@ "须弥-垂钓点-道成林维摩庄北-普通", "须弥-垂钓点-道成林须弥城南-普通", "须弥-垂钓点-阿陀河谷奥摩斯港北-普通", - "须弥-垂钓点-阿陀河谷降诸魔山-普通" + "须弥-垂钓点-阿陀河谷降诸魔山-普通", + "挪德卡莱-垂钓点-伦波岛叮铃哐啷蛋卷工坊北-普通", + "挪德卡莱-垂钓点-伦波岛空寂走廊西北-普通", + "挪德卡莱-垂钓点-伦波岛蓝珀湖-普通", + "挪德卡莱-垂钓点-伦波岛那夏镇西南-普通", + "挪德卡莱-垂钓点-帕哈岛月矩力实验设计局北-普通", + "挪德卡莱-垂钓点-帕哈岛月矩力实验设计局东南-普通", + "挪德卡莱-垂钓点-希汐岛沐光之台西南-普通", + "挪德卡莱-垂钓点-希汐岛霜月工坊东北-普通", + "挪德卡莱-垂钓点-希汐岛霜月工坊西-战斗" ] }, {