校准紫晶块路线 (#1589)

* Correct pathing for amethyst crystals

* 自动修复 JSON 格式和版本号 [ci skip]

---------

Co-authored-by: GitHub Actions Bot <actions@github.com>

repo/js/AAA-Artifacts-Bulk-Supply/README.md

@@ -4,3 +4,6 @@
 
 如果你只是想要获取狗粮，请使用自动狗粮加强版
 
+## 更新日志
+### 0.0.6（2025.08.13）
+1.修复"99强制黑芙"路线摔死bug

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"
+    }
+  ]
+}

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,
+    "last_modified_time": 1754997437686,
-    "enable_monster_loot_split": false
+    "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",

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"
+    }
+  ]
+}

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,
+    "last_modified_time": 1754997700576,
-    "enable_monster_loot_split": false
+    "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"
     },
     {

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"
+    }
+  ]
+}

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,
+    "last_modified_time": 1754997437686,
-    "enable_monster_loot_split": false
+    "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",

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"
     }
   ]
 }

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"
     }
   ]
 }

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"
+    }
+  ]
+}

repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/100 芙宁娜强制变黑芙.json

@@ -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": ""
-    }
-  ]
-}

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"
+    }
+  ]
+}

repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制黑芙.json

@@ -13,18 +13,28 @@
     "map_name": "Enkanomiya",
     "bgi_version": "0.45.0",
     "tags": [],
-    "last_modified_time": 1753190175272,
+    "last_modified_time": 1755101630357,
-    "enable_monster_loot_split": false
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
   },
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": 97.65771484375,
       "y": 255.2640380859375,
-      "action_params": ""
+      "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"
     }
   ]
 }

repo/js/AAA-Artifacts-Bulk-Supply/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "AAA狗粮批发（测试版本）",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "tags": [
     "狗粮"
   ],

repo/js/Auto Theft NPC & 原食/main.js

@@ -120,7 +120,6 @@ const npcData = {
 		"path": "assets/path/布纳马.json",
 		"goods": ["盐", "小麦", "胡椒", "洋葱", "牛奶", "番茄", "卷心菜", "土豆", "秃秃豆"]
 	}
-
 }
 
 const goodsData = {
@@ -412,23 +411,28 @@ async function spikChat(npcName) {
 	count = 5
 	await sleep(1000);
 	if (npcName == "布纳马") {
-		// 對話
+		// 交互
-		await sleep(500);
+		for (let i = 0; i < 3; i++) {
-		keyDown("VK_MENU");// Alt
+			keyPress("VK_F");
-		await sleep(1000);
+			await sleep(1300);
-		await click(1255, 530);
+		}
-		await sleep(1000);
+
-		keyUp("VK_MENU");// Alt
+		// 点击有什么卖的
-		// 跳過交互&進入買食畫面
+		let captureRegion = captureGameRegion()
-		await click(1345, 580);
+		let resList = captureRegion.findMulti(RecognitionObject.ocrThis);
-		await sleep(1000);
+		for (let i = 0; i < resList.count; i++) {
-		await click(1345, 580);
+			if (resList[i].text.includes("有什么卖的")) {
-		await sleep(1000);
+				click(resList[i].x + 30, resList[i].y + 30); // 点击有什么卖的
-		await click(1345, 580);
+				// 使用完后释放资源
-		await sleep(1000);
+				captureRegion.dispose();
-		await click(1345, 580);
+			}
-		await sleep(1000);
+		}
+
+		await sleep(1300);
+		keyPress("VK_F");
+		await sleep(1300);
 	} else {
+
 		for (let i = 0; i < count; i++) {
 			keyPress("VK_F");
 			await sleep(1300);

repo/js/Auto Theft NPC & 原食/manifest.json

@@ -7,6 +7,10 @@
     {
       "name": "听雨♪",
       "links": "https://github.com/TingYu-lulumi"
+    },
+    {
+      "name": "蜜柑魚",
+      "links": "https://github.com/this-Fish"
     }
   ],
   "tags": [

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）

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"
+    }
+  ]
+}

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,
+    "last_modified_time": 1754997437686,
-    "enable_monster_loot_split": false
+    "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",

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"
+    }
+  ]
+}

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,
+    "last_modified_time": 1754997700576,
-    "enable_monster_loot_split": false
+    "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"
     },
     {

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"
+    }
+  ]
+}

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"
+    }
+  ]
+}

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,
+    "last_modified_time": 1754997437686,
-    "enable_monster_loot_split": false
+    "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",

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"
     }
   ]
 }

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"
     }
   ]
 }

repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/03额外/100 芙宁娜强制变黑芙.json

