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 94e2813e..561424e8 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 @@ -42,13 +42,9 @@ }, { - "x": -3149.0771484375, - "y": -3739.6552734375, - "type": "target", - "move_mode": "walk", - "#": "7" - }, - { + "_x": -3149.0771484375, + "_y": -3739.6552734375, + "x": -3149.0908203125, "y": -3739.7705078125, "type": "target", @@ -57,11 +53,11 @@ }, { - "x": -3155.703125, - "y": -3729.7724609375, - "type": "path", - "move_mode": "walk" + "x": -3157.0185546875, + "y": -3727.5537109375, + "type": "orientation" }, + { "x": -3157.0185546875, "y": -3727.5537109375, @@ -80,13 +76,10 @@ { "x": -3159.232421875, "y": -3724.658203125, - "type": "target", - "move_mode": "walk", - "#": "9" - }, - { - "x": -3159.232421875, - "y": -3724.658203125, + + "x_": -3159.232421875, + "y_": -3724.658203125, + "type": "target", "move_mode": "walk", "#": "9" @@ -122,7 +115,7 @@ "y": -3702.015625, "type": "path", "move_mode": "walk", - "#": "drop" + "//": "jump down" }, { "x": -3166.8525390625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json index 88facb3d..f2876072 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json @@ -201,6 +201,11 @@ "move_mode": "walk", "#": "12" }, + { + "x": 9798.2060546875, + "y": -557.38671875, + "type": "orientation" + }, { "x": 9798.2060546875, "y": -557.38671875, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json index 2705f41c..ea05b625 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json @@ -93,6 +93,12 @@ "move_mode": "walk", "//": "jump down" }, + { + "x": 4024.5498046875, + "y": -1060.61865234375, + "type": "orientation", + "move_mode": "walk" + }, { "x": 4024.5498046875, "y": -1060.61865234375, 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 c3dee6e3..5c42ea92 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 @@ -9,44 +9,35 @@ { "x": 4434.34375, "y": 5091.7138671875, - "type": "teleport", - "move_mode": "walk" + "type": "teleport" }, { - "x": 4424.71728515625, - "y": 5067.43896484375, - "type": "path", - "move_mode": "run" + "x": 4424.3642578125, + "y": 5069.7080078125, + "type": "target", + "move_mode": "dash" }, - { - "x": 4418.818359375, - "y": 5069.4326171875, + "x": 4417.84228515625, + "y": 5069.5908203125, + "type": "orientation" + }, + { + "x": 4417.84228515625, + "y": 5069.5908203125, "type": "target", "move_mode": "walk", "#" : "PRE-1" }, - { - "x": 4421.64794921875, - "y": 5070.2724609375, - "type": "path", - "move_mode": "walk" - }, - { - "x": 4428.1611328125, - "y": 5032.60498046875, - "type": "path", - "move_mode": "dash" - }, { "x": 4376.3173828125, "y": 4970.154296875, "type": "path", "move_mode": "dash", "action": "combat_script", - "action_params": "wait(2.0)", + "action_params": "wait(1.0)", "//": "稍等体力恢复" }, { @@ -228,14 +219,18 @@ }, { - "x": 4402.04296875, - "y": 4922.03759765625, + "x": 4401.623046875, + "y": 4921.9248046875, "type": "target", "move_mode": "walk", - "action": "combat_script", - "action_params": "wait(1.0)", "#" : "6" }, + { + "x": 4401.01220703125, + "y": 4921.61474609375, + "type": "target", + "move_mode": "walk" + }, { "x": 4398.994140625, "y": 4921.734375, 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 ea11653f..7a056370 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 @@ -8,14 +8,12 @@ { "x": 4301.29443359375, "y": 4765.06494140625, - "type": "teleport", - "move_mode": "walk" + "type": "teleport" }, { - "x": 4302.224609375, - "y": 4765.61376953125, - "type": "path", - "move_mode": "walk" + "x": 4313.7529296875, + "y": 4774.91015625, + "type": "orientation" }, { "x": 4313.7529296875, @@ -27,13 +25,13 @@ "x": 4285.86669921875, "y": 4791.9169921875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4212.12548828125, "y": 4820.1083984375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { @@ -85,6 +83,12 @@ "move_mode": "walk", "#": "2" }, + { + "x": 4188.525390625, + "y": 4676.29345703125, + "type": "orientation", + "move_mode": "walk" + }, { "x": 4188.525390625, "y": 4676.29345703125, @@ -112,9 +116,9 @@ "move_mode": "run" }, { - "x": 4210.02294921875, - "y": 4627.853515625, - "type": "path", + "x": 4216.02392578125, + "y": 4628.65380859375, + "type": "orientation", "move_mode": "walk" }, @@ -133,6 +137,12 @@ "#": "4" }, + { + "x": 4202.34814453125, + "y": 4620.67626953125, + "type": "orientation", + "move_mode": "walk" + }, { "x": 4202.34814453125, "y": 4620.67626953125, @@ -140,22 +150,22 @@ "move_mode": "run" }, { - "x": 4207.35888671875, - "y": 4618.669921875, + "x": 4207.314453125, + "y": 4618.18701171875, "type": "orientation", "move_mode": "walk" }, { - "x": 4207.35888671875, - "y": 4618.669921875, + "x": 4207.35, + "y": 4618.45, "type": "target", "move_mode": "walk", "#": "5 6" }, { - "x": 4207.25244140625, - "y": 4619.9873046875, + "x": 4207.35888671875, + "y": 4618.669921875, "type": "target", "move_mode": "walk", "#": "5 6" @@ -204,7 +214,7 @@ "x": 4117.1728515625, "y": 4661.068359375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4114.39453125, 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 a205ba8c..618911c1 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 @@ -14,8 +14,13 @@ "move_mode": "walk" }, { - "x": 4511.11669921875, - "y": 4714.876953125, + "x": 4566.91064453125, + "y": 4733.60009765625, + "type": "orientation" + }, + { + "x": 4512.52001953125, + "y": 4715.357421875, "type": "path", "move_mode": "run" }, 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 24c8947f..e02062ec 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 @@ -38,7 +38,7 @@ "type": "path", "move_mode": "walk", "action": "combat_script", - "action_params": "keypress(VK_SPACE),wait(5),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", + "action_params": "keypress(VK_SPACE),wait(6),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", "//": "降落，起跳" }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json index 1e1acf0e..0245c705 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json @@ -206,9 +206,9 @@ "y": -1400.533203125, "type": "path", "move_mode": "fly", - "action": "combat_script", - "action_params": "keypress(VK_SPACE),wait(0.2),click", - "//": "stop_flying" + "_action": "combat_script", + "_action_params": "keypress(VK_SPACE),wait(0.2),click", + "//": "no stop_flying" }, { "x": 8140.86962890625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index 0c71a080..cca66bc5 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.3.2", + "version": "2.3.3", "bgi_version": "0.42.0", "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 94e2813e..561424e8 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json @@ -42,13 +42,9 @@ }, { - "x": -3149.0771484375, - "y": -3739.6552734375, - "type": "target", - "move_mode": "walk", - "#": "7" - }, - { + "_x": -3149.0771484375, + "_y": -3739.6552734375, + "x": -3149.0908203125, "y": -3739.7705078125, "type": "target", @@ -57,11 +53,11 @@ }, { - "x": -3155.703125, - "y": -3729.7724609375, - "type": "path", - "move_mode": "walk" + "x": -3157.0185546875, + "y": -3727.5537109375, + "type": "orientation" }, + { "x": -3157.0185546875, "y": -3727.5537109375, @@ -80,13 +76,10 @@ { "x": -3159.232421875, "y": -3724.658203125, - "type": "target", - "move_mode": "walk", - "#": "9" - }, - { - "x": -3159.232421875, - "y": -3724.658203125, + + "x_": -3159.232421875, + "y_": -3724.658203125, + "type": "target", "move_mode": "walk", "#": "9" @@ -122,7 +115,7 @@ "y": -3702.015625, "type": "path", "move_mode": "walk", - "#": "drop" + "//": "jump down" }, { "x": -3166.8525390625, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json index 88facb3d..f2876072 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json @@ -201,6 +201,11 @@ "move_mode": "walk", "#": "12" }, + { + "x": 9798.2060546875, + "y": -557.38671875, + "type": "orientation" + }, { "x": 9798.2060546875, "y": -557.38671875, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json index 2705f41c..ea05b625 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json @@ -93,6 +93,12 @@ "move_mode": "walk", "//": "jump down" }, + { + "x": 4024.5498046875, + "y": -1060.61865234375, + "type": "orientation", + "move_mode": "walk" + }, { "x": 4024.5498046875, "y": -1060.61865234375, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json index c3dee6e3..5c42ea92 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json @@ -9,44 +9,35 @@ { "x": 4434.34375, "y": 5091.7138671875, - "type": "teleport", - "move_mode": "walk" + "type": "teleport" }, { - "x": 4424.71728515625, - "y": 5067.43896484375, - "type": "path", - "move_mode": "run" + "x": 4424.3642578125, + "y": 5069.7080078125, + "type": "target", + "move_mode": "dash" }, - { - "x": 4418.818359375, - "y": 5069.4326171875, + "x": 4417.84228515625, + "y": 5069.5908203125, + "type": "orientation" + }, + { + "x": 4417.84228515625, + "y": 5069.5908203125, "type": "target", "move_mode": "walk", "#" : "PRE-1" }, - { - "x": 4421.64794921875, - "y": 5070.2724609375, - "type": "path", - "move_mode": "walk" - }, - { - "x": 4428.1611328125, - "y": 5032.60498046875, - "type": "path", - "move_mode": "dash" - }, { "x": 4376.3173828125, "y": 4970.154296875, "type": "path", "move_mode": "dash", "action": "combat_script", - "action_params": "wait(2.0)", + "action_params": "wait(1.0)", "//": "稍等体力恢复" }, { @@ -228,14 +219,18 @@ }, { - "x": 4402.04296875, - "y": 4922.03759765625, + "x": 4401.623046875, + "y": 4921.9248046875, "type": "target", "move_mode": "walk", - "action": "combat_script", - "action_params": "wait(1.0)", "#" : "6" }, + { + "x": 4401.01220703125, + "y": 4921.61474609375, + "type": "target", + "move_mode": "walk" + }, { "x": 4398.994140625, "y": 4921.734375, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个-f.json index ea11653f..7a056370 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个-f.json @@ -8,14 +8,12 @@ { "x": 4301.29443359375, "y": 4765.06494140625, - "type": "teleport", - "move_mode": "walk" + "type": "teleport" }, { - "x": 4302.224609375, - "y": 4765.61376953125, - "type": "path", - "move_mode": "walk" + "x": 4313.7529296875, + "y": 4774.91015625, + "type": "orientation" }, { "x": 4313.7529296875, @@ -27,13 +25,13 @@ "x": 4285.86669921875, "y": 4791.9169921875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4212.12548828125, "y": 4820.1083984375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { @@ -85,6 +83,12 @@ "move_mode": "walk", "#": "2" }, + { + "x": 4188.525390625, + "y": 4676.29345703125, + "type": "orientation", + "move_mode": "walk" + }, { "x": 4188.525390625, "y": 4676.29345703125, @@ -112,9 +116,9 @@ "move_mode": "run" }, { - "x": 4210.02294921875, - "y": 4627.853515625, - "type": "path", + "x": 4216.02392578125, + "y": 4628.65380859375, + "type": "orientation", "move_mode": "walk" }, @@ -133,6 +137,12 @@ "#": "4" }, + { + "x": 4202.34814453125, + "y": 4620.67626953125, + "type": "orientation", + "move_mode": "walk" + }, { "x": 4202.34814453125, "y": 4620.67626953125, @@ -140,22 +150,22 @@ "move_mode": "run" }, { - "x": 4207.35888671875, - "y": 4618.669921875, + "x": 4207.314453125, + "y": 4618.18701171875, "type": "orientation", "move_mode": "walk" }, { - "x": 4207.35888671875, - "y": 4618.669921875, + "x": 4207.35, + "y": 4618.45, "type": "target", "move_mode": "walk", "#": "5 6" }, { - "x": 4207.25244140625, - "y": 4619.9873046875, + "x": 4207.35888671875, + "y": 4618.669921875, "type": "target", "move_mode": "walk", "#": "5 6" @@ -204,7 +214,7 @@ "x": 4117.1728515625, "y": 4661.068359375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4114.39453125, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json index a205ba8c..618911c1 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json @@ -14,8 +14,13 @@ "move_mode": "walk" }, { - "x": 4511.11669921875, - "y": 4714.876953125, + "x": 4566.91064453125, + "y": 4733.60009765625, + "type": "orientation" + }, + { + "x": 4512.52001953125, + "y": 4715.357421875, "type": "path", "move_mode": "run" }, diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json index 24c8947f..e02062ec 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json @@ -38,7 +38,7 @@ "type": "path", "move_mode": "walk", "action": "combat_script", - "action_params": "keypress(VK_SPACE),wait(5),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", + "action_params": "keypress(VK_SPACE),wait(6),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", "//": "降落，起跳" }, diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json index 1e1acf0e..0245c705 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json @@ -206,9 +206,9 @@ "y": -1400.533203125, "type": "path", "move_mode": "fly", - "action": "combat_script", - "action_params": "keypress(VK_SPACE),wait(0.2),click", - "//": "stop_flying" + "_action": "combat_script", + "_action_params": "keypress(VK_SPACE),wait(0.2),click", + "//": "no stop_flying" }, { "x": 8140.86962890625,