From 3483cec27cc14592f299b69d530575b8fbbbf3d9 Mon Sep 17 00:00:00 2001 From: Yang-z Date: Sat, 4 Jan 2025 14:12:08 +0800 Subject: [PATCH] fine-tune - adjust several path points that might cause stucking - refine a target point that might fail to be picked - smooth some paths --- ...尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json | 8 +- ...尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json | 4 +- .../【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json | 169 +++++++----------- ...-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json | 8 + .../狗粮-枫丹-研究院区-中部塔内-9个.json | 3 +- .../狗粮-稻妻-海祇岛-望泷村西南-4个-f.json | 6 + .../【额外】狗粮-纳塔-灵谜纹+13个.json | 8 +- repo/js/AutoArtifacts_A_B_Extra/main.js | 2 +- repo/js/AutoArtifacts_A_B_Extra/manifest.json | 2 +- ...收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json | 8 +- ...收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json | 4 +- .../【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json | 169 +++++++----------- ...粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json | 8 + .../狗粮-枫丹-研究院区-中部塔内-9个.json | 3 +- .../狗粮-稻妻-海祇岛-望泷村西南-4个-f.json | 6 + .../【额外】狗粮-纳塔-灵谜纹+13个.json | 8 +- 16 files changed, 184 insertions(+), 232 deletions(-) diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json index 9d13651d..e6563ea0 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json @@ -30,7 +30,9 @@ "y": -3733.8955078125, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" }, { "x": -3152.74609375, @@ -204,7 +206,9 @@ "y": -3625.0078125, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json index a4096e10..c3d5cf8d 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json @@ -42,7 +42,9 @@ "y": -3742.8154296875, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json index 1b95243e..b1ff711c 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json @@ -12,11 +12,19 @@ "move_mode": "walk" }, { - "x": -3850.6787109375, - "y": -4510.998046875, + "x": -3888.8369140625, + "y": -4398.5390625, + "type": "path", + "move_mode": "run" + }, + { + "x": -3850.6845703125, + "y": -4511.197265625, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5)", + "//": "stop_flying" }, { "x": -3850.6787109375, @@ -27,8 +35,8 @@ "#": "SE1" }, { - "x": -3849.4716796875, - "y": -4510.6220703125, + "x": -3848.8515625, + "y": -4510.4755859375, "type": "target", "move_mode": "walk", "action": "", @@ -164,7 +172,8 @@ "y": -4422.544921875, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", "#": "2" }, { @@ -174,9 +183,9 @@ "move_mode": "walk" }, { - "x": -3789.9228515625, - "y": -4422.2587890625, - "type": "path", + "x": -3790.009765625, + "y": -4421.7783203125, + "type": "target", "move_mode": "walk" }, { @@ -206,8 +215,8 @@ "#": "3" }, { - "x": -3774.798828125, - "y": -4441.1708984375, + "x": -3773.9287109375, + "y": -4441.794921875, "type": "target", "move_mode": "walk", "action": "", @@ -232,34 +241,25 @@ "type": "path", "move_mode": "walk" }, + { - "x": -3740.89453125, - "y": -4441.400390625, + "x": -3739.9423828125, + "y": -4441.0087890625, "type": "target", "move_mode": "walk", - "action": "", - "#": "5" + "#": "5 6" }, { - "x": -3739.6875, - "y": -4440.29296875, + "x": -3739.9423828125, + "y": -4441.0087890625, "type": "target", "move_mode": "walk", - "action": "", - "#": "6" + "#": "5 6" }, { - "x": -3738.7763671875, - "y": -4440.2119140625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "6" - }, - { - "x": -3740.857421875, - "y": -4439.6904296875, - "type": "target", + "x": -3740.419921875, + "y": -4439.140625, + "type": "path", "move_mode": "walk" }, { @@ -310,29 +310,37 @@ "action": "", "#": "8" }, + { - "x": -3738.73046875, - "y": -4441.6044921875, + "x": -3742.2470703125, + "y": -4438.44140625, + "type": "path", + "move_mode": "walk" + }, + { + "x": -3741.7060546875, + "y": -4438.869140625, + "type": "path", + "move_mode": "walk" + }, + + { + "x": -3738.31640625, + "y": -4442.064453125, "type": "target", "move_mode": "walk", "action": "", "#": "9" }, { - "x": -3738.58203125, - "y": -4442.154296875, + "x": -3738.31640625, + "y": -4442.064453125, "type": "target", "move_mode": "walk", "action": "", "#": "9" }, - { - "x": -3738.0673828125, - "y": -4439.9228515625, - "type": "target", - "move_mode": "walk" - }, { "x": -3740.6142578125, "y": -4435.5537109375, @@ -367,14 +375,7 @@ "action": "", "#": "10" }, - { - "x": -3772.146484375, - "y": -4439.849609375, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "10" - }, + { "x": -3775.4658203125, "y": -4439.1611328125, @@ -466,16 +467,8 @@ "#": "13" }, { - "x": -3727.03515625, - "y": -4431.9111328125, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "14" - }, - { - "x": -3727.1845703125, - "y": -4431.47265625, + "x": -3727.5048828125, + "y": -4431.0224609375, "type": "target", "move_mode": "walk", "action": "", @@ -483,8 +476,8 @@ }, { - "x": -3729.2822265625, - "y": -4429.0654296875, + "x": -3730.1171875, + "y": -4429.974609375, "type": "path", "move_mode": "walk" }, @@ -518,24 +511,16 @@ }, { - "x": -3720.18359375, - "y": -4430.9423828125, + "x": -3719.4345703125, + "y": -4431.1865234375, "type": "target", "move_mode": "walk", "action": "", "#": "16" }, { - "x": -3719.9521484375, - "y": -4430.4619140625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "16" - }, - { - "x": -3719.9375, - "y": -4430.4326171875, + "x": -3720.29296875, + "y": -4430.4189453125, "type": "target", "move_mode": "walk", "action": "", @@ -543,55 +528,27 @@ }, { - "x": -3718.8193359375, - "y": -4432.46484375, - "type": "target", - "move_mode": "walk" - }, - { - "x": -3719.064453125, - "y": -4431.0537109375, - "type": "path", - "move_mode": "walk" - }, - { - "x": -3722.5244140625, - "y": -4430.033203125, + "x": -3721.7392578125, + "y": -4431.853515625, "type": "path", "move_mode": "walk" }, - { - "x": -3725.986328125, - "y": -4429.5283203125, + "x": -3725.7646484375, + "y": -4429.1943359375, "type": "target", "move_mode": "walk", "action": "", "#": "17" }, { - "x": -3726.0458984375, - "y": -4429.078125, + "x": -3725.7646484375, + "y": -4429.1943359375, "type": "target", "move_mode": "walk", "action": "", "#": "17" - }, - { - "x": -3726.8388671875, - "y": -4428.9970703125, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "17" - }, - - { - "x": -3726.9306640625, - "y": -4428.8232421875, - "type": "path", - "move_mode": "walk" } diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json index e0636a53..1207902f 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json @@ -123,12 +123,20 @@ "action": "", "#": 3 }, + { "x": 3954.81787109375, "y": 4875.39111328125, "type": "path", "move_mode": "fly" }, + { + "x": 3956.9384765625, + "y": 4874.291015625, + "type": "path", + "move_mode": "walk" + }, + { "x": 3959.8349609375, "y": 4875.939453125, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json index 5de67970..83c77727 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json @@ -60,7 +60,6 @@ "move_mode": "fly" }, - { "x": 4400.6455078125, "y": 4929.09765625, @@ -111,7 +110,7 @@ "move_mode": "walk", "action": "combat_script", "action_params": "wait(1.5)", - "//": "drump down" + "//": "jump down, and do wait, otherwise.." }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json index f3a25b8b..dbca7c2e 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json @@ -11,6 +11,12 @@ "type": "teleport", "move_mode": "walk" }, + { + "x": -754.037109375, + "y": -4002.3544921875, + "type": "path", + "move_mode": "run" + }, { "x": -725.943359375, "y": -4029.255859375, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json index bc1b5da0..d6dbdd27 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json @@ -54,13 +54,13 @@ "#": "2" }, { - "x": 9725.1689453125, - "y": -1547.59716796875, + "x": 9732.736328125, + "y": -1552.6640625, "type": "path", "move_mode": "walk", "action": "combat_script", - "action_params": "keypress(VK_SPACE),wait(1.5),mousedown,wait(0.5),moveby(5000,0),wait(1.0),mouseup", - "//": "降落，扫码", + "action_params": "mousedown,wait(0.5),moveby(-100,3000),wait(1.0),mouseup", + "//": "扫码", "#": "3" }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/main.js b/repo/js/AutoArtifacts_A_B_Extra/main.js index fb5c33f4..3b4e7b42 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/main.js +++ b/repo/js/AutoArtifacts_A_B_Extra/main.js @@ -78,7 +78,7 @@ ]; // 13个 // 每日拾取点位数及耗时 - // A: 97 + 21 + 7 + 10 = 135 (~50 minutes) + // A: 97 + 21 + 7 + 10 = 135 (~47 minutes) // B: 97 + 20 + 7 + 13 = 137 (~45 minutes) diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index 6b3c5f87..c4fdc68a 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/manifest.json +++ b/repo/js/AutoArtifacts_A_B_Extra/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "狗粮ABE路线，自动拾取分解", - "version": "2.0.2", + "version": "2.0.3", "bgi_version": "0.38.1", "description": "圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。", "authors": [ diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json index 9d13651d..e6563ea0 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json @@ -30,7 +30,9 @@ "y": -3733.8955078125, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" }, { "x": -3152.74609375, @@ -204,7 +206,9 @@ "y": -3625.0078125, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" }, { diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json index a4096e10..c3d5cf8d 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json @@ -42,7 +42,9 @@ "y": -3742.8154296875, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" }, { diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json index 1b95243e..b1ff711c 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json @@ -12,11 +12,19 @@ "move_mode": "walk" }, { - "x": -3850.6787109375, - "y": -4510.998046875, + "x": -3888.8369140625, + "y": -4398.5390625, + "type": "path", + "move_mode": "run" + }, + { + "x": -3850.6845703125, + "y": -4511.197265625, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5)", + "//": "stop_flying" }, { "x": -3850.6787109375, @@ -27,8 +35,8 @@ "#": "SE1" }, { - "x": -3849.4716796875, - "y": -4510.6220703125, + "x": -3848.8515625, + "y": -4510.4755859375, "type": "target", "move_mode": "walk", "action": "", @@ -164,7 +172,8 @@ "y": -4422.544921875, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", "#": "2" }, { @@ -174,9 +183,9 @@ "move_mode": "walk" }, { - "x": -3789.9228515625, - "y": -4422.2587890625, - "type": "path", + "x": -3790.009765625, + "y": -4421.7783203125, + "type": "target", "move_mode": "walk" }, { @@ -206,8 +215,8 @@ "#": "3" }, { - "x": -3774.798828125, - "y": -4441.1708984375, + "x": -3773.9287109375, + "y": -4441.794921875, "type": "target", "move_mode": "walk", "action": "", @@ -232,34 +241,25 @@ "type": "path", "move_mode": "walk" }, + { - "x": -3740.89453125, - "y": -4441.400390625, + "x": -3739.9423828125, + "y": -4441.0087890625, "type": "target", "move_mode": "walk", - "action": "", - "#": "5" + "#": "5 6" }, { - "x": -3739.6875, - "y": -4440.29296875, + "x": -3739.9423828125, + "y": -4441.0087890625, "type": "target", "move_mode": "walk", - "action": "", - "#": "6" + "#": "5 6" }, { - "x": -3738.7763671875, - "y": -4440.2119140625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "6" - }, - { - "x": -3740.857421875, - "y": -4439.6904296875, - "type": "target", + "x": -3740.419921875, + "y": -4439.140625, + "type": "path", "move_mode": "walk" }, { @@ -310,29 +310,37 @@ "action": "", "#": "8" }, + { - "x": -3738.73046875, - "y": -4441.6044921875, + "x": -3742.2470703125, + "y": -4438.44140625, + "type": "path", + "move_mode": "walk" + }, + { + "x": -3741.7060546875, + "y": -4438.869140625, + "type": "path", + "move_mode": "walk" + }, + + { + "x": -3738.31640625, + "y": -4442.064453125, "type": "target", "move_mode": "walk", "action": "", "#": "9" }, { - "x": -3738.58203125, - "y": -4442.154296875, + "x": -3738.31640625, + "y": -4442.064453125, "type": "target", "move_mode": "walk", "action": "", "#": "9" }, - { - "x": -3738.0673828125, - "y": -4439.9228515625, - "type": "target", - "move_mode": "walk" - }, { "x": -3740.6142578125, "y": -4435.5537109375, @@ -367,14 +375,7 @@ "action": "", "#": "10" }, - { - "x": -3772.146484375, - "y": -4439.849609375, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "10" - }, + { "x": -3775.4658203125, "y": -4439.1611328125, @@ -466,16 +467,8 @@ "#": "13" }, { - "x": -3727.03515625, - "y": -4431.9111328125, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "14" - }, - { - "x": -3727.1845703125, - "y": -4431.47265625, + "x": -3727.5048828125, + "y": -4431.0224609375, "type": "target", "move_mode": "walk", "action": "", @@ -483,8 +476,8 @@ }, { - "x": -3729.2822265625, - "y": -4429.0654296875, + "x": -3730.1171875, + "y": -4429.974609375, "type": "path", "move_mode": "walk" }, @@ -518,24 +511,16 @@ }, { - "x": -3720.18359375, - "y": -4430.9423828125, + "x": -3719.4345703125, + "y": -4431.1865234375, "type": "target", "move_mode": "walk", "action": "", "#": "16" }, { - "x": -3719.9521484375, - "y": -4430.4619140625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "16" - }, - { - "x": -3719.9375, - "y": -4430.4326171875, + "x": -3720.29296875, + "y": -4430.4189453125, "type": "target", "move_mode": "walk", "action": "", @@ -543,55 +528,27 @@ }, { - "x": -3718.8193359375, - "y": -4432.46484375, - "type": "target", - "move_mode": "walk" - }, - { - "x": -3719.064453125, - "y": -4431.0537109375, - "type": "path", - "move_mode": "walk" - }, - { - "x": -3722.5244140625, - "y": -4430.033203125, + "x": -3721.7392578125, + "y": -4431.853515625, "type": "path", "move_mode": "walk" }, - { - "x": -3725.986328125, - "y": -4429.5283203125, + "x": -3725.7646484375, + "y": -4429.1943359375, "type": "target", "move_mode": "walk", "action": "", "#": "17" }, { - "x": -3726.0458984375, - "y": -4429.078125, + "x": -3725.7646484375, + "y": -4429.1943359375, "type": "target", "move_mode": "walk", "action": "", "#": "17" - }, - { - "x": -3726.8388671875, - "y": -4428.9970703125, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "17" - }, - - { - "x": -3726.9306640625, - "y": -4428.8232421875, - "type": "path", - "move_mode": "walk" } diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json index e0636a53..1207902f 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json @@ -123,12 +123,20 @@ "action": "", "#": 3 }, + { "x": 3954.81787109375, "y": 4875.39111328125, "type": "path", "move_mode": "fly" }, + { + "x": 3956.9384765625, + "y": 4874.291015625, + "type": "path", + "move_mode": "walk" + }, + { "x": 3959.8349609375, "y": 4875.939453125, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json index 5de67970..83c77727 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json @@ -60,7 +60,6 @@ "move_mode": "fly" }, - { "x": 4400.6455078125, "y": 4929.09765625, @@ -111,7 +110,7 @@ "move_mode": "walk", "action": "combat_script", "action_params": "wait(1.5)", - "//": "drump down" + "//": "jump down, and do wait, otherwise.." }, { diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json index f3a25b8b..dbca7c2e 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json @@ -11,6 +11,12 @@ "type": "teleport", "move_mode": "walk" }, + { + "x": -754.037109375, + "y": -4002.3544921875, + "type": "path", + "move_mode": "run" + }, { "x": -725.943359375, "y": -4029.255859375, diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json index bc1b5da0..d6dbdd27 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json @@ -54,13 +54,13 @@ "#": "2" }, { - "x": 9725.1689453125, - "y": -1547.59716796875, + "x": 9732.736328125, + "y": -1552.6640625, "type": "path", "move_mode": "walk", "action": "combat_script", - "action_params": "keypress(VK_SPACE),wait(1.5),mousedown,wait(0.5),moveby(5000,0),wait(1.0),mouseup", - "//": "降落，扫码", + "action_params": "mousedown,wait(0.5),moveby(-100,3000),wait(1.0),mouseup", + "//": "扫码", "#": "3" },