@@ -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": ""
-    }
-  ]
-}

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"
+    }
+  ]
+}

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) {
         // 如果发生错误，记录错误信息

repo/js/AutoArtifactsPro/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "自动狗粮加强版",
-  "version": "1.7.9",
+  "version": "1.7.9.2",
   "tags": [
     "好感",
     "狗粮"

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,7 +54,7 @@
    - - 蕈兽 ：表明路线含有蕈兽，蕈兽遇到雷火元素时会发生转化，转化后占据精英怪物的名额却只掉落少量摩拉，通常建议禁用
    - - 小怪 ：表明路线只含小怪，战斗强度低，且无需携带万叶来拾取可能掉落的狗粮，可以适当携带等级较低或不上场的角色来获取经验收益
    - - 分组逻辑：不含路径组1排除标签和任何其他组标签的路径会进入路径组1，剩余路径若含有路径组x的标签之一，则会进入路径组x
-   - - 使用示例：路径组一填写蕈兽，禁用蕈兽路线，路径组二填写次数盾，水免，处理路径组一的配队难以处理的次数盾和水免怪物，路径组三填写小怪，队伍中放升级中角色获取经验
+   - - 使用示例：路径组一填写蕈兽，禁用蕈兽路线，路径组二填写次数盾，水免，处理路径组一的配队难以处理的次数盾和水免怪物，路径组三填写小怪，队伍中放升级中角色获取经验，将本js添加到【多个配置组】中，根据路径组的具体情况配置每个配置组的设置
    - **路线效率计算权重：** 影响js评估路线价值，计算公式如下，权重越大越看重总收益
    - $$ 怪均^k \times 秒均 $$
    - **自动优化：** js将根据运行记录调整每条路线的预期运行时间，具体逻辑为，至多6条记录，去除一个最大值、一个最小值后，每条记录占据20%的权重，剩余权重由默认数据填充。如果你不想要这个功能，请禁用。
@@ -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）

repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json

@@ -10,7 +10,7 @@
       "type": 6,
       "mouseX": 0,
       "mouseY": 0,
-      "time": 49
+      "time": 5
     }
   ],
   "info": {

repo/js/AutoHoeingOneDragon/assets/滚轮下翻.json

@@ -10,7 +10,7 @@
             "type": 6,
             "mouseX": 0,
             "mouseY": 0,
-            "time": 49
+            "time": 5
         }
     ],
     "info": {

repo/js/AutoHoeingOneDragon/main.js

@@ -1,9 +1,9 @@
-//当前js版本 1.3.8
+//当前js版本 1.4.3
 
 //拾取时上下滑动的时间
-const timeMoveUp = 500;
+let timeMoveUp = 500;
-const timeMoveDown = 1000;
+let timeMoveDown = 1000;
-const pickupMode = settings.pickupMode || "js拾取，默认只拾取狗粮和晶蝶";
+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;
             }
-
+            let foundTarget = false;
             // 获取 F 图标的中心点 Y 坐标
-            let centerYF = fRes.y + fRes.height / 2;
+            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 });
 
                 // 检查所有目标文本是否在当前页面中
-            let foundTarget = false;
                 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(trigger); // 操作后暂停 50 毫秒
+                        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;
                     }
                 }
+            } 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拾取，默认只拾取狗粮和晶蝶") {
+    if (pickupMode === "ocr拾取，默认只拾取狗粮和晶蝶" || pickupMode === "模板匹配拾取，默认只拾取狗粮") {
-        ocrTask = performOcrAndInteract(imagePath, whitelistKeywords, textxRange, texttolerance);
+        ocrTask = recoginzeAndInteract(imagePath, whitelistKeywords, textxRange, texttolerance);
     }
 
     // 启动泥头车

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",

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,
+      "x": -410.84000000000015,
-      "y": 1161.31,
+      "y": 1161.3099999999995,
       "action": "",
       "move_mode": "walk",
       "action_params": "",
@@ -30,8 +30,8 @@
     },
     {
       "id": 2,
-      "x": -405.68,
+      "x": -405.6800000000003,
-      "y": 1145.15,
+      "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,
+      "x": -390.130000000001,
-      "y": 1131.17,
+      "y": 1114.2099999999991,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -48,35 +48,35 @@
     },
     {
       "id": 4,
-      "x": -390.13,
+      "x": -358.25390625,
-      "y": 1114.21,
+      "y": 1089.09521484375,
-      "action": "",
+      "type": "path",
-      "move_mode": "run",
+      "move_mode": "dash",
-      "action_params": "",
+      "action": "fight",
-      "type": "path"
+      "action_params": ""
     },
     {
       "id": 5,
-      "x": -376.77,
+      "x": -363.916015625,
-      "y": 1098.65,
+      "y": 1079.6005859375,
+      "type": "path",
+      "move_mode": "dash",
       "action": "",
-      "move_mode": "run",
+      "action_params": ""
-      "action_params": "",
-      "type": "path"
     },
     {
       "id": 6,
-      "x": -366.5,
+      "x": -368.25007110149454,
-      "y": 1086.25,
+      "y": 1058.6270311671033,
-      "action": "fight",
+      "action": "",
-      "move_mode": "dash",
+      "move_mode": "run",
       "action_params": "",
       "type": "path"
     },
     {
       "id": 7,
-      "x": -367.1,
+      "x": -368.7400000000016,
-      "y": 1067,
+      "y": 1038.7999999999993,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -84,44 +84,44 @@
     },
     {
       "id": 8,
-      "x": -368.74,
+      "x": -372.16999999999825,
-      "y": 1038.8,
+      "y": 1031.9300000000003,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 9,
-      "x": -372.17,
-      "y": 1031.93,
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "keypress(f)",
       "type": "path"
     },
     {
-      "id": 10,
+      "id": 9,
-      "x": -376.45,
+      "x": -376.4500000000007,
-      "y": 1028.28,
+      "y": 1028.2799999999988,
       "action": "",
       "move_mode": "fly",
       "action_params": "",
       "type": "path"
     },
     {
-      "id": 11,
+      "id": 10,
-      "x": -396.11,
+      "x": -396.1100000000006,
-      "y": 994.23,
+      "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,
+      "x": -354.5,
-      "y": 988.49,
+      "y": 974.5599999999995,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -129,26 +129,17 @@
     },
     {
       "id": 13,
-      "x": -354.5,
+      "x": -345.09999999999854,
-      "y": 974.56,
+      "y": 948.6300000000001,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 14,
-      "x": -345.1,
-      "y": 948.63,
       "action": "",
       "move_mode": "walk",
       "action_params": "",
       "type": "path"
     },
     {
-      "id": 15,
+      "id": 14,
-      "x": -335.62,
+      "x": -335.619999999999,
-      "y": 962.88,
+      "y": 962.8800000000001,
       "action": "fight",
       "move_mode": "dash",
       "action_params": "",

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,
+      "x": 5099.0703125,
-      "y": -590.34765625,
+      "y": -598.751953125,
       "action": "fight",
       "move_mode": "dash",
       "action_params": "",
@@ -74,8 +74,143 @@
     },
     {
       "id": 7,
-      "x": 5109.09765625,
+      "x": 5099.0703125,
-      "y": -590.34765625,
+      "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)",

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,
+      "id": 4,
-      "x": 5497.5859375,
+      "x": 5498.4580078125,
-      "y": -1100.48291015625,
+      "y": -1095.15966796875,
-      "action": "fight",
+      "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,
+      "id": 8,
-      "x": 5497.5859375,
+      "x": 4550.2236328125,
-      "y": -1100.48291015625,
+      "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
     }
   ]
 }

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"
     }
   ]
 }

