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 c3d5cf8d..7f135143 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 @@ -90,7 +90,9 @@ "y": -3724.44921875, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", + "//": "stop_climbing", "#": "15" }, @@ -152,7 +154,9 @@ "y": -3704.8525390625, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", + "//": "stop_climbing", "#": "16" }, 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 b1ff711c..93fcf263 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 @@ -174,6 +174,7 @@ "move_mode": "walk", "action": "combat_script", "action_params": "wait(0.2),keypress(x)", + "//": "stop_climbing", "#": "2" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json index 772544a8..403df054 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json @@ -164,6 +164,8 @@ "y": 4912.71875, "type": "target", "move_mode": "walk", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", "#": "5" }, { @@ -171,7 +173,8 @@ "y": 4912.71875, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", "#": "5" }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json index 738a76d7..03339685 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json @@ -11,6 +11,12 @@ "type": "teleport", "move_mode": "walk" }, + { + "x": 4540.2578125, + "y": 4211.9921875, + "type": "path", + "move_mode": "run" + }, { "x": 4532.91748046875, "y": 4206.62158203125, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json index 14ff18ad..f594b78b 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json @@ -61,7 +61,9 @@ "y": -3702.8671875, "type": "path", "move_mode": "fly", - "action": "stop_flying", + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.2),click,wait(0.2),keypress(x),wait(0.2),click", + "//": "stop_flying and stop_climbing", "#" : "2" }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json index dc52913c..bd8b97e5 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json @@ -28,8 +28,8 @@ }, { - "x": -3973.0400390625, - "y": -4440.087890625, + "x": -3975.2333984375, + "y": -4438.943359375, "type": "path", "move_mode": "walk" }, @@ -41,23 +41,31 @@ }, { - "x": -3982.2109375, - "y": -4437.1357421875, + "x": -3982.5927734375, + "y": -4437.373046875, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, + { + "x": -3982.5927734375, + "y": -4437.373046875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "2" + }, + { "x": -3982.3076171875, "y": -4437.13671875, "type": "path", "move_mode": "walk" }, - { - "x": -3975.26171875, - "y": -4439.369140625, + "x": -3980.82421875, + "y": -4437.59375, "type": "path", "move_mode": "walk" }, @@ -77,6 +85,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": -3967.64453125, + "y": -4435.7802734375, + "type": "path", + "move_mode": "walk" + }, { "x": -3965.724609375, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json index 2795ec98..97c7bf25 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json @@ -29,7 +29,9 @@ "y": -3341.205078125, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" }, { "x": -3531.95703125, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json index 4a573eda..eed68c41 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json @@ -185,8 +185,8 @@ "move_mode": "run" }, { - "x": 8143.2216796875, - "y": -1469.74072265625, + "x": 8143.83251953125, + "y": -1471.2744140625, "type": "target", "move_mode": "walk", "action": "", diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index c4fdc68a..38077cc9 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.3", + "version": "2.0.4", "bgi_version": "0.38.1", "description": "圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。", "authors": [ diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json index c3d5cf8d..7f135143 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json @@ -90,7 +90,9 @@ "y": -3724.44921875, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", + "//": "stop_climbing", "#": "15" }, @@ -152,7 +154,9 @@ "y": -3704.8525390625, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", + "//": "stop_climbing", "#": "16" }, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json index b1ff711c..93fcf263 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json @@ -174,6 +174,7 @@ "move_mode": "walk", "action": "combat_script", "action_params": "wait(0.2),keypress(x)", + "//": "stop_climbing", "#": "2" }, { diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json index 772544a8..403df054 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json @@ -164,6 +164,8 @@ "y": 4912.71875, "type": "target", "move_mode": "walk", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", "#": "5" }, { @@ -171,7 +173,8 @@ "y": 4912.71875, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(0.2),keypress(x)", "#": "5" }, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json index 738a76d7..03339685 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json @@ -11,6 +11,12 @@ "type": "teleport", "move_mode": "walk" }, + { + "x": 4540.2578125, + "y": 4211.9921875, + "type": "path", + "move_mode": "run" + }, { "x": 4532.91748046875, "y": 4206.62158203125, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json index 14ff18ad..f594b78b 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json @@ -61,7 +61,9 @@ "y": -3702.8671875, "type": "path", "move_mode": "fly", - "action": "stop_flying", + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.2),click,wait(0.2),keypress(x),wait(0.2),click", + "//": "stop_flying and stop_climbing", "#" : "2" }, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json index dc52913c..bd8b97e5 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json @@ -28,8 +28,8 @@ }, { - "x": -3973.0400390625, - "y": -4440.087890625, + "x": -3975.2333984375, + "y": -4438.943359375, "type": "path", "move_mode": "walk" }, @@ -41,23 +41,31 @@ }, { - "x": -3982.2109375, - "y": -4437.1357421875, + "x": -3982.5927734375, + "y": -4437.373046875, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, + { + "x": -3982.5927734375, + "y": -4437.373046875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "2" + }, + { "x": -3982.3076171875, "y": -4437.13671875, "type": "path", "move_mode": "walk" }, - { - "x": -3975.26171875, - "y": -4439.369140625, + "x": -3980.82421875, + "y": -4437.59375, "type": "path", "move_mode": "walk" }, @@ -77,6 +85,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": -3967.64453125, + "y": -4435.7802734375, + "type": "path", + "move_mode": "walk" + }, { "x": -3965.724609375, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json index 2795ec98..97c7bf25 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json @@ -29,7 +29,9 @@ "y": -3341.205078125, "type": "path", "move_mode": "fly", - "action": "stop_flying" + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" }, { "x": -3531.95703125, diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json index 4a573eda..eed68c41 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json @@ -185,8 +185,8 @@ "move_mode": "run" }, { - "x": 8143.2216796875, - "y": -1469.74072265625, + "x": 8143.83251953125, + "y": -1471.2744140625, "type": "target", "move_mode": "walk", "action": "",