diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/01-日落果-清泉镇-奔狼领-21个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/01-日落果-清泉镇-奔狼领-21个.json
deleted file mode 100644
index ef3e9c8c3..000000000
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/01-日落果-清泉镇-奔狼领-21个.json
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-  "info": {
-    "name": "01-日落果-清泉镇-奔狼领-21个",
-    "type": "collect",
-    "version": "1.0",
-    "description": "",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
-    "authors": [
-      {
-        "name": "白白喵"
-      }
-    ]
-  },
-  "positions": [
-    {
-      "id": 1,
-      "x": -386.2617,
-      "y": 2297.5959,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "teleport"
-    },
-    {
-      "id": 2,
-      "x": -366.9386,
-      "y": 2289.8752,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
-    },
-    {
-      "id": 3,
-      "x": -364.6884,
-      "y": 2288.3126,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 4,
-      "x": -521.5146,
-      "y": 2181.2642,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "teleport"
-    },
-    {
-      "id": 5,
-      "x": -515.2576,
-      "y": 2165.75,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 6,
-      "x": -539.494,
-      "y": 2139.0,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 7,
-      "x": -532.2523,
-      "y": 2120.25,
-      "action": "",
-      "move_mode": "run",
-      "type": "path"
-    },
-    {
-      "id": 8,
-      "x": -532.3662,
-      "y": 2108.1965,
-      "action": "",
-      "move_mode": "climb",
-      "action_params": "",
-      "type": "target"
-    },
-    {
-      "id": 9,
-      "x": -522.0618,
-      "y": 2102.25,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 10,
-      "x": -519.4424,
-      "y": 2098.0491,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(1.5)",
-      "type": "target"
-    },
-    {
-      "id": 11,
-      "x": -867.5264,
-      "y": 1992.2036,
-      "action": "",
-      "move_mode": "fly",
-      "action_params": "",
-      "type": "teleport"
-    },
-    {
-      "id": 12,
-      "x": -851.3115,
-      "y": 2023.9004,
-      "action": "combat_script",
-      "move_mode": "dash",
-      "action_params": "万叶 e(hold),attack,wait(1.0)",
-      "type": "target"
-    },
-    {
-      "id": 13,
-      "x": -853.251,
-      "y": 2026.7759,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 14,
-      "x": -835.4326,
-      "y": 2031.0371,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 15,
-      "x": -830.1943,
-      "y": 2030.4873,
-      "action": "",
-      "move_mode": "jump",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 16,
-      "x": -794.5879,
-      "y": 2026.2471,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 17,
-      "x": -777.0488,
-      "y": 2016.7295,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 18,
-      "x": -766.2988,
-      "y": 2021.688,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(1.5)",
-      "type": "target"
-    },
-    {
-      "id": 19,
-      "x": -732.0771,
-      "y": 2021.2529,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 20,
-      "x": -701.9199,
-      "y": 2023.1006,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 21,
-      "x": -654.8604,
-      "y": 2030.4082,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 22,
-      "x": -647.6875,
-      "y": 2046.9687,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 23,
-      "x": -628.562,
-      "y": 2078.4358,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 24,
-      "x": -631.6211,
-      "y": 2086.4231,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(1.5)",
-      "type": "target"
-    },
-    {
-      "id": 25,
-      "x": -613.0713,
-      "y": 2128.9778,
-      "action": "combat_script",
-      "move_mode": "run",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/01-日落果-清泉镇-奔狼领-44个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/01-日落果-清泉镇-奔狼领-44个.json
new file mode 100644
index 000000000..321a61480
--- /dev/null
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/01-日落果-清泉镇-奔狼领-44个.json
@@ -0,0 +1,569 @@
+{
+  "info": {
+    "authors": [
+      {
+        "name": "白白喵"
+      }
+    ],
+    "bgi_version": "0.45.0",
+    "description": "",
+    "enable_monster_loot_split": false,
+    "last_modified_time": 1758023724754,
+    "map_match_method": "",
+    "map_name": "Teyvat",
+    "name": "01-日落果-清泉镇-奔狼领-44个",
+    "tags": [],
+    "type": "collect",
+    "version": "4.0"
+  },
+  "positions": [
+    {
+      "action": "",
+      "action_params": "",
+      "id": 1,
+      "move_mode": "walk",
+      "type": "teleport",
+      "x": -386.2617,
+      "y": 2297.5959
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 2,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -367.6246,
+      "y": 2287.5
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 3,
+      "move_mode": "walk",
+      "type": "teleport",
+      "x": -385.9316,
+      "y": 2297.9062
+    },
+    {
+      "action": "combat_script",
+      "action_params": "wait(0.4)",
+      "id": 4,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -386.5059,
+      "y": 2301.9102
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 5,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -387.8682,
+      "y": 2310.3784
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 6,
+      "move_mode": "jump",
+      "type": "path",
+      "x": -390.9668,
+      "y": 2319.71
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 7,
+      "move_mode": "run",
+      "type": "path",
+      "x": -411.417,
+      "y": 2336.5835
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 8,
+      "move_mode": "run",
+      "type": "path",
+      "x": -441.2607,
+      "y": 2320.1289
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 9,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -446.9082,
+      "y": 2317.4187
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 10,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -443.2061,
+      "y": 2306.2661
+    },
+    {
+      "action": "stop_flying",
+      "action_params": "",
+      "id": 11,
+      "move_mode": "fly",
+      "type": "path",
+      "x": -450.333,
+      "y": 2268.8135
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 12,
+      "move_mode": "run",
+      "type": "path",
+      "x": -459.1387,
+      "y": 2232.1401
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 13,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -438.8848,
+      "y": 2218.6685
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 14,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -432.2842,
+      "y": 2213.6736
+    },
+    {
+      "action": "combat_script",
+      "action_params": "wait(0.2)",
+      "id": 15,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -432.6875,
+      "y": 2209.793
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 16,
+      "move_mode": "run",
+      "type": "teleport",
+      "x": -521.5146,
+      "y": 2181.2642
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 17,
+      "move_mode": "run",
+      "type": "path",
+      "x": -515.2576,
+      "y": 2165.75
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 18,
+      "move_mode": "run",
+      "type": "path",
+      "x": -539.494,
+      "y": 2139.0
+    },
+    {
+      "action": "",
+      "id": 19,
+      "move_mode": "run",
+      "type": "path",
+      "x": -532.2523,
+      "y": 2120.25
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 20,
+      "move_mode": "jump",
+      "type": "path",
+      "x": -532.3662,
+      "y": 2108.1965
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 21,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -522.0618,
+      "y": 2102.25
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 22,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -520.2182,
+      "y": 2099.2188
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 23,
+      "move_mode": "walk",
+      "type": "teleport",
+      "x": -521.332,
+      "y": 2181.6426
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 24,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -536.3867,
+      "y": 2178.2651
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 25,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -546.7256,
+      "y": 2164.5049
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 26,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -548.4141,
+      "y": 2167.866
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 27,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -556.0195,
+      "y": 2164.0024
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 28,
+      "move_mode": "run",
+      "type": "path",
+      "x": -587.4082,
+      "y": 2163.2163
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 29,
+      "move_mode": "run",
+      "type": "path",
+      "x": -603.4258,
+      "y": 2149.3779
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 30,
+      "move_mode": "jump",
+      "type": "path",
+      "x": -611.7158,
+      "y": 2147.6543
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(3)",
+      "id": 31,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -612.334,
+      "y": 2129.7961
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 32,
+      "move_mode": "run",
+      "type": "path",
+      "x": -625.79,
+      "y": 2102.3462
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 33,
+      "move_mode": "jump",
+      "type": "path",
+      "x": -629.0547,
+      "y": 2094.2441
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 34,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -631.7344,
+      "y": 2087.5371
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 35,
+      "move_mode": "walk",
+      "type": "teleport",
+      "x": -867.5264,
+      "y": 1992.2036
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 36,
+      "move_mode": "dash",
+      "type": "path",
+      "x": -849.8759,
+      "y": 2023.0625
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 37,
+      "move_mode": "run",
+      "type": "path",
+      "x": -835.4326,
+      "y": 2031.0371
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 38,
+      "move_mode": "jump",
+      "type": "path",
+      "x": -830.1943,
+      "y": 2030.4873
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 39,
+      "move_mode": "run",
+      "type": "path",
+      "x": -794.5879,
+      "y": 2026.2471
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 40,
+      "move_mode": "run",
+      "type": "path",
+      "x": -777.0488,
+      "y": 2016.7295
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 41,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -766.2988,
+      "y": 2021.688
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 42,
+      "move_mode": "walk",
+      "type": "teleport",
+      "x": -914.6016,
+      "y": 1795.7822
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 43,
+      "move_mode": "run",
+      "type": "path",
+      "x": -902.7773,
+      "y": 1801.5762
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 44,
+      "move_mode": "run",
+      "type": "path",
+      "x": -886.208,
+      "y": 1804.5444
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 45,
+      "move_mode": "run",
+      "type": "path",
+      "x": -847.3838,
+      "y": 1805.1206
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 46,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -844.3477,
+      "y": 1809.3271
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 47,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -837.5977,
+      "y": 1803.3486
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 48,
+      "move_mode": "run",
+      "type": "path",
+      "x": -761.2832,
+      "y": 1809.8398
+    },
+    {
+      "action": "combat_script",
+      "action_params": "wait(0.4)",
+      "id": 49,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -757.6045,
+      "y": 1812.1802
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 50,
+      "move_mode": "run",
+      "type": "path",
+      "x": -736.4111,
+      "y": 1815.7168
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 51,
+      "move_mode": "dash",
+      "type": "path",
+      "x": -729.2861,
+      "y": 1828.3628
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "id": 52,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -731.3442,
+      "y": 1836.7812
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 53,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -724.6777,
+      "y": 1843.208
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 54,
+      "move_mode": "fly",
+      "type": "path",
+      "x": -746.1172,
+      "y": 1885.042
+    },
+    {
+      "action": "stop_flying",
+      "action_params": "",
+      "id": 55,
+      "move_mode": "fly",
+      "type": "path",
+      "x": -768.2402,
+      "y": 1922.2578
+    },
+    {
+      "action": "combat_script",
+      "action_params": "j,wait(0.5),j,wait(0.5)",
+      "id": 56,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -768.2402,
+      "y": 1922.2578
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 57,
+      "move_mode": "walk",
+      "type": "teleport",
+      "x": -887.1777,
+      "y": 1679.458
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 58,
+      "move_mode": "run",
+      "type": "path",
+      "x": -879.0,
+      "y": 1684.7186
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 59,
+      "move_mode": "run",
+      "type": "path",
+      "x": -853.5918,
+      "y": 1674.4829
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 60,
+      "move_mode": "run",
+      "type": "path",
+      "x": -844.7617,
+      "y": 1655.248
+    },
+    {
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(3)",
+      "id": 61,
+      "move_mode": "walk",
+      "type": "path",
+      "x": -840.4951,
+      "y": 1652.124
+    }
+  ]
+}
\ No newline at end of file
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/02-日落果-晨曦酒庄-19个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/02-日落果-晨曦酒庄-19个.json
new file mode 100644
index 000000000..14adf7a24
--- /dev/null
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/02-日落果-晨曦酒庄-19个.json
@@ -0,0 +1,335 @@
+{
+  "info": {
+    "name": "02-日落果-晨曦酒庄-19个",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "白白喵"
+      }
+    ],
+    "version": "1.0",
+    "description": "带万叶采集",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754747838049,
+    "enable_monster_loot_split": false
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -578.5117,
+      "y": 1853.7065,
+      "type": "teleport",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 2,
+      "x": -565.0254,
+      "y": 1812.0586,
+      "type": "path",
+      "move_mode": "fly",
+      "action": "stop_flying",
+      "action_params": ""
+    },
+    {
+      "id": 3,
+      "x": -550.4102,
+      "y": 1804.4561,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 4,
+      "x": -548.4736,
+      "y": 1808.1719,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 5,
+      "x": -545.4379,
+      "y": 1809.1875,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 6,
+      "x": -542.54,
+      "y": 1815.4229,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 7,
+      "x": -443.9795,
+      "y": 1870.1929,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 8,
+      "x": -429.1396,
+      "y": 1897.9956,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 9,
+      "x": -408.8887,
+      "y": 1902.5771,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 10,
+      "x": -382.9385,
+      "y": 1912.9604,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 11,
+      "x": -377.8086,
+      "y": 1906.1167,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 12,
+      "x": -378.2949,
+      "y": 1908.0518,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 13,
+      "x": -412.1016,
+      "y": 1942.1177,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 14,
+      "x": -425.0742,
+      "y": 1957.0215,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 15,
+      "x": -416.6641,
+      "y": 1981.9326,
+      "type": "path",
+      "move_mode": "fly",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 16,
+      "x": -381.3936,
+      "y": 1997.1143,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 17,
+      "x": -371.9531,
+      "y": 2009.3096,
+      "type": "path",
+      "move_mode": "jump",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 18,
+      "x": -361.7441,
+      "y": 2004.7891,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 19,
+      "x": -354.3555,
+      "y": 2001.5947,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 20,
+      "x": -345.5332,
+      "y": 1959.0361,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 21,
+      "x": -321.8037,
+      "y": 1906.5479,
+      "type": "path",
+      "move_mode": "fly",
+      "action": "stop_flying",
+      "action_params": ""
+    },
+    {
+      "id": 22,
+      "x": -315.1514,
+      "y": 1899.6396,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 23,
+      "x": -306.5107,
+      "y": 1897.209,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 24,
+      "x": -302.0186,
+      "y": 1866.2681,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 25,
+      "x": -295.2021,
+      "y": 1792.6797,
+      "type": "path",
+      "move_mode": "fly",
+      "action": "stop_flying",
+      "action_params": ""
+    },
+    {
+      "id": 26,
+      "x": -296.1621,
+      "y": 1783.9336,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 27,
+      "x": -299.374,
+      "y": 1777.4551,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 28,
+      "x": -302.4629,
+      "y": 1780.1201,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 29,
+      "x": -326.2793,
+      "y": 1773.0986,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 30,
+      "x": -343.4258,
+      "y": 1774.624,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 31,
+      "x": -353.3301,
+      "y": 1779.0635,
+      "type": "path",
+      "move_mode": "jump",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 32,
+      "x": -387.291,
+      "y": 1785.2583,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 33,
+      "x": -392.5002,
+      "y": 1783.0625,
+      "type": "path",
+      "move_mode": "jump",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 34,
+      "x": -406.876,
+      "y": 1795.9688,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 35,
+      "x": -410.3408,
+      "y": 1796.8853,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "wait(0.8)"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/03-日落果-蒙德城前-13个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/03-日落果-蒙德城前-13个.json
deleted file mode 100644
index 64e007462..000000000
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/03-日落果-蒙德城前-13个.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-  "info": {
-    "name": "03-日落果-蒙德城前-13个",
-    "type": "collect",
-    "version": "1.0",
-    "description": "",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
-    "authors": [
-      {
-        "name": "白白喵"
-      }
-    ]
-  },
-  "positions": [
-    {
-      "id": 1,
-      "x": -1120.8936,
-      "y": 2190.563,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "teleport"
-    },
-    {
-      "id": 2,
-      "x": -1149.3506,
-      "y": 2174.0354,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 3,
-      "x": -1150.6357,
-      "y": 2176.0554,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 4,
-      "x": -1154.6523,
-      "y": 2172.6384,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(2.0)",
-      "type": "target"
-    },
-    {
-      "id": 5,
-      "x": -1120.9131,
-      "y": 2190.5442,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "teleport"
-    },
-    {
-      "id": 6,
-      "x": -1047.8506,
-      "y": 2201.5632,
-      "action": "combat_script",
-      "move_mode": "run",
-      "action_params": "万叶 e(hold),attack,wait(2.0)",
-      "type": "target"
-    },
-    {
-      "id": 7,
-      "x": -1041.8867,
-      "y": 2170.5564,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 8,
-      "x": -1049.3828,
-      "y": 2157.1179,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 9,
-      "x": -1045.1064,
-      "y": 2137.6069,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 10,
-      "x": -1040.3751,
-      "y": 2133.1246,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/02-日落果-风啸山坡-21个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/03-日落果-风啸山坡-21个.json
similarity index 94%
rename from repo/pathing/食材与炼金/日落果/万叶@白白喵/02-日落果-风啸山坡-21个.json
rename to repo/pathing/食材与炼金/日落果/万叶@白白喵/03-日落果-风啸山坡-21个.json
index 326a9e69c..a7001b571 100644
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/02-日落果-风啸山坡-21个.json
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/03-日落果-风啸山坡-21个.json
@@ -1,16 +1,19 @@
 {
   "info": {
-    "name": "02-日落果-风啸山坡-21个",
+    "name": "03-日落果-风啸山坡-21个",
     "type": "collect",
-    "version": "1.0",
-    "description": "",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
     "authors": [
       {
         "name": "白白喵"
       }
-    ]
+    ],
+    "version": "3.0",
+    "description": "带万叶采集日落果",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1755218034506,
+    "enable_monster_loot_split": false
   },
   "positions": [
     {
@@ -44,10 +47,10 @@
       "id": 4,
       "x": -1352.2552,
       "y": 1645.3772,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 5,
@@ -222,11 +225,11 @@
     },
     {
       "id": 24,
-      "x": -1119.1562,
-      "y": 1779.9686,
+      "x": -1121.375,
+      "y": 1780.8755,
       "action": "combat_script",
       "move_mode": "run",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(3.0)",
       "type": "target"
     },
     {
@@ -348,8 +351,8 @@
     },
     {
       "id": 38,
-      "x": -1287.8748,
-      "y": 1756.0614,
+      "x": -1287.0318,
+      "y": 1757.4993,
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "万叶 e(hold),attack,wait(3.0)",
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/04-日落果-蒙德城前-21个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/04-日落果-蒙德城前-21个.json
new file mode 100644
index 000000000..18ff4e882
--- /dev/null
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/04-日落果-蒙德城前-21个.json
@@ -0,0 +1,245 @@
+{
+  "info": {
+    "name": "04-日落果-蒙德城前-21个",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "白白喵"
+      }
+    ],
+    "version": "2.0",
+    "description": "带万叶采集",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754740776572,
+    "enable_monster_loot_split": false
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -1120.6543,
+      "y": 2190.8289,
+      "type": "teleport",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 2,
+      "x": -1147.6738,
+      "y": 2172.5369,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 3,
+      "x": -1150.5996,
+      "y": 2177.6594,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 4,
+      "x": -1158.8027,
+      "y": 2171.9709,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(3.5),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 5,
+      "x": -1168.3535,
+      "y": 2171.1875,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 6,
+      "x": -1176.4785,
+      "y": 2170.812,
+      "type": "path",
+      "move_mode": "jump",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 7,
+      "x": -1196.6426,
+      "y": 2206.3647,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 8,
+      "x": -1203.3223,
+      "y": 2216.5071,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 9,
+      "x": -1202.707,
+      "y": 2221.7012,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "wait(0.2)"
+    },
+    {
+      "id": 10,
+      "x": -1121.6768,
+      "y": 2190.8887,
+      "type": "teleport",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 11,
+      "x": -1096.0176,
+      "y": 2165.0076,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 12,
+      "x": -1042.8047,
+      "y": 2135.8018,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 13,
+      "x": -1039.0889,
+      "y": 2134.7236,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 14,
+      "x": -1032.918,
+      "y": 2143.9634,
+      "type": "path",
+      "move_mode": "jump",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 15,
+      "x": -1029.1504,
+      "y": 2161.772,
+      "type": "path",
+      "move_mode": "dash",
+      "action": "combat_script",
+      "action_params": "wait(0.2)"
+    },
+    {
+      "id": 16,
+      "x": -1052.7188,
+      "y": 2186.7158,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 17,
+      "x": -1044.8525,
+      "y": 2193.334,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 18,
+      "x": -1047.9873,
+      "y": 2202.1211,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 19,
+      "x": -1072.0264,
+      "y": 2201.0571,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 20,
+      "x": -1085.5381,
+      "y": 2222.4739,
+      "type": "path",
+      "move_mode": "run",
+      "action": "combat_script",
+      "action_params": "wait(0.4)"
+    },
+    {
+      "id": 21,
+      "x": -1087.7666,
+      "y": 2234.9614,
+      "type": "path",
+      "move_mode": "run",
+      "action": "combat_script",
+      "action_params": "wait(0.1)"
+    },
+    {
+      "id": 22,
+      "x": -1087.6621,
+      "y": 2261.271,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 23,
+      "x": -1088.4102,
+      "y": 2276.5627,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 24,
+      "x": -1094.1504,
+      "y": 2286.0596,
+      "type": "path",
+      "move_mode": "jump",
+      "action": "combat_script",
+      "action_params": "wait(0.3)"
+    },
+    {
+      "id": 25,
+      "x": -1085.1611,
+      "y": 2293.6934,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/04-日落果-星落湖-37个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/05-日落果-星落湖-37个.json
similarity index 83%
rename from repo/pathing/食材与炼金/日落果/万叶@白白喵/04-日落果-星落湖-37个.json
rename to repo/pathing/食材与炼金/日落果/万叶@白白喵/05-日落果-星落湖-37个.json
index b4208ac19..3b549175e 100644
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/04-日落果-星落湖-37个.json
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/05-日落果-星落湖-37个.json
@@ -1,16 +1,19 @@
 {
   "info": {
-    "name": "04-日落果-星落湖-37个",
+    "name": "05-日落果-星落湖-37个",
     "type": "collect",
-    "version": "1.0",
-    "description": "",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
     "authors": [
       {
         "name": "白白喵"
       }
-    ]
+    ],
+    "version": "2.0",
+    "description": "带万叶采集",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754753751952,
+    "enable_monster_loot_split": false
   },
   "positions": [
     {
@@ -82,11 +85,18 @@
       "y": 2581.5625,
       "action": "combat_script",
       "move_mode": "run",
-      "action_params": "万叶 e(hold),attack,wait(2.0)",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(2.0)",
       "type": "target"
     },
     {
       "id": 9,
+      "x": -1232.2506,
+      "y": 2578.1252,
+      "type": "path",
+      "move_mode": "walk"
+    },
+    {
+      "id": 10,
       "x": -1213.2524,
       "y": 2567.5265,
       "action": "",
@@ -95,34 +105,34 @@
       "type": "path"
     },
     {
-      "id": 10,
+      "id": 11,
       "x": -1207.9951,
       "y": 2561.739,
       "action": "",
-      "move_mode": "fly",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 11,
-      "x": -1188.667,
-      "y": 2558.9878,
-      "action": "",
-      "move_mode": "fly",
+      "move_mode": "dash",
       "action_params": "",
       "type": "path"
     },
     {
       "id": 12,
+      "x": -1188.667,
+      "y": 2558.9878,
+      "action": "stop_flying",
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 13,
       "x": -1159.6299,
       "y": 2521.7983,
       "action": "combat_script",
       "move_mode": "run",
-      "action_params": "万叶 e(hold),attack,wait(2.0)",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(2.0)",
       "type": "target"
     },
     {
-      "id": 13,
+      "id": 14,
       "x": -1159.6016,
       "y": 2512.6711,
       "action": "",
@@ -131,25 +141,62 @@
       "type": "target"
     },
     {
-      "id": 14,
-      "x": -1181.0303,
-      "y": 2483.6792,
+      "id": 15,
+      "x": -1153.511,
+      "y": 2495.6261,
+      "type": "path",
+      "move_mode": "run"
+    },
+    {
+      "id": 16,
+      "x": -1129.6495,
+      "y": 2480.754,
+      "type": "path",
+      "move_mode": "run"
+    },
+    {
+      "id": 17,
+      "x": -1123.021,
+      "y": 2460.0101,
+      "type": "path",
+      "move_mode": "run"
+    },
+    {
+      "id": 18,
+      "x": -1119.5047,
+      "y": 2447.8741,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 19,
+      "x": -1143.4997,
+      "y": 2452.4999,
+      "move_mode": "run",
+      "type": "path"
+    },
+    {
+      "id": 20,
+      "x": -1172.5244,
+      "y": 2464.0635,
       "action": "",
       "move_mode": "run",
       "action_params": "",
       "type": "path"
     },
     {
-      "id": 15,
-      "x": -1181.9111,
-      "y": 2473.9614,
+      "id": 21,
+      "x": -1180.2511,
+      "y": 2474.1249,
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "万叶 e(hold),attack,wait(2.0)",
       "type": "target"
     },
     {
-      "id": 16,
+      "id": 22,
       "x": -1213.2441,
       "y": 2469.4756,
       "action": "",
@@ -158,7 +205,7 @@
       "type": "path"
     },
     {
-      "id": 17,
+      "id": 23,
       "x": -1213.2158,
       "y": 2469.5034,
       "action": "",
@@ -167,7 +214,7 @@
       "type": "path"
     },
     {
-      "id": 18,
+      "id": 24,
       "x": -1226.1025,
       "y": 2446.6665,
       "action": "",
@@ -176,7 +223,7 @@
       "type": "path"
     },
     {
-      "id": 19,
+      "id": 25,
       "x": -1220.0225,
       "y": 2422.2786,
       "action": "",
@@ -185,7 +232,7 @@
       "type": "path"
     },
     {
-      "id": 20,
+      "id": 26,
       "x": -1236.834,
       "y": 2414.7029,
       "action": "combat_script",
@@ -194,7 +241,7 @@
       "type": "target"
     },
     {
-      "id": 21,
+      "id": 27,
       "x": -1251.499,
       "y": 2420.1975,
       "action": "combat_script",
@@ -203,7 +250,7 @@
       "type": "target"
     },
     {
-      "id": 22,
+      "id": 28,
       "x": -1252.2194,
       "y": 2426.9058,
       "action": "",
@@ -212,7 +259,7 @@
       "type": "path"
     },
     {
-      "id": 23,
+      "id": 29,
       "x": -1282.7513,
       "y": 2429.5071,
       "action": "",
@@ -221,7 +268,7 @@
       "type": "path"
     },
     {
-      "id": 24,
+      "id": 30,
       "x": -1299.9893,
       "y": 2419.9841,
       "action": "",
@@ -230,7 +277,7 @@
       "type": "path"
     },
     {
-      "id": 25,
+      "id": 31,
       "x": -1291.6592,
       "y": 2397.5686,
       "action": "",
@@ -239,7 +286,7 @@
       "type": "path"
     },
     {
-      "id": 26,
+      "id": 32,
       "x": -1303.3232,
       "y": 2392.072,
       "action": "",
@@ -248,7 +295,7 @@
       "type": "path"
     },
     {
-      "id": 27,
+      "id": 33,
       "x": -1315.0264,
       "y": 2394.5203,
       "action": "",
@@ -257,7 +304,7 @@
       "type": "path"
     },
     {
-      "id": 28,
+      "id": 34,
       "x": -1322.2492,
       "y": 2401.9061,
       "action": "combat_script",
@@ -266,7 +313,7 @@
       "type": "target"
     },
     {
-      "id": 29,
+      "id": 35,
       "x": -1320.374,
       "y": 2415.364,
       "action": "",
@@ -275,7 +322,7 @@
       "type": "path"
     },
     {
-      "id": 30,
+      "id": 36,
       "x": -1321.8105,
       "y": 2432.4907,
       "action": "",
@@ -284,7 +331,7 @@
       "type": "path"
     },
     {
-      "id": 31,
+      "id": 37,
       "x": -1345.5244,
       "y": 2446.187,
       "action": "",
@@ -293,7 +340,7 @@
       "type": "path"
     },
     {
-      "id": 32,
+      "id": 38,
       "x": -1351.0137,
       "y": 2456.3433,
       "action": "",
@@ -302,7 +349,7 @@
       "type": "path"
     },
     {
-      "id": 33,
+      "id": 39,
       "x": -1368.8164,
       "y": 2458.6279,
       "action": "combat_script",
@@ -311,7 +358,7 @@
       "type": "target"
     },
     {
-      "id": 34,
+      "id": 40,
       "x": -1388.6924,
       "y": 2504.8672,
       "action": "",
@@ -320,7 +367,7 @@
       "type": "path"
     },
     {
-      "id": 35,
+      "id": 41,
       "x": -1394.7842,
       "y": 2520.948,
       "action": "",
@@ -329,7 +376,7 @@
       "type": "path"
     },
     {
-      "id": 36,
+      "id": 42,
       "x": -1403.9902,
       "y": 2539.9346,
       "action": "combat_script",
@@ -338,7 +385,7 @@
       "type": "target"
     },
     {
-      "id": 37,
+      "id": 43,
       "x": -1416.1621,
       "y": 2542.0901,
       "action": "",
@@ -347,7 +394,7 @@
       "type": "path"
     },
     {
-      "id": 38,
+      "id": 44,
       "x": -1451.751,
       "y": 2554.8914,
       "action": "combat_script",
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/05-日落果-坠星山谷-6个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/06-日落果-坠星山谷-6个.json
similarity index 97%
rename from repo/pathing/食材与炼金/日落果/万叶@白白喵/05-日落果-坠星山谷-6个.json
rename to repo/pathing/食材与炼金/日落果/万叶@白白喵/06-日落果-坠星山谷-6个.json
index 94b5b749a..1e3180e6b 100644
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/05-日落果-坠星山谷-6个.json
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/06-日落果-坠星山谷-6个.json
@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "05-日落果-坠星山谷-6个",
+    "name": "06-日落果-坠星山谷-6个",
     "type": "collect",
     "version": "1.0",
     "description": "日落果05-坠星山谷-6颗-万叶纯享-白白喵",
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/06-日落果-达达乌帕谷上-45个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/07-日落果-达达乌帕谷上-45个.json
similarity index 80%
rename from repo/pathing/食材与炼金/日落果/万叶@白白喵/06-日落果-达达乌帕谷上-45个.json
rename to repo/pathing/食材与炼金/日落果/万叶@白白喵/07-日落果-达达乌帕谷上-45个.json
index ad81d4726..8fd75010f 100644
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/06-日落果-达达乌帕谷上-45个.json
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/07-日落果-达达乌帕谷上-45个.json
@@ -1,16 +1,19 @@
 {
   "info": {
-    "name": "06-日落果-达达乌帕谷上-45个",
+    "name": "07-日落果-达达乌帕谷上-45个",
     "type": "collect",
-    "version": "1.0",
-    "description": "",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
     "authors": [
       {
         "name": "白白喵"
       }
-    ]
+    ],
+    "version": "4.0",
+    "description": "带万叶摘日落果",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754574239903,
+    "enable_monster_loot_split": false
   },
   "positions": [
     {
@@ -42,11 +45,11 @@
     },
     {
       "id": 4,
-      "x": -1485.6182,
-      "y": 1437.854,
+      "x": -1484.126,
+      "y": 1436.0,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1)",
       "type": "target"
     },
     {
@@ -64,7 +67,7 @@
       "y": 1445.75,
       "action": "combat_script",
       "move_mode": "run",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1)",
       "type": "target"
     },
     {
@@ -127,7 +130,7 @@
       "y": 1458.8071,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1.0)",
       "type": "target"
     },
     {
@@ -150,12 +153,12 @@
     },
     {
       "id": 16,
-      "x": -1581.6249,
-      "y": 1487.5003,
+      "x": -1581.3752,
+      "y": 1488.2188,
       "action": "",
       "move_mode": "jump",
       "action_params": "",
-      "type": "target"
+      "type": "path"
     },
     {
       "id": 17,
@@ -168,17 +171,17 @@
     },
     {
       "id": 18,
-      "x": -1572.1562,
-      "y": 1489.4546,
+      "x": -1571.2818,
+      "y": 1490.5938,
       "action": "combat_script",
       "move_mode": "run",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1.0)",
       "type": "target"
     },
     {
       "id": 19,
-      "x": -1573.7471,
-      "y": 1490.8501,
+      "x": -1572.6882,
+      "y": 1493.3125,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -195,11 +198,11 @@
     },
     {
       "id": 21,
-      "x": -1574.7627,
-      "y": 1510.0024,
+      "x": -1574.9998,
+      "y": 1510.9688,
       "action": "combat_script",
       "move_mode": "dash",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1.0)",
       "type": "target"
     },
     {
@@ -240,28 +243,28 @@
     },
     {
       "id": 26,
-      "x": -1570.6963,
-      "y": 1606.8848,
-      "action": "",
-      "move_mode": "dash",
-      "action_params": "",
+      "x": -1567.627,
+      "y": 1605.25,
+      "action": "combat_script",
+      "move_mode": "run",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(3.0)",
       "type": "path"
     },
     {
       "id": 27,
-      "x": -1568.8193,
-      "y": 1609.2002,
+      "x": -1568.5627,
+      "y": 1616.4375,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
+      "action_params": "万叶 wait(2.5),e(hold),attack,wait(1.0)",
+      "type": "path"
     },
     {
       "id": 28,
-      "x": -1574.7998,
-      "y": 1612.4692,
+      "x": -1572.1892,
+      "y": 1621.375,
       "action": "",
-      "move_mode": "walk",
+      "move_mode": "dash",
       "action_params": "",
       "type": "path"
     },
@@ -276,11 +279,11 @@
     },
     {
       "id": 30,
-      "x": -1592.5391,
-      "y": 1626.3193,
+      "x": -1593.5622,
+      "y": 1625.875,
       "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "move_mode": "run",
+      "action_params": "万叶 wait(1),e(hold),attack,wait(1.0)",
       "type": "target"
     },
     {
@@ -288,9 +291,9 @@
       "x": -1597.418,
       "y": 1630.1206,
       "action": "",
-      "move_mode": "walk",
+      "move_mode": "run",
       "action_params": "",
-      "type": "target"
+      "type": "path"
     },
     {
       "id": 32,
@@ -312,11 +315,11 @@
     },
     {
       "id": 34,
-      "x": -1661.7402,
-      "y": 1585.6938,
+      "x": -1662.7806,
+      "y": 1587.25,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1.0)",
       "type": "target"
     },
     {
@@ -330,8 +333,8 @@
     },
     {
       "id": 36,
-      "x": -1644.7979,
-      "y": 1563.9526,
+      "x": -1644.0005,
+      "y": 1562.125,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -339,8 +342,8 @@
     },
     {
       "id": 37,
-      "x": -1627.2441,
-      "y": 1538.9907,
+      "x": -1625.5939,
+      "y": 1541.0625,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -357,11 +360,11 @@
     },
     {
       "id": 39,
-      "x": -1623.1572,
-      "y": 1492.645,
+      "x": -1622.7503,
+      "y": 1491.75,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1.0)",
       "type": "target"
     },
     {
@@ -369,7 +372,7 @@
       "x": -1634.7627,
       "y": 1515.0137,
       "action": "",
-      "move_mode": "dash",
+      "move_mode": "run",
       "action_params": "",
       "type": "path"
     },
@@ -396,17 +399,17 @@
       "x": -1704.0029,
       "y": 1471.0771,
       "action": "",
-      "move_mode": "dash",
+      "move_mode": "run",
       "action_params": "",
       "type": "path"
     },
     {
       "id": 44,
-      "x": -1713.0889,
-      "y": 1468.2358,
+      "x": -1714.0306,
+      "y": 1468.1562,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1.0)",
       "type": "target"
     },
     {
@@ -420,11 +423,11 @@
     },
     {
       "id": 46,
-      "x": -1737.4229,
-      "y": 1441.248,
+      "x": -1738.9678,
+      "y": 1441.125,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1.0)",
       "type": "target"
     },
     {
@@ -442,7 +445,7 @@
       "y": 1448.6782,
       "action": "combat_script",
       "move_mode": "fly",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e,attack,wait(1),j,wait(0.3),j",
       "type": "path"
     },
     {
@@ -474,11 +477,11 @@
     },
     {
       "id": 52,
-      "x": -1648.6377,
-      "y": 1386.5869,
+      "x": -1648.3127,
+      "y": 1385.0625,
       "action": "combat_script",
       "move_mode": "dash",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
+      "action_params": "万叶 e(hold),attack,wait(1.0)",
       "type": "path"
     },
     {
@@ -486,7 +489,7 @@
       "x": -1635.9033,
       "y": 1394.9902,
       "action": "",
-      "move_mode": "fly",
+      "move_mode": "dash",
       "action_params": "",
       "type": "path"
     },