repo/js/AutoHoeingOneDragon/settings.json

@@ -32,11 +32,12 @@
     "type": "select",
     "label": "拾取模式",
     "options": [
-      "js拾取，默认只拾取狗粮和晶蝶",
+      "模板匹配拾取，默认只拾取狗粮",
+      "ocr拾取，默认只拾取狗粮和晶蝶",
       "bgi原版拾取",
       "不拾取任何物品"
     ],
-    "default": "js拾取，默认只拾取狗粮和晶蝶"
+    "default": "模板匹配拾取，默认只拾取狗粮"
   },
   {
     "name": "trigger",

repo/js/AutoWoodcutting-Pathing/assets/AutoPath/萃华木-48个-松木-3-垂香木-9-御伽木-9-香柏木-9.json

@@ -27,8 +27,8 @@
       "y": 2290.4487,
       "type": "path",
       "move_mode": "walk",
-      "action": "combat_script",
+      "action": "use_gadget",
-      "action_params": "wait(0.5),keypress(z)"
+      "action_params": "wait(0.5),keypress(Z)"
     },
     {
       "id": 3,
@@ -44,8 +44,8 @@
       "y": 2022.0688,
       "type": "path",
       "move_mode": "walk",
-      "action": "combat_script",
+      "action": "use_gadget",
-      "action_params": "wait(0.5),keypress(z)"
+      "action_params": "wait(0.5),keypress(Z)"
     },
     {
       "id": 5,
@@ -69,8 +69,8 @@
       "y": 2174.7385,
       "type": "path",
       "move_mode": "walk",
-      "action": "combat_script",
+      "action": "use_gadget",
-      "action_params": "wait(0.5),keypress(z)"
+      "action_params": "wait(0.5),keypress(Z)"
     },
     {
       "id": 8,

repo/js/ComputerBlower/main.js

@@ -1,29 +1,79 @@
 // 主函数
 (async function () {
+    operationMode = settings.operationMode || "截图";
+    const xRange = parseInt(+settings.xRange || 1920, 10);
+    const yRange = parseInt(+settings.yRange || 1920, 10);
     let startTime = Date.now();
     const interval = +settings.interval || 1000;
     const timeout = +settings.timeout || 60;
     let lastCheck = startTime;
     let ocrcount = 0;
     let loopCount = 0;
-    let logCount = 0;
+    const imagePath = "assets/流放.png";
-    //let store = [];
+    let template = file.ReadImageMatSync(imagePath);
+    if (operationMode === "截图") {
         while (Date.now() - startTime < timeout * 1000) {
-        loopCount++;
             try {
                 let GameRegion = captureGameRegion();
-            // store[loopCount] = GameRegion;
                 if (settings.dispose) GameRegion.dispose();
                 ocrcount++;
+                if (Date.now() - lastCheck >= interval) {
+                    loopCount++;
+                    await sleep(1);
+                    lastCheck = Date.now();
+                    log.info(`在第${loopCount}个${interval}毫秒内执行了${ocrcount}次截图`);
+                    ocrcount = 0;
+                }
+            } catch (error) {
+                log.error(`运行时发生异常: ${error.message}`);
+                break;
+            }
+        }
+    }
+
+    if (operationMode === "模板匹配") {
+        let GameRegion = captureGameRegion();
+        while (Date.now() - startTime < timeout * 1000) {
+            try {
+
+                let recognitionObject = RecognitionObject.TemplateMatch(template, 0, 0, xRange, yRange);
+                let result = GameRegion.find(recognitionObject);
+                ocrcount++;
+                if (Date.now() - lastCheck >= interval) {
+                    loopCount++;
+                    await sleep(1);
+                    lastCheck = Date.now();
+                    log.info(`在第${loopCount}个${interval}毫秒内执行了${ocrcount}次模板匹配`);
+                    ocrcount = 0;
+                }
+            } catch (error) {
+                log.error(`运行时发生异常: ${error.message}`);
+                break;
+            }
+        }
+        if (settings.dispose) GameRegion.dispose();
+    }
+    if (operationMode === "ocr") {
+        let GameRegion = captureGameRegion();
+        while (Date.now() - startTime < timeout * 1000) {
+            try {
+                let result = GameRegion.findMulti(RecognitionObject.ocr(
+                    0, 0,
+                    xRange, yRange
+                ));
+                ocrcount++;
             } catch (error) {
                 log.error(`运行时发生异常: ${error.message}`);
                 break;
             }
             if (Date.now() - lastCheck >= interval) {
-            logCount++;
+                loopCount++;
                 lastCheck = Date.now();
-            log.info(`在第${logCount}个${interval}毫秒内执行了${ocrcount}次截图`);
+                await sleep(1);
+                log.info(`在第${loopCount}个${interval}毫秒内执行了${ocrcount}次OCR`);
                 ocrcount = 0;
             }
         }
+        if (settings.dispose) GameRegion.dispose();
+    }
 })();

repo/js/ComputerBlower/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 1,
-    "name": "截图性能测试",
+    "name": "性能测试",
-    "version": "0.1",
+    "version": "1.0",
     "tags": [],
     "bgi_version": "0.46.0",
     "description": "测测你的",

repo/js/ComputerBlower/settings.json

@@ -1,4 +1,15 @@
 [
+  {
+    "name": "operationMode",
+    "type": "select",
+    "label": "测试项目",
+    "options": [
+      "截图",
+      "模板匹配",
+      "ocr"
+    ],
+    "default": "只截图"
+  },
   {
     "name": "dispose",
     "type": "checkbox",
@@ -15,5 +26,17 @@
     "type": "input-text",
     "label": "间隔多久输出一次（毫秒）",
     "default": "1000"
+  },
+  {
+    "name": "xRange",
+    "type": "input-text",
+    "label": "区域大小x",
+    "default": "1920"
+  },
+  {
+    "name": "yRange",
+    "type": "input-text",
+    "label": "区域大小y",
+    "default": "1080"
   }
 ]

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/01-海露花-枫丹-海露港-10个.json

@@ -69,7 +69,7 @@
       "type": "path",
       "move_mode": "dash",
       "action": "combat_script",
-      "action_params": "芭芭拉 e"
+      "action_params": "wait(1);芭芭拉 e;"
     },
     {
       "id": 7,

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/02-海露花-枫丹-看书-6个.json

@@ -141,7 +141,7 @@
       "type": "path",
       "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "芭芭拉 e"
+      "action_params": "wait(1);芭芭拉 e;"
     },
     {
       "id": 15,

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/03-海露花-枫丹-龙头-4个.json

@@ -3,82 +3,84 @@
     "name": "03-海露花-枫丹-龙头-4个",
     "type": "collect",
     "version": "1.0",
-    "description": "芭芭拉效率专线",
+    "description": "",
     "map_name": "Teyvat",
     "bgi_version": "0.45.0",
     "tags": [
       "芭芭拉"
     ],
-    "last_modified_time": 1750489051636,
+    "last_modified_time": 1755063066847,
     "authors": [
       {
         "name": "寥寥轻舟"
       }
-    ]
+    ],
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
   },
   "positions": [
     {
       "id": 1,
       "x": 4705.56,
       "y": 2951.61,
-      "type": "teleport",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 4678.69,
       "y": 2902.32,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 4661.21,
       "y": 2867.72,
-      "type": "path",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "芭芭拉 e"
+      "move_mode": "walk",
+      "action_params": "wait(1);芭芭拉 e;",
+      "type": "target"
     },
     {
       "id": 4,
-      "x": 4662.3,
+      "x": 4663.8643,
-      "y": 2863.94,
+      "y": 2863.4543,
       "type": "path",
       "move_mode": "walk",
-      "action": "",
+      "action": "combat_script",
-      "action_params": ""
+      "action_params": "wait(0.2);"
     },
     {
       "id": 5,
-      "x": 4656.92,
+      "x": 4657.6055,
-      "y": 2854.78,
+      "y": 2855.4426,
       "type": "path",
       "move_mode": "walk",
-      "action": "",
+      "action": "combat_script",
-      "action_params": ""
+      "action_params": "wait(0.2);"
     },
     {
       "id": 6,
-      "x": 4651.75,
+      "x": 4651.6914,
-      "y": 2861.25,
+      "y": 2861.8892,
       "type": "path",
       "move_mode": "walk",
-      "action": "",
+      "action": "combat_script",
-      "action_params": ""
+      "action_params": "wait(0.2);"
     },
     {
       "id": 7,
-      "x": 4650.35,
+      "x": 4650.5566,
-      "y": 2867.86,
+      "y": 2868.728,
       "type": "path",
       "move_mode": "walk",
-      "action": "",
+      "action": "combat_script",
-      "action_params": ""
+      "action_params": "wait(0.8);"
     }
   ]
 }

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/05-海露花-枫丹-枫丹廷-右-5个.json

