校准紫晶块路线 (#1589 )

* Correct pathing for amethyst crystals * 自动修复 JSON 格式和版本号 [ci skip] --------- Co-authored-by: GitHub Actions Bot <actions@github.com>
update repo.json
2025-08-14 18:43:50 +08:00 · 2025-08-14 04:05:48 +00:00 · 2025-08-14 12:05:29 +08:00 · 2025-08-14 00:55:27 +00:00 · 2025-08-14 08:54:37 +08:00 · 2025-08-14 00:54:04 +00:00
265 changed files with 8471 additions and 3641 deletions
--- a/archive/js/AutoCode/README.md
+++ b/archive/js/AutoCode/README.md
--- a/archive/js/AutoCode/assets/account.png
+++ b/archive/js/AutoCode/assets/account.png
--- a/archive/js/AutoCode/assets/clear.png
+++ b/archive/js/AutoCode/assets/clear.png
--- a/archive/js/AutoCode/assets/confirm.png
+++ b/archive/js/AutoCode/assets/confirm.png
--- a/archive/js/AutoCode/assets/expired.png
+++ b/archive/js/AutoCode/assets/expired.png
--- a/archive/js/AutoCode/assets/go_to_redeem.png
+++ b/archive/js/AutoCode/assets/go_to_redeem.png
--- a/archive/js/AutoCode/assets/input_code.png
+++ b/archive/js/AutoCode/assets/input_code.png
--- a/archive/js/AutoCode/assets/invalid.png
+++ b/archive/js/AutoCode/assets/invalid.png
--- a/archive/js/AutoCode/assets/not_open.png
+++ b/archive/js/AutoCode/assets/not_open.png
--- a/archive/js/AutoCode/assets/redeem.png
+++ b/archive/js/AutoCode/assets/redeem.png
--- a/archive/js/AutoCode/assets/settings.png
+++ b/archive/js/AutoCode/assets/settings.png
--- a/archive/js/AutoCode/assets/used.png
+++ b/archive/js/AutoCode/assets/used.png
--- a/archive/js/AutoCode/codes.txt
+++ b/archive/js/AutoCode/codes.txt
--- a/archive/js/AutoCode/main.js
+++ b/archive/js/AutoCode/main.js
--- a/archive/js/AutoCode/manifest.json
+++ b/archive/js/AutoCode/manifest.json
--- a/archive/js/全自动使用多个兑换码/README.md
+++ b/archive/js/全自动使用多个兑换码/README.md
--- a/archive/js/全自动使用多个兑换码/assets/account.png
+++ b/archive/js/全自动使用多个兑换码/assets/account.png
--- a/archive/js/全自动使用多个兑换码/assets/clear.png
+++ b/archive/js/全自动使用多个兑换码/assets/clear.png
--- a/archive/js/全自动使用多个兑换码/assets/confirm.png
+++ b/archive/js/全自动使用多个兑换码/assets/confirm.png
--- a/archive/js/全自动使用多个兑换码/assets/expired.png
+++ b/archive/js/全自动使用多个兑换码/assets/expired.png
--- a/archive/js/全自动使用多个兑换码/assets/go_to_redeem.png
+++ b/archive/js/全自动使用多个兑换码/assets/go_to_redeem.png
--- a/archive/js/全自动使用多个兑换码/assets/input_code.png
+++ b/archive/js/全自动使用多个兑换码/assets/input_code.png
--- a/archive/js/全自动使用多个兑换码/assets/invalid.png
+++ b/archive/js/全自动使用多个兑换码/assets/invalid.png
--- a/archive/js/全自动使用多个兑换码/assets/not_open.png
+++ b/archive/js/全自动使用多个兑换码/assets/not_open.png
--- a/archive/js/全自动使用多个兑换码/assets/redeem.png
+++ b/archive/js/全自动使用多个兑换码/assets/redeem.png
--- a/archive/js/全自动使用多个兑换码/assets/settings.png
+++ b/archive/js/全自动使用多个兑换码/assets/settings.png
--- a/archive/js/全自动使用多个兑换码/assets/used.png
+++ b/archive/js/全自动使用多个兑换码/assets/used.png
--- a/archive/js/全自动使用多个兑换码/main.js
+++ b/archive/js/全自动使用多个兑换码/main.js
--- a/archive/js/全自动使用多个兑换码/manifest.json
+++ b/archive/js/全自动使用多个兑换码/manifest.json
--- a/archive/js/全自动使用多个兑换码/redeem_state.json
+++ b/archive/js/全自动使用多个兑换码/redeem_state.json
--- a/archive/js/全自动使用多个兑换码/settings.json
+++ b/archive/js/全自动使用多个兑换码/settings.json
--- a/archive/js/全自动使用多个兑换码/version.md
+++ b/archive/js/全自动使用多个兑换码/version.md
--- a/archive/js/自动使用兑换码/README.md
+++ b/archive/js/自动使用兑换码/README.md
--- a/archive/js/自动使用兑换码/assets/account.png
+++ b/archive/js/自动使用兑换码/assets/account.png
--- a/archive/js/自动使用兑换码/assets/clear.png
+++ b/archive/js/自动使用兑换码/assets/clear.png
--- a/archive/js/自动使用兑换码/assets/confirm.png
+++ b/archive/js/自动使用兑换码/assets/confirm.png
--- a/archive/js/自动使用兑换码/assets/expired.png
+++ b/archive/js/自动使用兑换码/assets/expired.png
--- a/archive/js/自动使用兑换码/assets/go_to_redeem.png
+++ b/archive/js/自动使用兑换码/assets/go_to_redeem.png
--- a/archive/js/自动使用兑换码/assets/input_code.png
+++ b/archive/js/自动使用兑换码/assets/input_code.png
--- a/archive/js/自动使用兑换码/assets/invalid.png
+++ b/archive/js/自动使用兑换码/assets/invalid.png
--- a/archive/js/自动使用兑换码/assets/not_open.png
+++ b/archive/js/自动使用兑换码/assets/not_open.png
--- a/archive/js/自动使用兑换码/assets/redeem.png
+++ b/archive/js/自动使用兑换码/assets/redeem.png
--- a/archive/js/自动使用兑换码/assets/settings.png
+++ b/archive/js/自动使用兑换码/assets/settings.png
--- a/archive/js/自动使用兑换码/assets/used.png
+++ b/archive/js/自动使用兑换码/assets/used.png
--- a/archive/js/自动使用兑换码/main.js
+++ b/archive/js/自动使用兑换码/main.js
--- a/archive/js/自动使用兑换码/manifest.json
+++ b/archive/js/自动使用兑换码/manifest.json
--- a/archive/js/自动使用兑换码/redeem_state.json
+++ b/archive/js/自动使用兑换码/redeem_state.json
--- a/archive/js/自动使用兑换码/settings.json
+++ b/archive/js/自动使用兑换码/settings.json
--- a/archive/js/自动使用兑换码/version.md
+++ b/archive/js/自动使用兑换码/version.md
--- a/build/validate.py
+++ b/build/validate.py
@@ -33,7 +33,7 @@ ACTION_VERSION_MAP = {
    "up_down_grab_leaf": "0.42.0",
    "set_time": "0.45.0",
    "exit_and_relogin": "0.46.0",
-    "use_gadget": "0.48.0"
+    "use_gadget": "0.48.1"
 }

 # 定义 action_params 的最低兼容版本和正则表达式验证
--- a/repo.json
+++ b/repo.json
--- a/repo/js/AAA-Artifacts-Bulk-Supply/README.md
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/README.md
@@ -4,3 +4,6 @@

 如果你只是想要获取狗粮，请使用自动狗粮加强版

+## 更新日志
+### 0.0.6（2025.08.13）
+1.修复"99强制黑芙"路线摔死bug
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/000强制白芙.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/000强制白芙.json
@@ -0,0 +1,68 @@
+{
+  "info": {
+    "name": "000强制白芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754998785224,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -762.078125,
+      "y": -3798.2978515625,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": -777.662109375,
+      "y": -3821.849609375,
+      "action": "combat_script",
+      "move_mode": "fly",
+      "action_params": "attack(0.5),wait(6)",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": 268.5908203125,
+      "y": -665.69580078125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 4,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
+      "type": "orientation",
+      "locked": false
+    },
+    {
+      "id": 5,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态,再切换——白芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/204璃月-天遒谷3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/204璃月-天遒谷3.json
@@ -13,8 +13,9 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1753379106673,
-    "enable_monster_loot_split": false
+    "last_modified_time": 1754997437686,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
  },
  "positions": [
    {
@@ -30,23 +31,13 @@
      "id": 2,
      "x": 1118.3120417903792,
      "y": 234.43208860704453,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
-      "type": "orientation",
-      "locked": false
-    },
-    {
-      "id": 3,
-      "x": 1118.3120417903792,
-      "y": 234.43208860704453,
      "action": "log_output",
      "move_mode": "walk",
      "action_params": "\n富A路线预计(双风buff+迪希雅)78分钟162个调查点≈10W经验\n富B路线预计(双风buff+迪希雅)55分钟135个调查点≈8.3W经验\n超详解析请看JS里README说明书",
      "type": "orientation"
    },
    {
-      "id": 4,
+      "id": 3,
      "x": 1118.3120417903792,
      "y": 234.43208860704453,
      "action": "",
@@ -55,7 +46,7 @@
      "type": "path"
    },
    {
-      "id": 5,
+      "id": 4,
      "x": 1086.0937875257878,
      "y": 301.8435984203652,
      "action": "combat_script",
@@ -64,7 +55,7 @@
      "type": "target"
    },
    {
-      "id": 6,
+      "id": 5,
      "x": 1084.796875,
      "y": 299.93359375,
      "action": "",
@@ -73,7 +64,7 @@
      "type": "path"
    },
    {
-      "id": 7,
+      "id": 6,
      "x": 1088.0673828125,
      "y": 303.08203125,
      "action": "",
@@ -82,7 +73,7 @@
      "type": "target"
    },
    {
-      "id": 8,
+      "id": 7,
      "x": 1083.5625,
      "y": 305.87513279847644,
      "action": "",
@@ -91,7 +82,7 @@
      "type": "path"
    },
    {
-      "id": 9,
+      "id": 8,
      "x": 1082.8095703125,
      "y": 300.794921875,
      "action": "combat_script",
@@ -100,7 +91,7 @@
      "type": "path"
    },
    {
-      "id": 10,
+      "id": 9,
      "x": 1068.333984375,
      "y": 353.74951171875,
      "action": "",
@@ -109,7 +100,7 @@
      "type": "path"
    },
    {
-      "id": 11,
+      "id": 10,
      "x": 1069.3271484375,
      "y": 355.3740234375,
      "action": "combat_script",
@@ -118,7 +109,7 @@
      "type": "target"
    },
    {
-      "id": 12,
+      "id": 11,
      "x": 1047.9365234375,
      "y": 318.71826171875,
      "action": "",
@@ -127,7 +118,7 @@
      "type": "path"
    },
    {
-      "id": 13,
+      "id": 12,
      "x": 1045.4453125,
      "y": 319.9306640625,
      "action": "combat_script",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/227-强制白芙.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/227-强制白芙.json
@@ -0,0 +1,68 @@
+{
+  "info": {
+    "name": "227.1强制白芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754998785224,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -762.078125,
+      "y": -3798.2978515625,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": -777.662109375,
+      "y": -3821.849609375,
+      "action": "combat_script",
+      "move_mode": "fly",
+      "action_params": "attack(0.5),wait(6)",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": 268.5908203125,
+      "y": -665.69580078125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 4,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
+      "type": "orientation",
+      "locked": false
+    },
+    {
+      "id": 5,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态,再切换——白芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/228璃月-沉玉谷沉珑渊地洞3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/228璃月-沉玉谷沉珑渊地洞3.json
@@ -13,8 +13,9 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1752873543581,
-    "enable_monster_loot_split": false
+    "last_modified_time": 1754997700576,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
  },
  "positions": [
    {
@@ -77,7 +78,7 @@
      "y": 1844.4892578125,
      "action": "combat_script",
      "move_mode": "climb",
-      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),d(0.15);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2),wait(0.5);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);芙宁娜 attack(0.08),charge;",
+      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),d(0.15);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2),wait(0.5);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);",
      "type": "target"
    },
    {
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/000强制白芙.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/000强制白芙.json
@@ -0,0 +1,68 @@
+{
+  "info": {
+    "name": "000强制白芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754998785224,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -762.078125,
+      "y": -3798.2978515625,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": -777.662109375,
+      "y": -3821.849609375,
+      "action": "combat_script",
+      "move_mode": "fly",
+      "action_params": "attack(0.5),wait(6)",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": 268.5908203125,
+      "y": -665.69580078125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 4,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
+      "type": "orientation",
+      "locked": false
+    },
+    {
+      "id": 5,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态,再切换——白芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/204璃月-天遒谷3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/204璃月-天遒谷3.json
@@ -13,8 +13,9 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1753379106673,
-    "enable_monster_loot_split": false
+    "last_modified_time": 1754997437686,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
  },
  "positions": [
    {
@@ -30,23 +31,13 @@
      "id": 2,
      "x": 1118.3120417903792,
      "y": 234.43208860704453,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
-      "type": "orientation",
-      "locked": false
-    },
-    {
-      "id": 3,
-      "x": 1118.3120417903792,
-      "y": 234.43208860704453,
      "action": "log_output",
      "move_mode": "walk",
      "action_params": "\n富A路线预计(双风buff+迪希雅)78分钟162个调查点≈10W经验\n富B路线预计(双风buff+迪希雅)55分钟135个调查点≈8.3W经验\n超详解析请看JS里README说明书",
      "type": "orientation"
    },
    {
-      "id": 4,
+      "id": 3,
      "x": 1118.3120417903792,
      "y": 234.43208860704453,
      "action": "",
@@ -55,7 +46,7 @@
      "type": "path"
    },
    {
-      "id": 5,
+      "id": 4,
      "x": 1086.0937875257878,
      "y": 301.8435984203652,
      "action": "combat_script",
@@ -64,7 +55,7 @@
      "type": "target"
    },
    {
-      "id": 6,
+      "id": 5,
      "x": 1084.796875,
      "y": 299.93359375,
      "action": "",
@@ -73,7 +64,7 @@
      "type": "path"
    },
    {
-      "id": 7,
+      "id": 6,
      "x": 1088.0673828125,
      "y": 303.08203125,
      "action": "",
@@ -82,7 +73,7 @@
      "type": "target"
    },
    {
-      "id": 8,
+      "id": 7,
      "x": 1083.5625,
      "y": 305.87513279847644,
      "action": "",
@@ -91,7 +82,7 @@
      "type": "path"
    },
    {
-      "id": 9,
+      "id": 8,
      "x": 1082.8095703125,
      "y": 300.794921875,
      "action": "combat_script",
@@ -100,7 +91,7 @@
      "type": "path"
    },
    {
-      "id": 10,
+      "id": 9,
      "x": 1068.333984375,
      "y": 353.74951171875,
      "action": "",
@@ -109,7 +100,7 @@
      "type": "path"
    },
    {
-      "id": 11,
+      "id": 10,
      "x": 1069.3271484375,
      "y": 355.3740234375,
      "action": "combat_script",
@@ -118,7 +109,7 @@
      "type": "target"
    },
    {
-      "id": 12,
+      "id": 11,
      "x": 1047.9365234375,
      "y": 318.71826171875,
      "action": "",
@@ -127,7 +118,7 @@
      "type": "path"
    },
    {
-      "id": 13,
+      "id": 12,
      "x": 1045.4453125,
      "y": 319.9306640625,
      "action": "combat_script",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/504枫丹-学术会堂1.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/504枫丹-学术会堂1.json
@@ -1,12 +1,21 @@
-{
+{
  "info": {
    "name": "504枫丹-学术会堂1",
    "type": "collect",
-    "author": "汐",
    "version": "1.0",
    "description": "",
    "map_name": "Teyvat",
-    "bgi_version": "0.45.0"
+    "bgi_version": "0.45.0",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "tags": [],
+    "last_modified_time": 1755004611662,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
  },
  "positions": [
    {
@@ -22,10 +31,10 @@
      "id": 2,
      "x": 4146.1298828125,
      "y": 4417.9384765625,
-      "type": "target",
-      "move_mode": "dash",
      "action": "combat_script",
-      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),"
+      "move_mode": "dash",
+      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);",
+      "type": "target"
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/508枫丹-研究院区西北6.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/508枫丹-研究院区西北6.json
@@ -13,7 +13,7 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1754843897719,
+    "last_modified_time": 1755005124022,
    "enable_monster_loot_split": false,
    "map_match_method": ""
  },
@@ -274,7 +274,17 @@
      "action": "combat_script",
      "move_mode": "walk",
      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.8),keyup(E),attack(0.2),wait(0.5);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);",
-      "type": "path"
+      "type": "path",
+      "locked": false
+    },
+    {
+      "id": 30,
+      "x": 4763.3369140625,
+      "y": 4900.12646484375,
+      "action": "set_time",
+      "move_mode": "walk",
+      "action_params": "06:00",
+      "type": "orientation"
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/仅12h额外/执行/99强制黑芙.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/仅12h额外/执行/99强制黑芙.json
@@ -0,0 +1,40 @@
+{
+  "info": {
+    "name": "99强制黑芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Enkanomiya",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1755101630357,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态——黑芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/100
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/100
@@ -1,30 +0,0 @@
-{
-  "info": {
-    "name": "100 芙宁娜强制变黑芙",
-    "type": "collect",
-    "authors": [
-      {
-        "name": "汐",
-        "links": ""
-      }
-    ],
-    "version": "1.0",
-    "description": "",
-    "map_name": "Enkanomiya",
-    "bgi_version": "0.45.0",
-    "tags": [],
-    "last_modified_time": 1753190175272,
-    "enable_monster_loot_split": false
-  },
-  "positions": [
-    {
-      "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
-      "x": 97.65771484375,
-      "y": 255.2640380859375,
-      "action_params": ""
-    }
-  ]
-}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/99强制黑芙.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/99强制黑芙.json
@@ -0,0 +1,40 @@
+{
+  "info": {
+    "name": "99强制黑芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Enkanomiya",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1755101630357,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态——黑芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制白芙.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制白芙.json
@@ -0,0 +1,58 @@
+{
+  "info": {
+    "name": "强制白芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754828996713,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "action": "",
+      "move_mode": "walk",
+      "type": "teleport",
+      "x": -762.078125,
+      "y": -3798.2978515625,
+      "action_params": ""
+    },
+    {
+      "id": 2,
+      "x": -777.662109375,
+      "y": -3821.849609375,
+      "type": "path",
+      "move_mode": "fly",
+      "action": "combat_script",
+      "action_params": "attack(0.5),wait(6)"
+    },
+    {
+      "id": 3,
+      "x": 268.5908203125,
+      "y": -665.69580078125,
+      "type": "teleport",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 4,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;"
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制黑芙.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制黑芙.json
@@ -0,0 +1,40 @@
+{
+  "info": {
+    "name": "强制黑芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Enkanomiya",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1755101630357,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态——黑芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/main.js
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/main.js
@@ -43,13 +43,7 @@ let failcount = 0;
            }
        }
    }
-    {
-        //校验自定义配置,从未打开过自定义配置时进行警告
-        for (let i = 0; i < 5; i++) {
-            log.warn("测试版本，可能存在各种bug，出现问题请联系作者，详见readme");
-            await sleep(1000);
-        }
-    }
+
    //预处理
    await readRecord(accountName);//读取记录文件
    const epochTime = new Date('1970-01-01T20:00:00.000Z');
@@ -291,7 +285,7 @@ async function writeRecord(accountName) {

 async function processArtifacts(times = 1) {
    await genshin.returnMainUi();
-    await sleep(100);
+    await sleep(500);
    let result = 0;
    try {
        if (settings.decomposeMode === "销毁（摩拉）") {
@@ -752,7 +746,6 @@ async function runNormalPath(doStop) {
        log.info("填写了清怪队伍，执行清怪路线");
        await runPaths(normalCombatPath, combatPartyName, doStop);
    }
-
    // 启用自动拾取的实时任务
    dispatcher.addTimer(new RealtimeTimer("AutoPick"));
    await runPaths(normalExecutePath, artifactPartyName, doStop);
@@ -794,8 +787,9 @@ async function runActivatePath() {
    const extraActivatePath = extraPath + "/激活";
    const extraCombatPath = extraPath + "/清怪";
    const extraPreparePath = extraPath + "/准备";
-
-    await runPaths(endingActivatePath, artifactPartyName, false);
+    if (!forceAlternate && state.runningEndingAndExtraRoute === "收尾额外A") {
+        await runPaths(endingActivatePath, artifactPartyName, false);
+    }
    await runPaths(extraActivatePath, combatPartyName, false);

    if (combatPartyName) {
@@ -804,8 +798,6 @@ async function runActivatePath() {
        await runPaths(endingCombatPath, combatPartyName, false);
    }

-    // 启用自动拾取的实时任务
-    dispatcher.addTimer(new RealtimeTimer("AutoPick"));
    await runPaths(endingPreparePath, artifactPartyName, false);
    await runPaths(extraPreparePath, combatPartyName, false);
 }
@@ -858,6 +850,13 @@ async function runPaths(folderFilePath, PartyName, doStop) {
            //如果与当前队伍不同，尝试切换队伍，并更新队伍
            await switchPartyIfNeeded(PartyName);
            state.currentParty = PartyName;
+            if (settings.furina) {
+                if (state.currentParty === artifactPartyName) {
+                    await pathingScript.runFile('assets/furina/强制白芙.json');
+                } else {
+                    await pathingScript.runFile('assets/furina/强制黑芙.json');
+                }
+            }
        }
        await fakeLog(Path.fileName, false, true, 0);
        try {
--- a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 1,
  "name": "AAA狗粮批发（测试版本）",
-  "version": "0.0.3",
+  "version": "0.0.6",
  "tags": [
    "狗粮"
  ],
--- a/repo/js/AAA-Artifacts-Bulk-Supply/settings.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/settings.json
@@ -13,13 +13,13 @@
  {
    "name": "minIntervalTime",
    "type": "input-text",
-    "label": "####################################################################\n卡时间与收尾配置\n\n最短间隔时间（分钟）\n默认值为1分钟，过短可能导致丢失收尾和额外收益",
+    "label": "####################################################################\n卡时间与收尾配置\n\n最短间隔时间（分钟）\n默认为1分钟，过短可能导致丢失收尾和额外收益",
    "default": "1"
  },
  {
    "name": "maxWaitingTime",
    "type": "input-text",
-    "label": "最大额外等待时间（分钟）\n默认值为0分钟\n普通路线结束后额外尝试等待以卡时间执行更多次主要收尾路线",
+    "label": "最大额外等待时间（分钟）\n默认值为0分钟\n普通路线结束后额外尝试等待\n以卡时间执行更多次优先收尾路线",
    "default": "0"
  },
  {
@@ -63,5 +63,10 @@
    "type": "input-text",
    "label": "账户名称\n用于多账户运行时区分不同账户\n单账户无需修改",
    "default": "默认账户"
+  },
+  {
+    "name": "furina",
+    "type": "checkbox",
+    "label": "如果你的【狗粮队伍】中有芙宁娜，请勾选"
  }
 ]
--- a/原食/main.js
+++ b/原食/main.js
@@ -120,7 +120,6 @@ const npcData = {
 		"path": "assets/path/布纳马.json",
 		"goods": ["盐", "小麦", "胡椒", "洋葱", "牛奶", "番茄", "卷心菜", "土豆", "秃秃豆"]
 	}
-
 }

 const goodsData = {
@@ -411,24 +410,29 @@ async function qucikBuy() {
 async function spikChat(npcName) {
 	count = 5
 	await sleep(1000);
-	if(npcName== "布纳马"){
-		// 對話
-		await sleep(500);
-		keyDown("VK_MENU");// Alt
-		await sleep(1000);
-		await click(1255, 530);
-		await sleep(1000);
-		keyUp("VK_MENU");// Alt
-		// 跳過交互&進入買食畫面
-		await click(1345, 580);
-		await sleep(1000);
-		await click(1345, 580);
-		await sleep(1000);
-		await click(1345, 580);
-		await sleep(1000);
-		await click(1345, 580);
-		await sleep(1000);
-	}else {
+	if (npcName == "布纳马") {
+		// 交互
+		for (let i = 0; i < 3; i++) {
+			keyPress("VK_F");
+			await sleep(1300);
+		}
+
+		// 点击有什么卖的
+		let captureRegion = captureGameRegion()
+		let resList = captureRegion.findMulti(RecognitionObject.ocrThis);
+		for (let i = 0; i < resList.count; i++) {
+			if (resList[i].text.includes("有什么卖的")) {
+				click(resList[i].x + 30, resList[i].y + 30); // 点击有什么卖的
+				// 使用完后释放资源
+				captureRegion.dispose();
+			}
+		}
+
+		await sleep(1300);
+		keyPress("VK_F");
+		await sleep(1300);
+	} else {
+
 		for (let i = 0; i < count; i++) {
 			keyPress("VK_F");
 			await sleep(1300);
--- a/原食/manifest.json
+++ b/原食/manifest.json
@@ -7,6 +7,10 @@
    {
      "name": "听雨♪",
      "links": "https://github.com/TingYu-lulumi"
+    },
+    {
+      "name": "蜜柑魚",
+      "links": "https://github.com/this-Fish"
    }
  ],
  "tags": [
--- a/repo/js/AutoArtifactsPro/README.md
+++ b/repo/js/AutoArtifactsPro/README.md
@@ -171,6 +171,10 @@ https://www.kdocs.cn/wo/sl/v13uXscL


 ## 更新日志
+### 1.7.9.2（2025.08.13）
+1.修复"99强制黑芙"路线摔死bug
+### 1.7.9.1（2025.08.12）
+1.把切换白芙黑芙策略外置
 ### 1.7.8（2025.08.11）
 1.优化些许点位
 ### 1.7.8（2025.08.10）
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/000强制白芙.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/000强制白芙.json
@@ -0,0 +1,68 @@
+{
+  "info": {
+    "name": "000强制白芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754998785224,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -762.078125,
+      "y": -3798.2978515625,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": -777.662109375,
+      "y": -3821.849609375,
+      "action": "combat_script",
+      "move_mode": "fly",
+      "action_params": "attack(0.5),wait(6)",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": 268.5908203125,
+      "y": -665.69580078125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 4,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
+      "type": "orientation",
+      "locked": false
+    },
+    {
+      "id": 5,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态,再切换——白芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/204璃月-天遒谷3.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/204璃月-天遒谷3.json
@@ -13,8 +13,9 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1753379106673,
-    "enable_monster_loot_split": false
+    "last_modified_time": 1754997437686,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
  },
  "positions": [
    {
@@ -30,23 +31,13 @@
      "id": 2,
      "x": 1118.3120417903792,
      "y": 234.43208860704453,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
-      "type": "orientation",
-      "locked": false
-    },
-    {
-      "id": 3,
-      "x": 1118.3120417903792,
-      "y": 234.43208860704453,
      "action": "log_output",
      "move_mode": "walk",
      "action_params": "\n富A路线预计(双风buff+迪希雅)78分钟162个调查点≈10W经验\n富B路线预计(双风buff+迪希雅)55分钟135个调查点≈8.3W经验\n超详解析请看JS里README说明书",
      "type": "orientation"
    },
    {
-      "id": 4,
+      "id": 3,
      "x": 1118.3120417903792,
      "y": 234.43208860704453,
      "action": "",
@@ -55,7 +46,7 @@
      "type": "path"
    },
    {
-      "id": 5,
+      "id": 4,
      "x": 1086.0937875257878,
      "y": 301.8435984203652,
      "action": "combat_script",
@@ -64,7 +55,7 @@
      "type": "target"
    },
    {
-      "id": 6,
+      "id": 5,
      "x": 1084.796875,
      "y": 299.93359375,
      "action": "",
@@ -73,7 +64,7 @@
      "type": "path"
    },
    {
-      "id": 7,
+      "id": 6,
      "x": 1088.0673828125,
      "y": 303.08203125,
      "action": "",
@@ -82,7 +73,7 @@
      "type": "target"
    },
    {
-      "id": 8,
+      "id": 7,
      "x": 1083.5625,
      "y": 305.87513279847644,
      "action": "",
@@ -91,7 +82,7 @@
      "type": "path"
    },
    {
-      "id": 9,
+      "id": 8,
      "x": 1082.8095703125,
      "y": 300.794921875,
      "action": "combat_script",
@@ -100,7 +91,7 @@
      "type": "path"
    },
    {
-      "id": 10,
+      "id": 9,
      "x": 1068.333984375,
      "y": 353.74951171875,
      "action": "",
@@ -109,7 +100,7 @@
      "type": "path"
    },
    {
-      "id": 11,
+      "id": 10,
      "x": 1069.3271484375,
      "y": 355.3740234375,
      "action": "combat_script",
@@ -118,7 +109,7 @@
      "type": "target"
    },
    {
-      "id": 12,
+      "id": 11,
      "x": 1047.9365234375,
      "y": 318.71826171875,
      "action": "",
@@ -127,7 +118,7 @@
      "type": "path"
    },
    {
-      "id": 13,
+      "id": 12,
      "x": 1045.4453125,
      "y": 319.9306640625,
      "action": "combat_script",
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/227-强制白芙.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/227-强制白芙.json
@@ -0,0 +1,68 @@
+{
+  "info": {
+    "name": "227.1强制白芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754998785224,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -762.078125,
+      "y": -3798.2978515625,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": -777.662109375,
+      "y": -3821.849609375,
+      "action": "combat_script",
+      "move_mode": "fly",
+      "action_params": "attack(0.5),wait(6)",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": 268.5908203125,
+      "y": -665.69580078125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 4,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
+      "type": "orientation",
+      "locked": false
+    },
+    {
+      "id": 5,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态,再切换——白芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/228璃月-沉玉谷沉珑渊地洞3.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/228璃月-沉玉谷沉珑渊地洞3.json
@@ -13,8 +13,9 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1752873543581,
-    "enable_monster_loot_split": false
+    "last_modified_time": 1754997700576,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
  },
  "positions": [
    {
@@ -77,7 +78,7 @@
      "y": 1844.4892578125,
      "action": "combat_script",
      "move_mode": "climb",
-      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),d(0.15);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2),wait(0.5);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);芙宁娜 attack(0.08),charge;",
+      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),d(0.15);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2),wait(0.5);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);",
      "type": "target"
    },
    {
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/03额外/99强制黑芙.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/03额外/99强制黑芙.json
@@ -0,0 +1,40 @@
+{
+  "info": {
+    "name": "99强制黑芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Enkanomiya",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1755101630357,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态——黑芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/01普通/000强制白芙.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/01普通/000强制白芙.json
@@ -0,0 +1,68 @@
+{
+  "info": {
+    "name": "000强制白芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754998785224,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -762.078125,
+      "y": -3798.2978515625,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": -777.662109375,
+      "y": -3821.849609375,
+      "action": "combat_script",
+      "move_mode": "fly",
+      "action_params": "attack(0.5),wait(6)",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": 268.5908203125,
+      "y": -665.69580078125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 4,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
+      "type": "orientation",
+      "locked": false
+    },
+    {
+      "id": 5,
+      "x": 263.3046875,
+      "y": -662.833984375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态,再切换——白芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/01普通/204璃月-天遒谷3.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/01普通/204璃月-天遒谷3.json
@@ -13,8 +13,9 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1753379106673,
-    "enable_monster_loot_split": false
+    "last_modified_time": 1754997437686,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
  },
  "positions": [
    {
@@ -30,23 +31,13 @@
      "id": 2,
      "x": 1118.3120417903792,
      "y": 234.43208860704453,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "keypress(f);芙宁娜 attack(0.08),charge;",
-      "type": "orientation",
-      "locked": false
-    },
-    {
-      "id": 3,
-      "x": 1118.3120417903792,
-      "y": 234.43208860704453,
      "action": "log_output",
      "move_mode": "walk",
      "action_params": "\n富A路线预计(双风buff+迪希雅)78分钟162个调查点≈10W经验\n富B路线预计(双风buff+迪希雅)55分钟135个调查点≈8.3W经验\n超详解析请看JS里README说明书",
      "type": "orientation"
    },
    {
-      "id": 4,
+      "id": 3,
      "x": 1118.3120417903792,
      "y": 234.43208860704453,
      "action": "",
@@ -55,7 +46,7 @@
      "type": "path"
    },
    {
-      "id": 5,
+      "id": 4,
      "x": 1086.0937875257878,
      "y": 301.8435984203652,
      "action": "combat_script",
@@ -64,7 +55,7 @@
      "type": "target"
    },
    {
-      "id": 6,
+      "id": 5,
      "x": 1084.796875,
      "y": 299.93359375,
      "action": "",
@@ -73,7 +64,7 @@
      "type": "path"
    },
    {
-      "id": 7,
+      "id": 6,
      "x": 1088.0673828125,
      "y": 303.08203125,
      "action": "",
@@ -82,7 +73,7 @@
      "type": "target"
    },
    {
-      "id": 8,
+      "id": 7,
      "x": 1083.5625,
      "y": 305.87513279847644,
      "action": "",
@@ -91,7 +82,7 @@
      "type": "path"
    },
    {
-      "id": 9,
+      "id": 8,
      "x": 1082.8095703125,
      "y": 300.794921875,
      "action": "combat_script",
@@ -100,7 +91,7 @@
      "type": "path"
    },
    {
-      "id": 10,
+      "id": 9,
      "x": 1068.333984375,
      "y": 353.74951171875,
      "action": "",
@@ -109,7 +100,7 @@
      "type": "path"
    },
    {
-      "id": 11,
+      "id": 10,
      "x": 1069.3271484375,
      "y": 355.3740234375,
      "action": "combat_script",
@@ -118,7 +109,7 @@
      "type": "target"
    },
    {
-      "id": 12,
+      "id": 11,
      "x": 1047.9365234375,
      "y": 318.71826171875,
      "action": "",
@@ -127,7 +118,7 @@
      "type": "path"
    },
    {
-      "id": 13,
+      "id": 12,
      "x": 1045.4453125,
      "y": 319.9306640625,
      "action": "combat_script",
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/01普通/504枫丹-学术会堂1.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/01普通/504枫丹-学术会堂1.json
@@ -1,12 +1,21 @@
-{
+{
  "info": {
    "name": "504枫丹-学术会堂1",
    "type": "collect",
-    "author": "汐",
    "version": "1.0",
    "description": "",
    "map_name": "Teyvat",
-    "bgi_version": "0.45.0"
+    "bgi_version": "0.45.0",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "tags": [],
+    "last_modified_time": 1755004611662,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
  },
  "positions": [
    {
@@ -22,10 +31,10 @@
      "id": 2,
      "x": 4146.1298828125,
      "y": 4417.9384765625,
-      "type": "target",
-      "move_mode": "dash",
      "action": "combat_script",
-      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),"
+      "move_mode": "dash",
+      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);",
+      "type": "target"
    }
  ]
 }
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/01普通/508枫丹-研究院区西北6.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/01普通/508枫丹-研究院区西北6.json
@@ -13,7 +13,7 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1754843897719,
+    "last_modified_time": 1755005124022,
    "enable_monster_loot_split": false,
    "map_match_method": ""
  },
@@ -274,7 +274,17 @@
      "action": "combat_script",
      "move_mode": "walk",
      "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.8),keyup(E),attack(0.2),wait(0.5);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);",
-      "type": "path"
+      "type": "path",
+      "locked": false
+    },
+    {
+      "id": 30,
+      "x": 4763.3369140625,
+      "y": 4900.12646484375,
+      "action": "set_time",
+      "move_mode": "walk",
+      "action_params": "06:00",
+      "type": "orientation"
    }
  ]
 }
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/03额外/100
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/03额外/100
@@ -1,30 +0,0 @@
-{
-  "info": {
-    "name": "100 芙宁娜强制变黑芙",
-    "type": "collect",
-    "authors": [
-      {
-        "name": "汐",
-        "links": ""
-      }
-    ],
-    "version": "1.0",
-    "description": "",
-    "map_name": "Enkanomiya",
-    "bgi_version": "0.45.0",
-    "tags": [],
-    "last_modified_time": 1753190175272,
-    "enable_monster_loot_split": false
-  },
-  "positions": [
-    {
-      "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
-      "x": 97.65771484375,
-      "y": 255.2640380859375,
-      "action_params": ""
-    }
-  ]
-}
--- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/03额外/99强制黑芙.json
+++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/03额外/99强制黑芙.json
@@ -0,0 +1,40 @@
+{
+  "info": {
+    "name": "99强制黑芙",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "汐",
+        "links": ""
+      }
+    ],
+    "version": "1.0",
+    "description": "",
+    "map_name": "Enkanomiya",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1755101630357,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 97.65771484375,
+      "y": 255.2640380859375,
+      "action": "log_output",
+      "move_mode": "walk",
+      "action_params": "重置[芙宁娜]状态——黑芙",
+      "type": "orientation"
+    }
+  ]
+}
--- a/repo/js/AutoArtifactsPro/main.js
+++ b/repo/js/AutoArtifactsPro/main.js
@@ -209,7 +209,7 @@ let enemyType = "无";
        // 获取 version 字段的值
        version = manifest.version;

-        log.info(`当前js版本：${version},更新日期25.8.11,如果太久远,要经常检查更新`);
+        log.info(`当前js版本：${version},更新日期25.8.13,如果太久远,要经常检查更新`);

    } catch (error) {
        // 如果发生错误，记录错误信息
--- a/repo/js/AutoArtifactsPro/manifest.json
+++ b/repo/js/AutoArtifactsPro/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 1,
  "name": "自动狗粮加强版",
-  "version": "1.7.9",
+  "version": "1.7.9.2",
  "tags": [
    "好感",
    "狗粮"
--- a/repo/js/AutoHoeingOneDragon/README.md
+++ b/repo/js/AutoHoeingOneDragon/README.md
@@ -35,9 +35,13 @@
   - - 默认选择 **运行锄地路线** ，选择该模式会按照后续设置选择并运行相应路线
   - - 选项 **输出地图追踪文件** ，会将选择的路线读取并分组输出到js文件夹下pathingOut文件夹
   - - 选项 **强制刷新所有运行记录** ，用于清除js记录的运行历史
-   - **选择执行第几个路径组：** 本js会分组运行地图追踪，分组方式详见后续选项，需要分组运行时请确保精英目标数量，小怪目标数量，各个路径组的标签等信息【完全相同】，复制配置组时未知原因无法正确复制配置，请不要使用
+   - **选择执行第几个路径组：** 本js支持分组运行地图追踪，分组方式详见后续选项，需要分组运行时请确保精英目标数量，小怪目标数量，各个路径组的标签等信息【完全相同】，复制配置组时未知原因无法正确复制配置，请不要使用
   - **本路径组使用配队名称：** 填写该路径组使用的配队名称，js会自动切换
-   - **拾取模式：** 本js采用黑白名单结合的方式实现仅拾取部分物品（默认只拾取狗粮和晶蝶），如果你想要使用bgi默认的拾取以拾取绝大部分物品，请选择bgi拾取，如果不想拾取任何物品，请选择不拾取任何物品
+   - **拾取模式：** 
+   - - ocr拾取：使用ocr识别掉落物进行拾取，自定义拾取名单【仅在此模式下生效】
+   - - 模板匹配拾取：测试中，速度最快，性能消耗最低，只拾取四种锄地会掉落的狗粮
+   - - bgi原版拾取
+   - - 不拾取
   - **效率降序运行：**当你时间不足以刷完所有怪物且不确定时，建议通过开启该项和配置下一项来实现在指定时间前尽可能多刷效率高的路线并按时终止
   - **输入不运行的时间或时间段的小时数** 当你需要让js在特定的时间终止运行时，按描述填写，js会在距离目标时间小于五分钟时终止运行并等待到目标时间
   - **泥头车模式（实验性功能）：** 接近战斗地点（距离5-30）时，提前让指定序号的角色开e，建议以下角色开启：芙宁娜，爱可菲，雷电将军。警告，可能会增加性能开销和降低稳定性。
@@ -50,12 +54,12 @@
   - - 蕈兽 ：表明路线含有蕈兽，蕈兽遇到雷火元素时会发生转化，转化后占据精英怪物的名额却只掉落少量摩拉，通常建议禁用
   - - 小怪 ：表明路线只含小怪，战斗强度低，且无需携带万叶来拾取可能掉落的狗粮，可以适当携带等级较低或不上场的角色来获取经验收益
   - - 分组逻辑：不含路径组1排除标签和任何其他组标签的路径会进入路径组1，剩余路径若含有路径组x的标签之一，则会进入路径组x
-   - - 使用示例：路径组一填写蕈兽，禁用蕈兽路线，路径组二填写次数盾，水免，处理路径组一的配队难以处理的次数盾和水免怪物，路径组三填写小怪，队伍中放升级中角色获取经验
+   - - 使用示例：路径组一填写蕈兽，禁用蕈兽路线，路径组二填写次数盾，水免，处理路径组一的配队难以处理的次数盾和水免怪物，路径组三填写小怪，队伍中放升级中角色获取经验，将本js添加到【多个配置组】中，根据路径组的具体情况配置每个配置组的设置
   - **路线效率计算权重：** 影响js评估路线价值，计算公式如下，权重越大越看重总收益
   - $$ 怪均^k \times 秒均 $$
   - **自动优化：** js将根据运行记录调整每条路线的预期运行时间，具体逻辑为，至多6条记录，去除一个最大值、一个最小值后，每条记录占据20%的权重，剩余权重由默认数据填充。如果你不想要这个功能，请禁用。
   - **目标数量：** 选取路线目标达到的精英怪数量，默认为400，同理小怪数量默认为2000
-   - **优先关键词：**含有关键词的路线会被视为拥有最高效率，例如填写600来让所有600怪物优先考虑，填写骗骗花来优先考虑骗骗花
+   - **优先关键词：** 含有关键词的路线会被视为拥有最高效率，例如填写600来让所有600怪物优先考虑，填写骗骗花来优先考虑骗骗花
   - **排除关键词：** 含有关键词的路线会被排除，例如填写纳塔来排除所有纳塔路线，同样使用中文逗号分隔

 ### 二、**锄地收益**
@@ -74,6 +78,14 @@

 ---
 ### 更新日志
+### 1.4.3（2025.08.13）
+1.研究方法进入[沙暴]区域
+### 1.4.2（2025.08.13）
+1.修改拾取后延时效果
+### 1.4.1（2025.08.12）
+1.优化精英101路线
+### 1.4.0（2025.08.12）
+1.增加拾取模式，模板匹配拾取并设为默认项，之前的拾取模式改名为ocr拾取
 ### 1.3.8（2025.08.11）
 1.优化精英部分点位
 ### 1.3.7（2025.08.10）
--- a/repo/js/AutoHoeingOneDragon/assets/targetItems/战狂.png
+++ b/repo/js/AutoHoeingOneDragon/assets/targetItems/战狂.png
--- a/repo/js/AutoHoeingOneDragon/assets/targetItems/教官.png
+++ b/repo/js/AutoHoeingOneDragon/assets/targetItems/教官.png
--- a/repo/js/AutoHoeingOneDragon/assets/targetItems/流放.png
+++ b/repo/js/AutoHoeingOneDragon/assets/targetItems/流放.png
--- a/repo/js/AutoHoeingOneDragon/assets/targetItems/游医.png
+++ b/repo/js/AutoHoeingOneDragon/assets/targetItems/游医.png
--- a/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json
+++ b/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json
@@ -10,7 +10,7 @@
      "type": 6,
      "mouseX": 0,
      "mouseY": 0,
-      "time": 49
+      "time": 5
    }
  ],
  "info": {
--- a/repo/js/AutoHoeingOneDragon/assets/滚轮下翻.json
+++ b/repo/js/AutoHoeingOneDragon/assets/滚轮下翻.json
@@ -10,7 +10,7 @@
            "type": 6,
            "mouseX": 0,
            "mouseY": 0,
-            "time": 49
+            "time": 5
        }
    ],
    "info": {
--- a/repo/js/AutoHoeingOneDragon/main.js
+++ b/repo/js/AutoHoeingOneDragon/main.js
@@ -1,9 +1,9 @@
-//当前js版本 1.3.8
+//当前js版本 1.4.3

 //拾取时上下滑动的时间
-const timeMoveUp = 500;
-const timeMoveDown = 1000;
-const pickupMode = settings.pickupMode || "js拾取，默认只拾取狗粮和晶蝶";
+let timeMoveUp = 500;
+let timeMoveDown = 1000;
+let pickupMode = settings.pickupMode || "模板匹配拾取，默认只拾取狗粮";
 if (settings.activeDumperMode) { //处理泥头车信息
    dumpers = settings.activeDumperMode.split('，').map(Number).filter(num => num === 1 || num === 2 || num === 3 || num === 4);
 } else {
@@ -11,10 +11,13 @@ if (settings.activeDumperMode) { //处理泥头车信息
 }
 trigger = (+settings.trigger || 50);
 let gameRegion;
+let targetItemPath = "assets/targetItems";
+let targetItems;

 (async function () {
    //自定义配置处理
    const operationMode = settings.operationMode || "运行锄地路线";
+    if (pickupMode === "js拾取，默认只拾取狗粮和晶蝶") pickupMode = "模板匹配拾取，默认只拾取狗粮";

    let k = settings.efficiencyIndex;
    // 空字符串、null、undefined 或非数字 → 0.5
@@ -53,6 +56,16 @@ let gameRegion;
    const whitelistKeywords = ocrPickupJson["白名单"];
    const blacklistKeywords = ocrPickupJson["黑名单"];

+    targetItems = await readFolder(targetItemPath, false);
+    //模板匹配对象处理
+    if (pickupMode === "模板匹配拾取，默认只拾取狗粮") {
+        for (const targetItem of targetItems) {
+            targetItem.template = file.ReadImageMatSync(targetItem.fullPath);
+            targetItem.itemName = targetItem.fileName.replace(/\.png$/, '');
+        }
+        timeMoveUp = trigger * 8;
+        timeMoveDown = trigger * 8;
+    }
    if (!settings.accountName) {
        for (let i = 0; i < 120; i++) {
            // 原始文本
@@ -487,12 +500,13 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
    async function isMainUI() {
        // 修改后的图像路径
        const imagePath = "assets/MainUI.png";
-
        // 修改后的识别区域（左上角区域）
        const xMin = 0;
        const yMin = 0;
        const width = 150; // 识别区域宽度
        const height = 150; // 识别区域高度
+        let template = file.ReadImageMatSync(imagePath);
+        let recognitionObject = RecognitionObject.TemplateMatch(template, xMin, yMin, width, height);

        // 尝试次数设置为 3 次
        const maxAttempts = 3;
@@ -500,8 +514,7 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
        let attempts = 0;
        while (attempts < maxAttempts && !state.cancelRequested) {
            try {
-                let template = file.ReadImageMatSync(imagePath);
-                let recognitionObject = RecognitionObject.TemplateMatch(template, xMin, yMin, width, height);
+
                gameRegion = captureGameRegion();
                let result = gameRegion.find(recognitionObject);
                gameRegion.dispose();
@@ -534,15 +547,14 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
        const yMin = 200;
        const width = 1000; // 识别区域宽度
        const height = 250; // 识别区域高度
-
+        let template = file.ReadImageMatSync(imagePath);
+        let recognitionObject = RecognitionObject.TemplateMatch(template, xMin, yMin, width, height);
        // 尝试次数设置为 10 次
        const maxAttempts = 10;

        let attempts = 0;
        while (attempts < maxAttempts && !state.cancelRequested) {
            try {
-                let template = file.ReadImageMatSync(imagePath);
-                let recognitionObject = RecognitionObject.TemplateMatch(template, xMin, yMin, width, height);
                gameRegion = captureGameRegion();
                let result = gameRegion.find(recognitionObject);
                gameRegion.dispose();
@@ -578,11 +590,10 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
    }

    // 定义一个函数用于执行OCR识别和交互
-    async function performOcrAndInteract(imagePath, whitelistKeywords, textxRange, texttolerance) {
+    async function recoginzeAndInteract(imagePath, whitelistKeywords, textxRange, texttolerance) {
        async function performOcr(whitelistKeywords, xRange, yRange) {
            try {
                // 在捕获的区域内进行OCR识别
-                gameRegion = captureGameRegion();
                let resList = gameRegion.findMulti(RecognitionObject.ocr(
                    xRange.min, yRange.min,
                    xRange.max - xRange.min, yRange.max - yRange.min
@@ -614,14 +625,36 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
            }
        }

+        async function performTemplateMatch(centerYF) {
+            try {
+                let result;
+                let itemName = null;
+                // 在捕获的区域内进行模板匹配识别
+                for (const targetItem of targetItems) {
+                    let recognitionObject = RecognitionObject.TemplateMatch(targetItem.template, 1220, centerYF - 35, 70, 70);
+                    result = gameRegion.find(recognitionObject);
+                    if (result.isExist()) {
+                        itemName = targetItem.itemName;
+                        //log.info(`调试-距离为${result.y + result.height / 2 - centerYF}`);
+                        break;
+                    }
+                }
+                gameRegion.dispose();
+                return itemName;
+            } catch (error) {
+                log.error(`模板匹配时发生异常: ${error.message}`);
+                return [];
+            }
+        }
+
        while (!state.completed && !state.cancelRequested) {
            // 尝试找到 F 图标并返回其坐标
            async function findFIcon(imagePath, xMin, yMin, width, height, timeout = 500) {
+                let template = file.ReadImageMatSync(imagePath);
+                let recognitionObject = RecognitionObject.TemplateMatch(template, xMin, yMin, width, height);
                let startTime = Date.now();
                while (Date.now() - startTime < timeout && !state.cancelRequested) {
                    try {
-                        let template = file.ReadImageMatSync(imagePath);
-                        let recognitionObject = RecognitionObject.TemplateMatch(template, xMin, yMin, width, height);
                        gameRegion = captureGameRegion();
                        let result = gameRegion.find(recognitionObject);
                        if (result.isExist()) {
@@ -655,39 +688,47 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
                }
                continue;
            }
-
-            // 获取 F 图标的中心点 Y 坐标
-            let centerYF = fRes.y + fRes.height / 2;
-
-            // 在当前屏幕范围内进行 OCR 识别
-            let ocrResults = await performOcr(whitelistKeywords, textxRange, { min: fRes.y - texttolerance, max: fRes.y + fRes.height + texttolerance * 2 });
-
-            // 检查所有目标文本是否在当前页面中
            let foundTarget = false;
-            for (let ocrResult of ocrResults) {
-                // 检查是否包含黑名单关键词
-                let containsBlacklistKeyword = blacklistKeywords.some(blacklistKeyword => ocrResult.text.includes(blacklistKeyword));
-                if (containsBlacklistKeyword) {
-                    continue;
-                }
+            // 获取 F 图标的中心点 Y 坐标
+            let centerYF = Math.round(fRes.y + fRes.height / 2);
+            if (pickupMode === "ocr拾取，默认只拾取狗粮和晶蝶") {
+                // 在当前屏幕范围内进行 OCR 识别
+                let ocrResults = await performOcr(whitelistKeywords, textxRange, { min: fRes.y - texttolerance, max: fRes.y + fRes.height + texttolerance * 2 });

-                // 计算目标文本的中心Y坐标
-                let centerYTargetText = ocrResult.y + ocrResult.height / 2;
-                if (Math.abs(centerYTargetText - centerYF) <= texttolerance) {
-                    keyPress("F"); // 执行交互操作
-                    await sleep(trigger); // 操作后暂停 50 毫秒
-                    foundTarget = true;
-
-                    if ((new Date() - lastPickupTime) > 1000 || ocrResult.text != lastPickupItem) {
-                        log.info(`交互或拾取："${ocrResult.text}"`);
-                        lastPickupTime = new Date();
-                        lastPickupItem = ocrResult.text;
+                // 检查所有目标文本是否在当前页面中
+                for (let ocrResult of ocrResults) {
+                    // 检查是否包含黑名单关键词
+                    let containsBlacklistKeyword = blacklistKeywords.some(blacklistKeyword => ocrResult.text.includes(blacklistKeyword));
+                    if (containsBlacklistKeyword) {
+                        continue;
+                    }
+                    // 计算目标文本的中心Y坐标
+                    let centerYTargetText = ocrResult.y + ocrResult.height / 2;
+                    if (Math.abs(centerYTargetText - centerYF) <= texttolerance) {
+                        keyPress("F"); // 执行交互操作
+                        await sleep(2 * trigger); // 操作后暂停 2*trigger 毫秒
+                        foundTarget = true;
+                        if ((new Date() - lastPickupTime) > 1000 || ocrResult.text != lastPickupItem) {
+                            log.info(`交互或拾取："${ocrResult.text}"`);
+                            lastPickupTime = new Date();
+                            lastPickupItem = ocrResult.text;
+                        }
+                        break;
                    }
-
-                    break;
                }
-            }
+            } else if (pickupMode === "模板匹配拾取，默认只拾取狗粮") {
+                //let start = new Date();
+                let itemName = await performTemplateMatch(centerYF);
+                //let end = new Date();
+                //log.info(`调试-匹配用时${end - start}毫秒`)
+                if (itemName) {
+                    keyPress("F"); // 执行交互操作
+                    log.info(`交互或拾取："${itemName}"`);
+                    await sleep(2 * trigger + 100); // 操作后暂停 2*trigger+100 毫秒
+                    foundTarget = true;
+                }

+            }
            // 如果在当前页面中没有找到任何目标文本，则根据时间决定滚动方向
            if (!foundTarget) {
                const currentTime = new Date().getTime(); // 获取当前时间（毫秒）
@@ -710,6 +751,11 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
                    // 否则执行下翻
                    await keyMouseScript.runFile(`assets/滚轮上翻.json`);
                }
+                if (pickupMode === "模板匹配拾取，默认只拾取狗粮") {
+                    await sleep(Math.round(trigger / 5));
+                } else {
+                    await sleep(Math.round(trigger));
+                }
            }

            if (state.cancelRequested) {
@@ -832,8 +878,8 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo

    // 根据条件决定是否启动 OCR 检测和交互任务
    let ocrTask = null;
-    if (pickupMode === "js拾取，默认只拾取狗粮和晶蝶") {
-        ocrTask = performOcrAndInteract(imagePath, whitelistKeywords, textxRange, texttolerance);
+    if (pickupMode === "ocr拾取，默认只拾取狗粮和晶蝶" || pickupMode === "模板匹配拾取，默认只拾取狗粮") {
+        ocrTask = recoginzeAndInteract(imagePath, whitelistKeywords, textxRange, texttolerance);
    }

    // 启动泥头车
--- a/repo/js/AutoHoeingOneDragon/manifest.json
+++ b/repo/js/AutoHoeingOneDragon/manifest.json
@@ -1,12 +1,16 @@
 {
  "manifest_version": 1,
  "name": "锄地一条龙",
-  "version": "1.3.8",
+  "version": "1.4.3",
  "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用",
  "authors": [
    {
      "name": "mno",
      "links": "https://github.com/Bedrockx"
+    },
+    {
+      "name": "汐",
+      "links": "https://github.com/jiegedabaobei"
    }
  ],
  "settings_ui": "settings.json",
--- a/repo/js/AutoHoeingOneDragon/pathing/0-精英400/1-精英/101蒙德雪山（600_1，200_2）.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/0-精英400/1-精英/101蒙德雪山（600_1，200_2）.json
@@ -14,15 +14,15 @@
    ],
    "map_name": "Teyvat",
    "tags": [],
-    "last_modified_time": 1754740472538,
+    "last_modified_time": 1755009165206,
    "enable_monster_loot_split": false,
    "map_match_method": ""
  },
  "positions": [
    {
      "id": 1,
-      "x": -410.84,
-      "y": 1161.31,
+      "x": -410.84000000000015,
+      "y": 1161.3099999999995,
      "action": "",
      "move_mode": "walk",
      "action_params": "",
@@ -30,8 +30,8 @@
    },
    {
      "id": 2,
-      "x": -405.68,
-      "y": 1145.15,
+      "x": -405.6800000000003,
+      "y": 1145.1499999999996,
      "action": "combat_script",
      "move_mode": "dash",
      "action_params": "keypress(f);芙宁娜 e;玛薇卡 e;爱可菲 e;伊涅芙 e;",
@@ -39,8 +39,8 @@
    },
    {
      "id": 3,
-      "x": -398.96,
-      "y": 1131.17,
+      "x": -390.130000000001,
+      "y": 1114.2099999999991,
      "action": "",
      "move_mode": "run",
      "action_params": "",
@@ -48,35 +48,35 @@
    },
    {
      "id": 4,
-      "x": -390.13,
-      "y": 1114.21,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
+      "x": -358.25390625,
+      "y": 1089.09521484375,
+      "type": "path",
+      "move_mode": "dash",
+      "action": "fight",
+      "action_params": ""
    },
    {
      "id": 5,
-      "x": -376.77,
-      "y": 1098.65,
+      "x": -363.916015625,
+      "y": 1079.6005859375,
+      "type": "path",
+      "move_mode": "dash",
      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
+      "action_params": ""
    },
    {
      "id": 6,
-      "x": -366.5,
-      "y": 1086.25,
-      "action": "fight",
-      "move_mode": "dash",
+      "x": -368.25007110149454,
+      "y": 1058.6270311671033,
+      "action": "",
+      "move_mode": "run",
      "action_params": "",
      "type": "path"
    },
    {
      "id": 7,
-      "x": -367.1,
-      "y": 1067,
+      "x": -368.7400000000016,
+      "y": 1038.7999999999993,
      "action": "",
      "move_mode": "run",
      "action_params": "",
@@ -84,44 +84,44 @@
    },
    {
      "id": 8,
-      "x": -368.74,
-      "y": 1038.8,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 9,
-      "x": -372.17,
-      "y": 1031.93,
+      "x": -372.16999999999825,
+      "y": 1031.9300000000003,
      "action": "combat_script",
      "move_mode": "walk",
      "action_params": "keypress(f)",
      "type": "path"
    },
    {
-      "id": 10,
-      "x": -376.45,
-      "y": 1028.28,
+      "id": 9,
+      "x": -376.4500000000007,
+      "y": 1028.2799999999988,
      "action": "",
      "move_mode": "fly",
      "action_params": "",
      "type": "path"
    },
    {
-      "id": 11,
-      "x": -396.11,
-      "y": 994.23,
+      "id": 10,
+      "x": -396.1100000000006,
+      "y": 994.2299999999996,
      "action": "fight",
      "move_mode": "dash",
      "action_params": "",
      "type": "path"
    },
+    {
+      "id": 11,
+      "x": -368.59999999999854,
+      "y": 988.4899999999998,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
    {
      "id": 12,
-      "x": -368.6,
-      "y": 988.49,
+      "x": -354.5,
+      "y": 974.5599999999995,
      "action": "",
      "move_mode": "run",
      "action_params": "",
@@ -129,26 +129,17 @@
    },
    {
      "id": 13,
-      "x": -354.5,
-      "y": 974.56,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 14,
-      "x": -345.1,
-      "y": 948.63,
+      "x": -345.09999999999854,
+      "y": 948.6300000000001,
      "action": "",
      "move_mode": "walk",
      "action_params": "",
      "type": "path"
    },
    {
-      "id": 15,
-      "x": -335.62,
-      "y": 962.88,
+      "id": 14,
+      "x": -335.619999999999,
+      "y": 962.8800000000001,
      "action": "fight",
      "move_mode": "dash",
      "action_params": "",
--- a/repo/js/AutoHoeingOneDragon/pathing/0-精英400/1-精英/418【沙暴】须弥沙漠三运河之地（600_1，200_2）.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/0-精英400/1-精英/418【沙暴】须弥沙漠三运河之地（600_1，200_2）.json
@@ -7,7 +7,7 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1754764693240,
+    "last_modified_time": 1755106895268,
    "authors": [
      {
        "name": "汐",
@@ -65,8 +65,8 @@
    },
    {
      "id": 6,
-      "x": 5109.09765625,
-      "y": -590.34765625,
+      "x": 5099.0703125,
+      "y": -598.751953125,
      "action": "fight",
      "move_mode": "dash",
      "action_params": "",
@@ -74,8 +74,143 @@
    },
    {
      "id": 7,
-      "x": 5109.09765625,
-      "y": -590.34765625,
+      "x": 5099.0703125,
+      "y": -598.751953125,
+      "action": "combat_script",
+      "move_mode": "dash",
+      "action_params": "wait(1)",
+      "type": "orientation"
+    },
+    {
+      "id": 8,
+      "x": 4589.01220703125,
+      "y": -652.93798828125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 9,
+      "x": 4570.27734375,
+      "y": -670.44384765625,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 10,
+      "x": 4550.2236328125,
+      "y": -719.0087890625,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 11,
+      "x": 4540.376953125,
+      "y": -740.5068359375,
+      "action": "combat_script",
+      "move_mode": "dash",
+      "action_params": "keypress(t),wait(0.2),keypress(t)",
+      "type": "path"
+    },
+    {
+      "id": 12,
+      "x": 4525.1328125,
+      "y": -769.87744140625,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(t),wait(0.2),keypress(t),moveby(0,1000),keydown(w),wait(0.5),keypress(t),wait(0.2),keypress(t),wait(0.5),keyup(w)",
+      "type": "orientation"
+    },
+    {
+      "id": 13,
+      "x": 4503.74560546875,
+      "y": -794.505859375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(t),wait(0.2),keypress(t),wait(0.2),keypress(t),wait(0.5)",
+      "type": "orientation"
+    },
+    {
+      "id": 14,
+      "x": 4513.001953125,
+      "y": -786.50634765625,
+      "action": "log_output",
+      "move_mode": "dash",
+      "action_params": "切换[沙暴]状态",
+      "type": "orientation"
+    },
+    {
+      "id": 15,
+      "x": 4513.001953125,
+      "y": -786.50634765625,
+      "action": "combat_script",
+      "move_mode": "dash",
+      "action_params": "keypress(f),wait(0.2),keypress(f),w(0.2),keypress(f)",
+      "type": "path"
+    },
+    {
+      "id": 16,
+      "x": 5173.60302734375,
+      "y": -498.49169921875,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 17,
+      "x": 5162.541015625,
+      "y": -514.2607421875,
+      "action": "stop_flying",
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 18,
+      "x": 5152.812393347761,
+      "y": -527.9367269438635,
+      "action": "fight",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 19,
+      "x": 5146.248356765498,
+      "y": -541.2507882140999,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 20,
+      "x": 5139.562377547429,
+      "y": -550.8127273694517,
+      "action": "",
+      "move_mode": "jump",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 21,
+      "x": 5099.0703125,
+      "y": -598.751953125,
+      "action": "fight",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 22,
+      "x": 5099.0703125,
+      "y": -598.751953125,
      "action": "combat_script",
      "move_mode": "dash",
      "action_params": "wait(1)",
--- a/repo/js/AutoHoeingOneDragon/pathing/0-精英400/1-精英/419【沙暴】须弥沙漠巨人峡谷西北（600_1）.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/0-精英400/1-精英/419【沙暴】须弥沙漠巨人峡谷西北（600_1）.json
@@ -13,7 +13,7 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1754764727505,
+    "last_modified_time": 1755105651055,
    "enable_monster_loot_split": false,
    "map_match_method": ""
  },
@@ -25,34 +25,166 @@
      "action": "",
      "move_mode": "walk",
      "action_params": "",
-      "type": "teleport"
+      "type": "teleport",
+      "locked": false
    },
    {
      "id": 2,
      "x": 5473.3095703125,
      "y": -1220.8349609375,
+      "action": "log_output",
+      "move_mode": "fly",
+      "action_params": "此地有沙暴必摔死1次,无法解决",
+      "type": "orientation",
+      "locked": false
+    },
+    {
+      "id": 3,
+      "x": 5473.3095703125,
+      "y": -1220.8349609375,
      "action": "",
      "move_mode": "fly",
      "action_params": "",
      "type": "path"
    },
    {
-      "id": 3,
-      "x": 5497.5859375,
-      "y": -1100.48291015625,
-      "action": "fight",
+      "id": 4,
+      "x": 5498.4580078125,
+      "y": -1095.15966796875,
+      "type": "path",
      "move_mode": "dash",
+      "action": "fight",
+      "action_params": "",
+      "locked": false
+    },
+    {
+      "id": 5,
+      "x": 5498.4580078125,
+      "y": -1095.15966796875,
+      "type": "orientation",
+      "move_mode": "dash",
+      "action": "combat_script",
+      "action_params": "wait(1)"
+    },
+    {
+      "id": 6,
+      "x": 4589.01220703125,
+      "y": -652.93798828125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 7,
+      "x": 4570.27734375,
+      "y": -670.44384765625,
+      "action": "",
+      "move_mode": "run",
      "action_params": "",
      "type": "path"
    },
    {
-      "id": 4,
-      "x": 5497.5859375,
-      "y": -1100.48291015625,
+      "id": 8,
+      "x": 4550.2236328125,
+      "y": -719.0087890625,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 9,
+      "x": 4540.376953125,
+      "y": -740.5068359375,
      "action": "combat_script",
      "move_mode": "dash",
-      "action_params": "wait(1)",
+      "action_params": "keypress(t),wait(0.2),keypress(t)",
+      "type": "path"
+    },
+    {
+      "id": 10,
+      "x": 4525.1328125,
+      "y": -769.87744140625,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(t),wait(0.2),keypress(t),moveby(0,1000),keydown(w),wait(0.5),keypress(t),wait(0.2),keypress(t),wait(0.5),keyup(w)",
      "type": "orientation"
+    },
+    {
+      "id": 11,
+      "x": 4503.74560546875,
+      "y": -794.505859375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(t),wait(0.2),keypress(t),wait(0.2),keypress(t),wait(0.5)",
+      "type": "orientation"
+    },
+    {
+      "id": 12,
+      "x": 4513.001953125,
+      "y": -786.50634765625,
+      "action": "log_output",
+      "move_mode": "dash",
+      "action_params": "切换[沙暴]状态",
+      "type": "orientation"
+    },
+    {
+      "id": 13,
+      "x": 4513.001953125,
+      "y": -786.50634765625,
+      "action": "combat_script",
+      "move_mode": "dash",
+      "action_params": "keypress(f),wait(0.2),keypress(f),w(0.2),keypress(f)",
+      "type": "path"
+    },
+    {
+      "id": 14,
+      "x": 5485.2216796875,
+      "y": -1240.50732421875,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 15,
+      "x": 5473.3095703125,
+      "y": -1220.8349609375,
+      "action": "log_output",
+      "move_mode": "fly",
+      "action_params": "此地有沙暴必摔死1次,无法解决",
+      "type": "orientation",
+      "locked": false
+    },
+    {
+      "id": 16,
+      "x": 5473.3095703125,
+      "y": -1220.8349609375,
+      "action": "",
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 17,
+      "x": 5498.4580078125,
+      "y": -1095.15966796875,
+      "type": "path",
+      "move_mode": "dash",
+      "action": "fight",
+      "action_params": "",
+      "locked": false
+    },
+    {
+      "id": 18,
+      "x": 5498.4580078125,
+      "y": -1095.15966796875,
+      "type": "orientation",
+      "move_mode": "dash",
+      "action": "combat_script",
+      "action_params": "wait(1)",
+      "locked": false
    }
  ]
 }
--- a/repo/js/AutoHoeingOneDragon/pathing/0-精英400/1-精英/420【沙暴】须弥沙漠折胫谷（600_1，200_1）.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/0-精英400/1-精英/420【沙暴】须弥沙漠折胫谷（600_1，200_1）.json
@@ -7,7 +7,7 @@
    "map_name": "Teyvat",
    "bgi_version": "0.45.0",
    "tags": [],
-    "last_modified_time": 1754764785462,
+    "last_modified_time": 1755105731448,
    "authors": [
      {
        "name": "汐",
@@ -69,7 +69,7 @@
      "y": -835.1923828125,
      "action": "stop_flying",
      "move_mode": "fly",
-      "action_params": "",
+      "action_params": "1200",
      "type": "path"
    },
    {
@@ -116,6 +116,177 @@
      "move_mode": "dash",
      "action_params": "wait(1)",
      "type": "orientation"
+    },
+    {
+      "id": 12,
+      "x": 4589.01220703125,
+      "y": -652.93798828125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 13,
+      "x": 4570.27734375,
+      "y": -670.44384765625,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 14,
+      "x": 4550.2236328125,
+      "y": -719.0087890625,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 15,
+      "x": 4540.376953125,
+      "y": -740.5068359375,
+      "action": "combat_script",
+      "move_mode": "dash",
+      "action_params": "keypress(t),wait(0.2),keypress(t)",
+      "type": "path"
+    },
+    {
+      "id": 16,
+      "x": 4525.1328125,
+      "y": -769.87744140625,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(t),wait(0.2),keypress(t),moveby(0,1000),keydown(w),wait(0.5),keypress(t),wait(0.2),keypress(t),wait(0.5),keyup(w)",
+      "type": "orientation"
+    },
+    {
+      "id": 17,
+      "x": 4503.74560546875,
+      "y": -794.505859375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(t),wait(0.2),keypress(t),wait(0.2),keypress(t),wait(0.5)",
+      "type": "orientation"
+    },
+    {
+      "id": 18,
+      "x": 4513.001953125,
+      "y": -786.50634765625,
+      "action": "log_output",
+      "move_mode": "dash",
+      "action_params": "切换[沙暴]状态",
+      "type": "orientation"
+    },
+    {
+      "id": 19,
+      "x": 4513.001953125,
+      "y": -786.50634765625,
+      "action": "combat_script",
+      "move_mode": "dash",
+      "action_params": "keypress(f),wait(0.2),keypress(f),w(0.2),keypress(f)",
+      "type": "path"
+    },
+    {
+      "id": 20,
+      "x": 5686.673828125,
+      "y": -706.03369140625,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 21,
+      "x": 5692.84130859375,
+      "y": -703.3740234375,
+      "action": "",
+      "move_mode": "climb",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 22,
+      "x": 5713.61767578125,
+      "y": -728.20556640625,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 23,
+      "x": 5718.09765625,
+      "y": -753.36474609375,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 24,
+      "x": 5723.87255859375,
+      "y": -788.5927734375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "keypress(t)",
+      "type": "orientation"
+    },
+    {
+      "id": 25,
+      "x": 5770.123046875,
+      "y": -835.1923828125,
+      "action": "stop_flying",
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 26,
+      "x": 5810.6689453125,
+      "y": -849.20166015625,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 27,
+      "x": 5849.812456549088,
+      "y": -848.4378789490866,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 28,
+      "x": 5885.3818359375,
+      "y": -847.77978515625,
+      "action": "stop_flying",
+      "move_mode": "fly",
+      "action_params": "1200",
+      "type": "path"
+    },
+    {
+      "id": 29,
+      "x": 5889.8935546875,
+      "y": -882.19287109375,
+      "action": "fight",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 30,
+      "x": 5889.8935546875,
+      "y": -882.19287109375,
+      "action": "combat_script",
+      "move_mode": "dash",
+      "action_params": "wait(1)",
+      "type": "orientation"
    }
  ]
 }
--- a/repo/js/AutoHoeingOneDragon/settings.json
+++ b/repo/js/AutoHoeingOneDragon/settings.json
@@ -32,11 +32,12 @@
    "type": "select",
    "label": "拾取模式",
    "options": [
-      "js拾取，默认只拾取狗粮和晶蝶",
+      "模板匹配拾取，默认只拾取狗粮",
+      "ocr拾取，默认只拾取狗粮和晶蝶",
      "bgi原版拾取",
      "不拾取任何物品"
    ],
-    "default": "js拾取，默认只拾取狗粮和晶蝶"
+    "default": "模板匹配拾取，默认只拾取狗粮"
  },
  {
    "name": "trigger",
--- a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/枫丹-很明亮的地方-炬木-36个.json
+++ b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/枫丹-很明亮的地方-炬木-36个.json
@@ -11,10 +11,11 @@
    "version": "1.0",
    "description": "",
    "map_name": "Teyvat",
-    "bgi_version": "0.48.0",
+    "bgi_version": "0.48.1",
    "tags": [],
    "last_modified_time": 1753711626346,
-    "enable_monster_loot_split": false
+    "enable_monster_loot_split": false,
+    "map_match_method": "TemplateMatch"
  },
  "positions": [
    {
--- a/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/枫丹-悬铃木-椴木/枫丹-卡布狄斯堡遗迹-悬铃木-27个-椴木-30个(小循环).json
+++ b/repo/js/AutoWoodcutting-Pathing/assets/AutoPath/枫丹-悬铃木-椴木/枫丹-卡布狄斯堡遗迹-悬铃木-27个-椴木-30个(小循环).json
@@ -4,7 +4,7 @@
    "type": "collect",
    "version": "1.0",
    "description": "",
-    "bgi_version": "0.48.0",
+    "bgi_version": "0.48.1",
    "authors": [
      {
        "name": "起个名字好难的喵",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jamis	7c4c101ef5	校准紫晶块路线 (#1589 ) * Correct pathing for amethyst crystals * 自动修复 JSON 格式和版本号 [ci skip] --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-14 18:43:50 +08:00
zaodonganqi	a3b3a8c746	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-14 04:05:48 +00:00
汐	a26500456d	精英 readme 忘记更新 (#1588 )	2025-08-14 12:05:29 +08:00
zaodonganqi	eb216dd3b8	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-14 00:55:27 +00:00
yanying09	721b259b02	Add files via upload (#1586 ) 4晶蝶	2025-08-14 08:54:37 +08:00
zaodonganqi	4b6285a232	update repo.json	2025-08-14 00:54:04 +00:00
汐	b275caf7c8	狗粮+精英 8.13 (#1587 ) 狗粮: 1.修复强制黑芙的摔死bug 精英: 1.研究方法进入[沙暴]区域	2025-08-14 08:53:45 +08:00
zaodonganqi	bbb043e7f4	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-13 14:59:22 +00:00
this-Fish	9de10157fc	地圖追蹤 : 海露花&帕蒂沙兰路徑優化 (#1584 ) * Delete repo/pathing/地方特产/枫丹/海露花/芭芭拉效率路线@寥寥轻舟 directory * 地圖追蹤 : 海露花路徑優化 * Delete repo/pathing/地方特产/须弥/帕蒂沙兰 directory * 地圖追蹤 : 帕蒂沙兰路徑優化 * 自动修复 JSON 格式和版本号 [ci skip] * 補充README.md * 自动修复 JSON 格式和版本号 [ci skip] * Add files via upload --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-13 22:50:53 +08:00
Jamis	4fd7090831	校准水晶块路线 (#1582 ) * correct pathing for crystal chunks * 自动修复 JSON 格式和版本号 [ci skip] --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-13 18:39:00 +08:00
Jamis	e14f59918f	修正须弥地区水晶块路线，删除两条失败率高的路线 (#1579 ) * fix pathing for crystal chunks in Sumeru * 自动修复 JSON 格式和版本号 [ci skip] --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-13 15:57:34 +08:00
zaodonganqi	25e651aad8	update repo.json	2025-08-13 07:26:21 +00:00
this-Fish	50da8dfd95	JS : Auto Theft NPC & 原食改用orc方式應對納塔商人交互 (#1580 ) 修正模擬操作會導致BUG納塔商人交互失敗改用orc方式應對納塔商人交互	2025-08-13 15:25:33 +08:00
zaodonganqi	6d658e5079	update repo.json	2025-08-13 03:39:09 +00:00
Jamis	7eb7b8131f	校准须弥地区水晶块路线 (#1578 ) * Correct pathing for crystal chunks in Sumeru * 自动修复 JSON 格式和版本号 [ci skip] --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-13 11:04:10 +08:00
zaodonganqi	96cfb3dd90	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-13 02:14:01 +00:00
zaodonganqi	4a88eaac02	update repo.json	2025-08-13 01:50:59 +00:00
mno	af6355963d	js：锄地一条龙1.4.2 (#1576 ) ### 1.4.2（2025.08.13） 1.修改拾取后延时效果	2025-08-13 09:50:43 +08:00
zaodonganqi	de6e48946b	update repo.json	2025-08-13 01:50:13 +00:00
躁动的氨气	439970db04	全自动使用多个兑换码归档 (#1577 ) * 自动使用兑换码归档 * Delete repo/js/全自动使用多个兑换码 directory * 全自动使用多个兑换码归档	2025-08-13 09:49:24 +08:00
zaodonganqi	2bd1122df8	update repo.json	2025-08-13 01:40:26 +00:00
躁动的氨气	da329d7353	自动使用兑换码归档 (#1575 )	2025-08-13 09:36:30 +08:00
zaodonganqi	833a6f1290	update repo.json	2025-08-13 01:30:15 +00:00
躁动的氨气	447a72b303	清除归档后的自动使用兑换码残留 Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-13 09:29:25 +08:00
zaodonganqi	68ffddf868	update repo.json	2025-08-13 00:54:53 +00:00
zaodonganqi	9724dfecf8	update repo.json	2025-08-13 00:53:46 +00:00
this-Fish	16e191fd05	JS : Auto Theft NPC & 原食修改納塔商人交互方式 (#1574 )	2025-08-13 08:52:59 +08:00
zaodonganqi	71823d7b84	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-12 15:29:42 +00:00
汐	4d9fb412aa	狗粮pro +精英+批发 8.12 (#1572 ) 精英: 1.101优化狗粮: 芙宁娜状态外置调整	2025-08-12 23:29:21 +08:00
Jamis	7647322f5a	新增更多枫丹地区萃凝晶路线 (#1571 ) * Add more pathing for condessence crystals * 自动修复 JSON 格式和版本号 [ci skip] --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-12 23:02:21 +08:00
Tool_tingsu	453aadcd87	地图追踪澄晶实01 路线优化 (#1569 ) * Delete repo/pathing/食材与炼金/澄晶实/纳西妲收集@Tool_tingsu/01-澄晶实-隆崛坡地下-4个.json * Add files via upload * 自动修复 JSON 格式和版本号 [ci skip] * Update 01-澄晶实-隆崛坡地下-4个.json --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-12 20:31:02 +08:00
Jamis	e6fd631fdd	补充枫丹地区萃凝晶路线 (#1570 ) * Add more pathing for condessence crystals * 自动修复 JSON 格式和版本号 [ci skip] --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-12 20:29:10 +08:00
MisakaAldrich	fd85cc5816	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-12 08:43:38 +00:00
起个名字好难的喵	b048e7fb23	fix typo	2025-08-12 16:42:50 +08:00
zaodonganqi	18fe49b8bd	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-12 08:26:37 +00:00
mno	fbf7fcd245	js：锄地一条龙1.4.0 (#1568 ) * js：锄地一条龙1.4.0 ### 1.4.0（2025.08.12） 1.增加拾取模式，模板匹配拾取并设为默认项，之前的拾取模式改名为ocr拾取 * js：性能测试增加自定义配置选择测试项目和识图区域大小 * js：锄地一条龙适当增加拾取后延时	2025-08-12 16:26:17 +08:00
Jamis	38f662590c	校准枫丹、纳塔地区萃凝晶路线 (#1566 ) * correct pathing for condessence crystals * Shorten wait times * 自动修复 JSON 格式和版本号 [ci skip] * Use 1-second delay before teleporting --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-12 15:51:02 +08:00
MisakaAldrich	1ae6e698a1	update repo.json	2025-08-12 07:43:56 +00:00
起个名字好难的喵	8b97ee6e81	fix autowoodcutting-pathing bgi_version (#1567 )	2025-08-12 15:43:20 +08:00
zaodonganqi	38f81ceebb	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-12 04:54:05 +00:00
Jamis	106c9dac4d	校准枫丹地区萃凝晶路线 (#1565 ) * correct pathing for condessence crystals * 自动修复 JSON 格式和版本号 [ci skip] --------- Co-authored-by: GitHub Actions Bot <actions@github.com>	2025-08-12 12:37:24 +08:00
zaodonganqi	7a8c01d348	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-12 03:38:46 +00:00
躁动的氨气	262f229bf9	自动兑换码归档 (#1563 )	2025-08-12 11:37:57 +08:00
zaodonganqi	43c5c89794	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	2025-08-12 02:08:19 +00:00
mno	0431d3998a	js：AAA狗粮批发0.0.4 (#1562 )	2025-08-12 10:07:57 +08:00