@@ -501,8 +504,8 @@
     },
     {
       "id": 55,
-      "x": -1608.3369,
-      "y": 1404.6802,
+      "x": -1608.0002,
+      "y": 1406.0,
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "万叶 e(hold),attack,wait(3.0)",
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/07-日落果-达达乌帕谷下-24个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/08-日落果-达达乌帕谷下-24个.json
similarity index 70%
rename from repo/pathing/食材与炼金/日落果/万叶@白白喵/07-日落果-达达乌帕谷下-24个.json
rename to repo/pathing/食材与炼金/日落果/万叶@白白喵/08-日落果-达达乌帕谷下-24个.json
index a9f44379d..7aa7b143c 100644
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/07-日落果-达达乌帕谷下-24个.json
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/08-日落果-达达乌帕谷下-24个.json
@@ -1,16 +1,19 @@
 {
   "info": {
-    "name": "07-日落果-达达乌帕谷下-24个",
+    "name": "08-日落果-达达乌帕谷下-24个",
     "type": "collect",
-    "version": "1.0",
-    "description": "日落果07-达达乌帕谷下-24-万叶纯享",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
     "authors": [
       {
         "name": "白白喵"
       }
-    ]
+    ],
+    "version": "5.0",
+    "description": "带万叶采集",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754752454973,
+    "enable_monster_loot_split": false
   },
   "positions": [
     {
@@ -24,8 +27,8 @@
     },
     {
       "id": 2,
-      "x": -1431.7793,
-      "y": 1458.374,
+      "x": -1438.4956,
+      "y": 1452.3777,
       "action": "",
       "move_mode": "walk",
       "action_params": "",
@@ -33,35 +36,35 @@
     },
     {
       "id": 3,
-      "x": -1440.4492,
-      "y": 1444.6313,
+      "x": -1441.6243,
+      "y": 1446.3742,
       "action": "",
-      "move_mode": "fly",
+      "move_mode": "dash",
       "action_params": "",
       "type": "path"
     },
     {
       "id": 4,
-      "x": -1461.8174,
-      "y": 1394.7891,
-      "action": "combat_script",
+      "x": -1458.4366,
+      "y": 1399.25,
+      "action": "stop_flying",
       "move_mode": "fly",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
-    },
-    {
-      "id": 5,
-      "x": -1474.8301,
-      "y": 1388.1001,
-      "action": "",
-      "move_mode": "run",
       "action_params": "",
       "type": "path"
     },
+    {
+      "id": 5,
+      "x": -1460.0296,
+      "y": 1395.375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(3.0)",
+      "type": "path"
+    },
     {
       "id": 6,
-      "x": -1487.0371,
-      "y": 1373.9995,
+      "x": -1488.0937,
+      "y": 1383.0938,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -69,8 +72,8 @@
     },
     {
       "id": 7,
-      "x": -1490.3027,
-      "y": 1356.6216,
+      "x": -1531.001,
+      "y": 1349.2509,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -78,8 +81,8 @@
     },
     {
       "id": 8,
-      "x": -1487.7314,
-      "y": 1350.7202,
+      "x": -1547.999,
+      "y": 1340.873,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -87,44 +90,44 @@
     },
     {
       "id": 9,
-      "x": -1488.874,
-      "y": 1339.5767,
-      "action": "",
-      "move_mode": "dash",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 10,
-      "x": -1496.7266,
-      "y": 1334.3623,
-      "action": "",
-      "move_mode": "climb",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 11,
-      "x": -1510.8311,
-      "y": 1333.354,
+      "x": -1548.8105,
+      "y": 1334.2373,
       "action": "",
       "move_mode": "walk",
       "action_params": "",
       "type": "path"
     },
     {
-      "id": 12,
-      "x": -1512.8447,
-      "y": 1325.584,
+      "id": 10,
+      "x": -1543.96,
+      "y": 1333.1406,
       "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 11,
+      "x": -1524.5641,
+      "y": 1331.24,
+      "action": "",
       "move_mode": "run",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 12,
+      "x": -1511.2259,
+      "y": 1324.4937,
+      "move_mode": "run",
+      "type": "path",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.5),e(hold),attack,wait(2)"
     },
     {
       "id": 13,
-      "x": -1535.0107,
-      "y": 1310.4888,
+      "x": -1519.4384,
+      "y": 1309.9988,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -132,35 +135,35 @@
     },
     {
       "id": 14,
-      "x": -1540.4912,
-      "y": 1331.3398,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
+      "x": -1514.7815,
+      "y": 1306.8422,
+      "action": "",
+      "move_mode": "jump",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 15,
-      "x": -1535.3311,
-      "y": 1325.3442,
-      "action": "",
-      "move_mode": "run",
+      "x": -1506.7488,
+      "y": 1301.0607,
+      "action": "stop_flying",
+      "move_mode": "fly",
       "action_params": "",
       "type": "path"
     },
     {
       "id": 16,
-      "x": -1533.3604,
-      "y": 1304.4043,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
+      "x": -1512.9951,
+      "y": 1295.6982,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
       "type": "path"
     },
     {
       "id": 17,
-      "x": -1523.7656,
-      "y": 1279.6768,
+      "x": -1497.915,
+      "y": 1290.1143,
       "action": "",
       "move_mode": "run",
       "action_params": "",
@@ -168,33 +171,6 @@
     },
     {
       "id": 18,
-      "x": -1507.6455,
-      "y": 1280.8174,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 19,
-      "x": -1514.5742,
-      "y": 1293.2847,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
-    },
-    {
-      "id": 20,
-      "x": -1504.8789,
-      "y": 1287.1978,
-      "action": "",
-      "move_mode": "run",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 21,
       "x": -1487.6621,
       "y": 1294.2212,
       "action": "",
@@ -203,43 +179,52 @@
       "type": "path"
     },
     {
-      "id": 22,
-      "x": -1471.7344,
-      "y": 1284.5986,
-      "action": "",
-      "move_mode": "dash",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 23,
-      "x": -1469.0186,
-      "y": 1287.7578,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
-    },
-    {
-      "id": 24,
-      "x": -1468.4922,
-      "y": 1274.209,
+      "id": 19,
+      "x": -1479.9434,
+      "y": 1292.5083,
       "action": "",
       "move_mode": "run",
       "action_params": "",
       "type": "path"
     },
     {
-      "id": 25,
-      "x": -1415.1094,
-      "y": 1244.1045,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "万叶 e(hold),attack,wait(3.0)",
-      "type": "target"
+      "id": 20,
+      "x": -1469.2715,
+      "y": 1286.2012,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
-      "id": 26,
+      "id": 21,
+      "x": -1468.3584,
+      "y": 1290.1084,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 22,
+      "x": -1466.3755,
+      "y": 1274.7492,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 23,
+      "x": -1413.582,
+      "y": 1241.5767,
+      "action": "combat_script",
+      "move_mode": "run",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 24,
       "x": -1416.7344,
       "y": 1235.7461,
       "action": "",
@@ -248,7 +233,7 @@
       "type": "path"
     },
     {
-      "id": 27,
+      "id": 25,
       "x": -1429.6807,
       "y": 1213.894,
       "action": "",
@@ -257,7 +242,7 @@
       "type": "path"
     },
     {
-      "id": 28,
+      "id": 26,
       "x": -1444.2881,
       "y": 1205.4526,
       "action": "",
@@ -266,7 +251,7 @@
       "type": "path"
     },
     {
-      "id": 29,
+      "id": 27,
       "x": -1464.2627,
       "y": 1202.126,
       "action": "",
@@ -275,7 +260,7 @@
       "type": "path"
     },
     {
-      "id": 30,
+      "id": 28,
       "x": -1469.7734,
       "y": 1208.5405,
       "action": "",
@@ -284,7 +269,7 @@
       "type": "path"
     },
     {
-      "id": 31,
+      "id": 29,
       "x": -1479.6299,
       "y": 1212.187,
       "action": "",
@@ -293,16 +278,16 @@
       "type": "path"
     },
     {
-      "id": 32,
-      "x": -1481.7188,
-      "y": 1204.6406,
+      "id": 30,
+      "x": -1481.8749,
+      "y": 1203.9066,
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "万叶 e(hold),attack,wait(3.0)",
       "type": "target"
     },
     {
-      "id": 33,
+      "id": 31,
       "x": -1495.0684,
       "y": 1222.124,
       "action": "",
@@ -311,7 +296,7 @@
       "type": "path"
     },
     {
-      "id": 34,
+      "id": 32,
       "x": -1528.2588,
       "y": 1236.1812,
       "action": "",
@@ -320,7 +305,7 @@
       "type": "path"
     },
     {
-      "id": 35,
+      "id": 33,
       "x": -1537.6836,
       "y": 1241.3252,
       "action": "",
@@ -329,7 +314,7 @@
       "type": "path"
     },
     {
-      "id": 36,
+      "id": 34,
       "x": -1548.1406,
       "y": 1241.9448,
       "action": "combat_script",
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/08-日落果-鹰之门-18个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/08-日落果-鹰之门-18个.json
deleted file mode 100644
index 5197be70e..000000000
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/08-日落果-鹰之门-18个.json
+++ /dev/null
@@ -1,278 +0,0 @@
-{
-  "info": {
-    "name": "08-日落果-鹰之门-18个",
-    "type": "collect",
-    "version": "1.0",
-    "description": "",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
-    "authors": [
-      {
-        "name": "白白喵"
-      }
-    ]
-  },
-  "positions": [
-    {
-      "id": 1,
-      "action": "",
-      "move_mode": "run",
-      "type": "teleport",
-      "x": -1867.3398,
-      "y": 1331.1636,
-      "action_params": ""
-    },
-    {
-      "id": 2,
-      "x": -1891.6953,
-      "y": 1344.3364,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
-    },
-    {
-      "id": 3,
-      "x": -1889.3438,
-      "y": 1370.5439,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 4,
-      "x": -1880.5879,
-      "y": 1376.8809,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 5,
-      "x": -1864.1904,
-      "y": 1380.6665,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 6,
-      "x": -1846.6582,
-      "y": 1389.7949,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 7,
-      "x": -1834.8643,
-      "y": 1391.668,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 8,
-      "x": -1818.0645,
-      "y": 1417.3896,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
-    },
-    {
-      "id": 9,
-      "x": -1814.9453,
-      "y": 1410.1802,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 10,
-      "x": -1811.8457,
-      "y": 1401.1636,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 11,
-      "x": -1804.2959,
-      "y": 1336.6641,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 12,
-      "x": -1804.0977,
-      "y": 1333.5239,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 13,
-      "x": -1795.7773,
-      "y": 1331.0923,
-      "type": "target",
-      "move_mode": "dash",
-      "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
-    },
-    {
-      "id": 14,
-      "x": -1792.4668,
-      "y": 1333.5,
-      "type": "path",
-      "move_mode": "dash",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 15,
-      "x": -1783.8018,
-      "y": 1326.5327,
-      "type": "path",
-      "move_mode": "dash",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 16,
-      "x": -1781.4326,
-      "y": 1323.4834,
-      "type": "target",
-      "move_mode": "run",
-      "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
-    },
-    {
-      "id": 17,
-      "x": -1741.1816,
-      "y": 1325.4321,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 18,
-      "x": -1738.1816,
-      "y": 1328.9375,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 19,
-      "x": -1732.1699,
-      "y": 1316.8193,
-      "type": "target",
-      "move_mode": "run",
-      "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
-    },
-    {
-      "id": 20,
-      "x": -1728.5576,
-      "y": 1317.251,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 21,
-      "x": -1727.5674,
-      "y": 1299.874,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 22,
-      "x": -1730.3936,
-      "y": 1291.8105,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 23,
-      "x": -1723.7402,
-      "y": 1273.1167,
-      "type": "target",
-      "move_mode": "fly",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 24,
-      "x": -1727.2012,
-      "y": 1234.8101,
-      "type": "path",
-      "move_mode": "fly",
-      "action": "stop_flying",
-      "action_params": ""
-    },
-    {
-      "id": 25,
-      "x": -1720.6777,
-      "y": 1226.834,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
-    },
-    {
-      "id": 26,
-      "x": -1714.1768,
-      "y": 1227.6245,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 27,
-      "x": -1677.9141,
-      "y": 1202.3945,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 28,
-      "x": -1672.1611,
-      "y": 1206.4102,
-      "type": "path",
-      "move_mode": "run",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 29,
-      "x": -1669.6289,
-      "y": 1213.9038,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/09-日落果-鹰之门-18个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/09-日落果-鹰之门-18个.json
new file mode 100644
index 000000000..b8bd123ec
--- /dev/null
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/09-日落果-鹰之门-18个.json
@@ -0,0 +1,304 @@
+{
+  "info": {
+    "name": "09-日落果-鹰之门-18个",
+    "type": "collect",
+    "authors": [
+      {
+        "name": "白白喵"
+      }
+    ],
+    "version": "3.0",
+    "description": "带万叶摘果子",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754757616600,
+    "enable_monster_loot_split": false
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": -1867.3398,
+      "y": 1331.1636,
+      "action": "force_tp",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": -1893.8736,
+      "y": 1345.7493,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "万叶 e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": -1895.9347,
+      "y": 1348.4419,
+      "type": "path",
+      "move_mode": "walk"
+    },
+    {
+      "id": 4,
+      "x": -1889.3438,
+      "y": 1370.5439,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 5,
+      "x": -1880.5879,
+      "y": 1376.8809,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 6,
+      "x": -1864.1904,
+      "y": 1380.6665,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 7,
+      "x": -1846.6582,
+      "y": 1389.7949,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 8,
+      "x": -1834.8643,
+      "y": 1391.668,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 9,
+      "x": -1817.3754,
+      "y": 1419.0617,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "万叶 e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 10,
+      "x": -1814.9453,
+      "y": 1410.1802,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 11,
+      "x": -1811.8457,
+      "y": 1401.1636,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 12,
+      "x": -1804.2959,
+      "y": 1336.6641,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 13,
+      "x": -1804.0977,
+      "y": 1333.5239,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 14,
+      "x": -1795.7773,
+      "y": 1331.0923,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 15,
+      "x": -1792.125,
+      "y": 1328.845,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "万叶 e(hold),attack,wait(3)",
+      "type": "path"
+    },
+    {
+      "id": 16,
+      "x": -1779.9364,
+      "y": 1319.8135,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "万叶 wait(1),e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 17,
+      "x": -1777.6237,
+      "y": 1318.2532,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 18,
+      "x": -1736.6253,
+      "y": 1328.8127,
+      "action": "combat_script",
+      "move_mode": "run",
+      "action_params": "wait(0.3)",
+      "type": "path"
+    },
+    {
+      "id": 19,
+      "x": -1729.564,
+      "y": 1314.6875,
+      "action": "combat_script",
+      "move_mode": "run",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 20,
+      "x": -1724.0639,
+      "y": 1306.7543,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 21,
+      "x": -1730.3936,
+      "y": 1291.8105,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 22,
+      "x": -1723.7402,
+      "y": 1273.1167,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 23,
+      "x": -1727.2012,
+      "y": 1234.8101,
+      "action": "stop_flying",
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 24,
+      "x": -1717.4141,
+      "y": 1225.8623,
+      "action": "combat_script",
+      "move_mode": "run",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 25,
+      "x": -1696.6876,
+      "y": 1217.6875,
+      "type": "path",
+      "move_mode": "run"
+    },
+    {
+      "id": 26,
+      "x": -1674.2524,
+      "y": 1202.7495,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 27,
+      "x": -1669.5625,
+      "y": 1215.5617,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "万叶 e(hold),attack,wait(2)",
+      "type": "path"
+    },
+    {
+      "id": 28,
+      "x": -1664.7988,
+      "y": 1218.1714,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 29,
+      "x": -1645.9473,
+      "y": 1243.9531,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 30,
+      "x": -1639.3506,
+      "y": 1264.3232,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 31,
+      "x": -1645.5566,
+      "y": 1288.1211,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 32,
+      "x": -1648.8436,
+      "y": 1293.0321,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(3)",
+      "type": "path"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/09-日落果-誓言岬-21个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/10-日落果-誓言岬-21个.json
similarity index 99%
rename from repo/pathing/食材与炼金/日落果/万叶@白白喵/09-日落果-誓言岬-21个.json
rename to repo/pathing/食材与炼金/日落果/万叶@白白喵/10-日落果-誓言岬-21个.json
index 3557354d8..f2a0a438a 100644
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/09-日落果-誓言岬-21个.json
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/10-日落果-誓言岬-21个.json
@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "09-日落果-誓言岬-21个",
+    "name": "10-日落果-誓言岬-21个",
     "type": "collect",
     "version": "1.0",
     "description": "日落果09-誓言岬-21-万叶纯享-白白喵",
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/10-日落果-望风山地-9个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/11-日落果-望风山地-21个.json
similarity index 53%
rename from repo/pathing/食材与炼金/日落果/万叶@白白喵/10-日落果-望风山地-9个.json
rename to repo/pathing/食材与炼金/日落果/万叶@白白喵/11-日落果-望风山地-21个.json
index dd9d39cf4..410ce9e58 100644
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/10-日落果-望风山地-9个.json
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/11-日落果-望风山地-21个.json
@@ -1,157 +1,160 @@
 {
   "info": {
-    "name": "10-日落果-望风山地-9个",
+    "name": "11-日落果-望风山地-21个",
     "type": "collect",
-    "version": "1.0",
-    "description": "日落果10-望风山地-9-万叶纯享-白白喵",
-    "map_name": "Teyvat",
-    "bgi_version": "0.45.0",
     "authors": [
       {
         "name": "白白喵"
       }
-    ]
+    ],
+    "version": "3.0",
+    "description": "带万叶采集",
+    "map_name": "Teyvat",
+    "bgi_version": "0.45.0",
+    "tags": [],
+    "last_modified_time": 1754755148423,
+    "enable_monster_loot_split": false
   },
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": -1273.7422,
       "y": 2721.6494,
-      "action_params": ""
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": -1273.0273,
       "y": 2730.1184,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": -1262.7559,
       "y": 2760.6599,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": -1272.0967,
       "y": 2769.7122,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 5,
-      "x": -1295.9092,
-      "y": 2779.6802,
-      "type": "target",
-      "move_mode": "run",
+      "x": -1295.8431,
+      "y": 2782.0313,
       "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
+      "move_mode": "run",
+      "action_params": "万叶 wait(0.5),e(hold),attack,wait(2)",
+      "type": "path"
     },
     {
       "id": 6,
       "x": -1292.0605,
       "y": 2780.7156,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 7,
       "x": -1283.8838,
       "y": 2790.5649,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 8,
       "x": -1260.873,
       "y": 2799.3533,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 9,
       "x": -1258.4648,
       "y": 2798.6763,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
+      "move_mode": "walk",
+      "action_params": "万叶 e(hold),attack,wait(2)",
+      "type": "path"
     },
     {
       "id": 10,
       "x": -1250.4531,
       "y": 2802.3508,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 11,
       "x": -1226.1094,
       "y": 2807.9197,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 12,
       "x": -1190.1406,
       "y": 2793.2905,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 13,
       "x": -1155.5176,
       "y": 2771.0288,
-      "type": "target",
-      "move_mode": "run",
       "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
+      "move_mode": "run",
+      "action_params": "万叶 e(hold),attack,wait(2)",
+      "type": "path"
     },
     {
       "id": 14,
-      "x": -1158.6123,
-      "y": 2773.7441,
-      "type": "path",
-      "move_mode": "run",
+      "x": -1273.4736,
+      "y": 2721.9878,
+      "type": "teleport",
+      "move_mode": "walk",
       "action": "",
       "action_params": ""
     },
     {
       "id": 15,
-      "x": -1166.1104,
-      "y": 2766.762,
+      "x": -1271.0273,
+      "y": 2726.2803,
       "type": "path",
-      "move_mode": "run",
+      "move_mode": "walk",
       "action": "",
       "action_params": ""
     },
     {
       "id": 16,
-      "x": -1205.2959,
-      "y": 2729.1262,
+      "x": -1243.9385,
+      "y": 2737.8521,
       "type": "path",
       "move_mode": "run",
       "action": "",
@@ -159,8 +162,8 @@
     },
     {
       "id": 17,
-      "x": -1191.6426,
-      "y": 2704.1204,
+      "x": -1229.8457,
+      "y": 2725.812,
       "type": "path",
       "move_mode": "run",
       "action": "",
@@ -168,30 +171,84 @@
     },
     {
       "id": 18,
-      "x": -1187.9639,
-      "y": 2704.4343,
+      "x": -1225.6504,
+      "y": 2725.2993,
       "type": "path",
-      "move_mode": "fly",
-      "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
     },
     {
       "id": 19,
-      "x": -1191.3721,
-      "y": 2634.7444,
+      "x": -1229.5703,
+      "y": 2706.2156,
       "type": "path",
-      "move_mode": "fly",
+      "move_mode": "dash",
       "action": "",
       "action_params": ""
     },
     {
       "id": 20,
-      "x": -1192.7744,
-      "y": 2636.6689,
-      "type": "target",
+      "x": -1212.7676,
+      "y": 2689.3599,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 21,
+      "x": -1183.6875,
+      "y": 2656.7764,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 22,
+      "x": -1192.0176,
+      "y": 2634.1736,
+      "type": "path",
+      "move_mode": "run",
+      "action": "combat_script",
+      "action_params": "枫原万叶 wait(0.5),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 23,
+      "x": -1146.6064,
+      "y": 2646.1582,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 24,
+      "x": -1090.7002,
+      "y": 2647.6938,
+      "type": "path",
+      "move_mode": "run",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 25,
+      "x": -1083.3496,
+      "y": 2658.8306,
+      "type": "path",
       "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "万叶 e(hold),attack,wait(3.0)"
+      "action_params": "枫原万叶 wait(0.2),e(hold),attack,wait(2)"
+    },
+    {
+      "id": 26,
+      "x": -1074.6035,
+      "y": 2640.7178,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "wait(0.8)"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/食材与炼金/日落果/万叶@白白喵/11-日落果-山脊守望-33个.json b/repo/pathing/食材与炼金/日落果/万叶@白白喵/12-日落果-山脊守望-33个.json
similarity index 99%
rename from repo/pathing/食材与炼金/日落果/万叶@白白喵/11-日落果-山脊守望-33个.json
rename to repo/pathing/食材与炼金/日落果/万叶@白白喵/12-日落果-山脊守望-33个.json
index e9906e5d5..57e025968 100644
--- a/repo/pathing/食材与炼金/日落果/万叶@白白喵/11-日落果-山脊守望-33个.json
+++ b/repo/pathing/食材与炼金/日落果/万叶@白白喵/12-日落果-山脊守望-33个.json
@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "11-日落果-山脊守望-33个",
+    "name": "12-日落果-山脊守望-33个",
     "type": "collect",
     "version": "1.0",
     "description": "",