@@ -0,0 +1,177 @@
+{
+  "info": {
+    "name": "05-海露花-枫丹-枫丹廷-右-5个",
+    "type": "collect",
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [
+      "芭芭拉"
+    ],
+    "last_modified_time": 1754884793952,
+    "authors": [
+      {
+        "name": "蜜柑魚",
+        "links": "https://github.com/this-Fish"
+      }
+    ],
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 4577.95,
+      "y": 4001.72,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 4508.12,
+      "y": 3942.41,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": 4503.61,
+      "y": 3877.52,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 4,
+      "x": 4466.65,
+      "y": 3856.94,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "芭芭拉 e",
+      "type": "path"
+    },
+    {
+      "id": 5,
+      "x": 4464.76,
+      "y": 3855.1,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 6,
+      "x": 4429.2646,
+      "y": 3814.4355,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 7,
+      "x": 4397.7383,
+      "y": 3823.1978,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "芭芭拉 charge(0.5)"
+    },
+    {
+      "id": 8,
+      "x": 4393.5059,
+      "y": 3824.5559,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 9,
+      "x": 4394.6211,
+      "y": 3794.9158,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 10,
+      "x": 4309.5615,
+      "y": 3746.6948,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 11,
+      "x": 4301.3857,
+      "y": 3746.2,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "芭芭拉 charge(0.5)"
+    },
+    {
+      "id": 12,
+      "x": 4297.5254,
+      "y": 3746.335,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 13,
+      "x": 4326.9473,
+      "y": 3712.8049,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "芭芭拉 e"
+    },
+    {
+      "id": 14,
+      "x": 4330.7949,
+      "y": 3708.3623,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 15,
+      "x": 4358.209,
+      "y": 3679.2725,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 16,
+      "x": 4357.2549,
+      "y": 3669.2842,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "芭芭拉 charge(0.5)"
+    },
+    {
+      "id": 17,
+      "x": 4356.3154,
+      "y": 3665.8867,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    }
+  ]
+}

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/06-海露花-枫丹-枫丹廷-左-3个.json

@@ -0,0 +1,114 @@
+{
+  "info": {
+    "name": "06-海露花-枫丹-枫丹廷-左-3个",
+    "type": "collect",
+    "version": "1.0",
+    "description": "",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [
+      "芭芭拉"
+    ],
+    "last_modified_time": 1754884048215,
+    "authors": [
+      {
+        "name": "蜜柑魚",
+        "links": "https://github.com/this-Fish"
+      }
+    ],
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 4824.0078,
+      "y": 3628.9966,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 4811.3369,
+      "y": 3601.0049,
+      "type": "path",
+      "move_mode": "fly",
+      "action": "stop_flying",
+      "action_params": ""
+    },
+    {
+      "id": 3,
+      "x": 4780.0098,
+      "y": 3538.6365,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 4,
+      "x": 4785.127,
+      "y": 3519.1313,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "target"
+    },
+    {
+      "id": 5,
+      "x": 4799.3379,
+      "y": 3492.8552,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "芭芭拉 e",
+      "type": "target"
+    },
+    {
+      "id": 6,
+      "x": 4800.4902,
+      "y": 3489.8821,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 7,
+      "x": 4815.8887,
+      "y": 3499.5408,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 8,
+      "x": 4819.6641,
+      "y": 3502.4675,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 9,
+      "x": 4819.459,
+      "y": 3504.4922,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 10,
+      "x": 4819.5371,
+      "y": 3507.2681,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(1)",
+      "type": "path"
+    }
+  ]
+}

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/07-海露花-枫丹-沫洁站-6个.json

@@ -1,107 +1,109 @@
 {
   "info": {
-    "name": "06-海露花-枫丹-沫洁站-6个",
+    "name": "07-海露花-枫丹-沫洁站-6个",
     "type": "collect",
     "version": "1.0",
-    "description": "芭芭拉效率专线",
+    "description": "",
     "map_name": "Teyvat",
     "bgi_version": "0.45.0",
     "tags": [
       "芭芭拉"
     ],
-    "last_modified_time": 1750490619726,
+    "last_modified_time": 1755063710547,
     "authors": [
       {
         "name": "寥寥轻舟"
       }
-    ]
+    ],
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
   },
   "positions": [
     {
       "id": 1,
       "x": 3773.99,
       "y": 3784.0,
-      "type": "teleport",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 3729.9,
       "y": 3729.06,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 3704.92,
       "y": 3653.46,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 3692.45,
       "y": 3652.56,
-      "type": "path",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "芭芭拉 charge(0.5)"
+      "move_mode": "walk",
+      "action_params": "芭芭拉 charge(0.5)",
+      "type": "path"
     },
     {
       "id": 5,
       "x": 3688.07,
       "y": 3652.04,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 6,
       "x": 3670.97,
       "y": 3651.14,
-      "type": "path",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "芭芭拉 charge(0.5)"
+      "move_mode": "walk",
+      "action_params": "芭芭拉 charge(0.5)",
+      "type": "path"
     },
     {
       "id": 7,
       "x": 3667.71,
       "y": 3651.1,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 8,
       "x": 3681.66,
       "y": 3663.35,
-      "type": "path",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "芭芭拉 e"
+      "move_mode": "walk",
+      "action_params": "wait(1);芭芭拉 e;",
+      "type": "path"
     },
     {
       "id": 9,
       "x": 3685.84,
       "y": 3667.39,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 10,
-      "x": 3686.94,
+      "x": 3688.0098,
-      "y": 3662.17,
+      "y": 3662.1084,
       "type": "path",
       "move_mode": "walk",
       "action": "",
@@ -111,10 +113,10 @@
       "id": 11,
       "x": 3690.98,
       "y": 3672.06,
-      "type": "path",
+      "action": "combat_script",
       "move_mode": "walk",
-      "action": "",
+      "action_params": "wait(0.4)",
-      "action_params": ""
+      "type": "path"
     }
   ]
 }

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/08-海露花-枫丹-实验室-2个.json

@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "07-海露花-枫丹-实验室-2个",
+    "name": "08-海露花-枫丹-实验室-2个",
     "type": "collect",
     "version": "1.0",
     "description": "芭芭拉效率专线",

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/09-海露花-枫丹-沫洁再站-6个.json

@@ -1,20 +1,22 @@
 {
   "info": {
-    "name": "08-海露花-枫丹-沫洁再站-6个",
+    "name": "09-海露花-枫丹-沫洁再站-6个",
     "type": "collect",
     "version": "1.0",
-    "description": "芭芭拉效率专线",
+    "description": "",
     "map_name": "Teyvat",
     "bgi_version": "0.45.0",
     "tags": [
       "芭芭拉"
     ],
-    "last_modified_time": 1750493845402,
+    "last_modified_time": 1755063939451,
     "authors": [
       {
         "name": "寥寥轻舟"
       }
-    ]
+    ],
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
   },
   "positions": [
     {
@@ -28,15 +30,35 @@
     },
     {
       "id": 2,
+      "x": 3635.47,
+      "y": 3801.45,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(1);芭芭拉 e;",
+      "type": "path"
+    },
+    {
+      "id": 3,
       "x": 3594.99,
       "y": 3813.02,
       "action": "stop_flying",
       "move_mode": "fly",
       "action_params": "",
-      "type": "path"
+      "type": "path",
+      "locked": false
     },
     {
-      "id": 3,
+      "id": 4,
+      "x": 3594.99,
+      "y": 3813.02,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(8);",
+      "type": "path",
+      "locked": false
+    },
+    {
+      "id": 5,
       "x": 3562.53,
       "y": 3805.34,
       "action": "",
@@ -45,7 +67,7 @@
       "type": "path"
     },
     {
-      "id": 4,
+      "id": 6,
       "x": 3553.19,
       "y": 3832.84,
       "action": "combat_script",
@@ -54,7 +76,7 @@
       "type": "path"
     },
     {
-      "id": 5,
+      "id": 7,
       "x": 3552.3,
       "y": 3835.89,
       "action": "",
@@ -63,7 +85,7 @@
       "type": "path"
     },
     {
-      "id": 6,
+      "id": 8,
       "x": 3569.82,
       "y": 3875.4,
       "action": "",
@@ -72,7 +94,7 @@
       "type": "path"
     },
     {
-      "id": 7,
+      "id": 9,
       "x": 3552.24,
       "y": 3925.47,
       "action": "combat_script",
@@ -81,7 +103,7 @@
       "type": "path"
     },
     {
-      "id": 8,
+      "id": 10,
       "x": 3551.28,
       "y": 3929.0,
       "action": "",
@@ -90,7 +112,7 @@
       "type": "path"
     },
     {
-      "id": 9,
+      "id": 11,
       "x": 3547.04,
       "y": 3938.77,
       "action": "",
@@ -99,7 +121,7 @@
       "type": "path"
     },
     {
-      "id": 10,
+      "id": 12,
       "x": 3532.31,
       "y": 3911.9,
       "action": "combat_script",
@@ -108,7 +130,7 @@
       "type": "path"
     },
     {
-      "id": 11,
+      "id": 13,
       "x": 3530.99,
       "y": 3908.78,
       "action": "",
@@ -117,7 +139,7 @@
       "type": "path"
     },
     {
-      "id": 12,
+      "id": 14,
       "x": 3530.5,
       "y": 3938.74,
       "action": "",
@@ -126,7 +148,7 @@
       "type": "path"
     },
     {
-      "id": 13,
+      "id": 15,
       "x": 3544.52,
       "y": 3965.54,
       "action": "",
@@ -135,7 +157,7 @@
       "type": "path"
     },
     {
-      "id": 14,
+      "id": 16,
       "x": 3521.43,
       "y": 4016.83,
       "action": "combat_script",
@@ -144,7 +166,7 @@
       "type": "path"
     },
     {
-      "id": 15,
+      "id": 17,
       "x": 3519.3,
       "y": 4020.19,
       "action": "",
@@ -153,7 +175,7 @@
       "type": "path"
     },
     {
-      "id": 16,
+      "id": 18,
       "x": 3482.67,
       "y": 4013.07,
       "action": "",
@@ -162,7 +184,7 @@
       "type": "path"
     },
     {
-      "id": 17,
+      "id": 19,
       "x": 3469.97,
       "y": 4017.76,
       "action": "combat_script",
@@ -171,7 +193,7 @@
       "type": "path"
     },
     {
-      "id": 18,
+      "id": 20,
       "x": 3467.47,
       "y": 4018.64,
       "action": "",

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/10-海露花-枫丹-幽灵-5个.json

@@ -1,147 +1,159 @@
 {
   "info": {
-    "name": "09-海露花-枫丹-幽灵-5个",
+    "name": "10-海露花-枫丹-幽灵-5个",
     "type": "collect",
     "version": "1.0",
-    "description": "芭芭拉效率专线",
+    "description": "",
     "map_name": "Teyvat",
     "bgi_version": "0.45.0",
     "tags": [
       "芭芭拉"
     ],
-    "last_modified_time": 1750491808549,
+    "last_modified_time": 1754886623941,
     "authors": [
       {
         "name": "寥寥轻舟"
       }
-    ]
+    ],
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
   },
   "positions": [
     {
       "id": 1,
       "x": 3367.16,
       "y": 3294.2,
-      "type": "teleport",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 3399.94,
       "y": 3301.64,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 3430.92,
       "y": 3281.93,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 3453.89,
       "y": 3274.04,
-      "type": "path",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "芭芭拉 e"
+      "move_mode": "walk",
+      "action_params": "芭芭拉 e",
+      "type": "path"
     },
     {
       "id": 5,
       "x": 3456.35,
       "y": 3273.63,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 6,
       "x": 3461.55,
       "y": 3250.34,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 7,
       "x": 3409.5,
       "y": 3184.01,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 8,
       "x": 3420.12,
       "y": 3174.03,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 9,
       "x": 3441.39,
       "y": 3150.76,
-      "type": "path",
-      "move_mode": "fly",
       "action": "stop_flying",
-      "action_params": ""
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path",
+      "locked": false
     },
     {
       "id": 10,
-      "x": 3455.97,
+      "x": 3441.39,
-      "y": 3146.93,
+      "y": 3150.76,
-      "type": "path",
+      "action": "combat_script",
-      "move_mode": "walk",
+      "move_mode": "fly",
-      "action": "",
+      "action_params": "wait(1);芭芭拉 charge(0.5);",
-      "action_params": ""
+      "type": "path"
     },
     {
       "id": 11,
-      "x": 3486.18,
+      "x": 3455.97,
-      "y": 3140.36,
+      "y": 3146.93,
-      "type": "path",
+      "action": "",
       "move_mode": "walk",
-      "action": "combat_script",
+      "action_params": "",
-      "action_params": "芭芭拉 e"
+      "type": "path"
     },
     {
       "id": 12,
-      "x": 3488.66,
+      "x": 3486.18,
-      "y": 3142.1,
+      "y": 3140.36,
-      "type": "path",
+      "action": "combat_script",
       "move_mode": "walk",
-      "action": "",
+      "action_params": "芭芭拉 e",
-      "action_params": ""
+      "type": "path"
     },
     {
       "id": 13,
-      "x": 3487.48,
+      "x": 3488.66,
-      "y": 3148.07,
+      "y": 3142.1,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 14,
+      "x": 3487.48,
+      "y": 3148.07,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 15,
       "x": 3501.68,
       "y": 3151.56,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     }
   ]
 }

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/11-海露花-枫丹-幽灵右-10个.json

@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "10-海露花-枫丹-幽灵右-10个",
+    "name": "11-海露花-枫丹-幽灵右-10个",
     "type": "collect",
     "version": "1.0",
     "description": "芭芭拉效率专线",

repo/pathing/地方特产/枫丹/海露花/海露花@寥寥轻舟/README.md

@@ -0,0 +1,3 @@
+# 注意事项
+## 隊伍中必需帶有**芭芭拉**
+## **生存位技能不能设置芭芭拉**

repo/pathing/地方特产/枫丹/海露花/芭芭拉效率路线@寥寥轻舟/05-海露花-枫丹-枫丹廷-4个.json

@@ -1,138 +0,0 @@
-{
-  "info": {
-    "name": "05-海露花-枫丹-枫丹廷-4个",
-    "type": "collect",
-    "version": "1.0",
-    "description": "芭芭拉效率专线",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
-    "tags": [
-      "芭芭拉"
-    ],
-    "last_modified_time": 1750493402601,
-    "authors": [
-      {
-        "name": "寥寥轻舟"
-      }
-    ]
-  },
-  "positions": [
-    {
-      "id": 1,
-      "x": 4577.95,
-      "y": 4001.72,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "teleport"
-    },
-    {
-      "id": 2,
-      "x": 4508.12,
-      "y": 3942.41,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 3,
-      "x": 4503.61,
-      "y": 3877.52,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 4,
-      "x": 4466.65,
-      "y": 3856.94,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "芭芭拉 e",
-      "type": "path"
-    },
-    {
-      "id": 5,
-      "x": 4464.76,
-      "y": 3855.1,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 6,
-      "x": 4428.2,
-      "y": 3812.3,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 7,
-      "x": 4321.34,
-      "y": 3747.62,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 8,
-      "x": 4303.58,
-      "y": 3745.82,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "芭芭拉 charge(0.5)",
-      "type": "path"
-    },
-    {
-      "id": 9,
-      "x": 4254.53,
-      "y": 3775.78,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 10,
-      "x": 4325.74,
-      "y": 3713.17,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "芭芭拉 charge(0.5)",
-      "type": "path"
-    },
-    {
-      "id": 11,
-      "x": 4332.56,
-      "y": 3707.39,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 12,
-      "x": 4355.31,
-      "y": 3667.71,
-      "action": "combat_script",
-      "move_mode": "run",
-      "action_params": "芭芭拉 charge(0.5)",
-      "type": "path"
-    },
-    {
-      "id": 13,
-      "x": 4357.45,
-      "y": 3664.3,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    }
-  ]
-}

repo/pathing/地方特产/须弥/帕蒂沙兰/01-须弥-帕蒂沙兰-须弥城-3个.json

@@ -1,16 +1,22 @@
 {
   "info": {
-    "name": "01-帕蒂沙兰-须弥城-3个",
+    "name": "01-须弥-帕蒂沙兰-须弥城-3个",
     "type": "collect",
+    "author": "jbcaaa",
     "version": "1.0",
     "description": "",
-    "bgi_version": "0.42.0",
+    "bgi_version": "0.45.0",
     "authors": [
       {
         "name": "jbcaaa",
         "links": "https://github.com/jbcaaa"
       }
-    ]
+    ],
+    "map_name": "Teyvat",
+    "tags": [],
+    "last_modified_time": 1755077127188,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
   },
   "positions": [
     {
@@ -27,10 +33,20 @@
       "y": -409.25,
       "action": "stop_flying",
       "move_mode": "fly",
-      "type": "target"
+      "type": "target",
+      "locked": false
     },
     {
       "id": 3,
+      "x": 2711.64,
+      "y": -409.25,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(0.4)",
+      "type": "path"
+    },
+    {
+      "id": 4,
       "x": 2724.9,
       "y": -411.28,
       "action": "",
@@ -38,7 +54,7 @@
       "type": "target"
     },
     {
-      "id": 4,
+      "id": 5,
       "x": 2743.21,
       "y": -429.44,
       "action": "",
@@ -46,7 +62,7 @@
       "type": "target"
     },
     {
-      "id": 5,
+      "id": 6,
       "x": 2751.72,
       "y": -431.19,
       "action": "",
@@ -54,11 +70,12 @@
       "type": "target"
     },
     {
-      "id": 6,
+      "id": 7,
       "x": 2753.54,
       "y": -428.45,
-      "action": "",
+      "action": "combat_script",
       "move_mode": "walk",
+      "action_params": "wait(0.4)",
       "type": "target"
     }
   ]

repo/pathing/地方特产/须弥/帕蒂沙兰/02-帕蒂沙兰-须弥城右下-5个.json

@@ -1,73 +0,0 @@
-{
-  "info": {
-    "name": "02-帕蒂沙兰-须弥城右下-5个",
-    "type": "collect",
-    "version": "1.0",
-    "description": "",
-    "bgi_version": "0.42.0",
-    "authors": [
-      {
-        "name": "jbcaaa",
-        "links": "https://github.com/jbcaaa"
-      }
-    ]
-  },
-  "positions": [
-    {
-      "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
-      "x": 2651.43,
-      "y": -564.41
-    },
-    {
-      "id": 2,
-      "x": 2653.37,
-      "y": -530.61,
-      "type": "target",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 3,
-      "x": 2662.25,
-      "y": -518.0,
-      "type": "path",
-      "move_mode": "climb",
-      "action": ""
-    },
-    {
-      "id": 4,
-      "x": 2698.04,
-      "y": -518.73,
-      "type": "path",
-      "move_mode": "run",
-      "action": ""
-    },
-    {
-      "id": 5,
-      "x": 2708.54,
-      "y": -522.23,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 6,
-      "x": 2717.32,
-      "y": -523.21,
-      "type": "target",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 7,
-      "x": 2787.25,
-      "y": -525.4,
-      "type": "target",
-      "move_mode": "fly",
-      "action": "stop_flying"
-    }
-  ]
-}

repo/pathing/地方特产/须弥/帕蒂沙兰/02-须弥-帕蒂沙兰-须弥城右下-5个.json

@@ -0,0 +1,100 @@
+{
+  "info": {
+    "name": "02-须弥-帕蒂沙兰-须弥城右下-5个",
+    "type": "collect",
+    "author": "jbcaaa",
+    "version": "1.0",
+    "description": "",
+    "bgi_version": "0.45.0",
+    "authors": [
+      {
+        "name": "jbcaaa",
+        "links": "https://github.com/jbcaaa"
+      }
+    ],
+    "map_name": "Teyvat",
+    "tags": [],
+    "last_modified_time": 1755077421667,
+    "enable_monster_loot_split": false,
+    "map_match_method": ""
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 2651.43,
+      "y": -564.41,
+      "action": "",
+      "move_mode": "walk",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 2653.37,
+      "y": -530.61,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(0.4)",
+      "type": "target"
+    },
+    {
+      "id": 3,
+      "x": 2662.25,
+      "y": -518.0,
+      "action": "",
+      "move_mode": "jump",
+      "type": "path"
+    },
+    {
+      "id": 4,
+      "x": 2698.04,
+      "y": -518.73,
+      "action": "",
+      "move_mode": "run",
+      "type": "path"
+    },
+    {
+      "id": 5,
+      "x": 2708.54,
+      "y": -522.23,
+      "action": "",
+      "move_mode": "walk",
+      "type": "path"
+    },
+    {
+      "id": 6,
+      "x": 2717.32,
+      "y": -523.21,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(0.4)",
+      "type": "target"
+    },
+    {
+      "id": 7,
+      "x": 2727.0,
+      "y": -523.75,
+      "action": "",
+      "move_mode": "walk",
+      "type": "target"
+    },
+    {
+      "id": 8,
+      "x": 2787.25,
+      "y": -525.4,
+      "action": "stop_flying",
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 9,
+      "x": 2787.25,
+      "y": -525.4,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(0.4)",
+      "type": "path"
+    }
+  ]
+}