From 457393ed400ff299ddcbb88087792cf9dfaa9df1 Mon Sep 17 00:00:00 2001 From: Yang-z Date: Sun, 26 Jan 2025 11:07:45 +0800 Subject: [PATCH] update autoArtifacts - add a setting to make active-restoration optional - optimize some paths - fine-tune some points --- ...-3个-f.json => 狗粮-璃月-珉林-奥藏山南-2个／3个-f.json} | 36 +++-- .../狗粮-纳塔-镜璧山-七天神像下-3个-f.json | 79 +++++++++++ .../狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json} | 6 +- .../狗粮-枫丹-白露区-秋分山东侧-2个-f.json | 3 +- .../狗粮-枫丹-研究院区-中部塔内-9个.json | 12 +- .../狗粮-枫丹-研究院区-西北-6个／7个.json | 26 ++-- .../狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json | 8 +- .../狗粮-稻妻-清籁岛-平海砦西-8个-f.json | 8 +- .../狗粮-稻妻-清籁岛-越石村-8个-f.json | 28 +--- .../狗粮-稻妻-神无冢-东-5个／6个-f.json | 33 ++--- .../狗粮-稻妻-神无冢-堇色之庭-4个.json | 10 +- .../狗粮-稻妻-鹤观-东偏中-2个-f.json | 16 +-- repo/js/AutoArtifacts_A_B_Extra/main.js | 23 ++-- repo/js/AutoArtifacts_A_B_Extra/manifest.json | 2 +- repo/js/AutoArtifacts_A_B_Extra/settings.json | 10 ++ .../备选}/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json | 0 ...-3个／5个.json => 狗粮-须弥-千壑沙地-塔尼特露营地-4个／6个.json} | 126 ++++++------------ ...南-3个-f.json => 狗粮-璃月-珉林-奥藏山南-2个／3个-f.json} | 36 +++-- .../狗粮-纳塔-镜璧山-七天神像下-3个-f.json | 79 +++++++++++ .../狗粮-须弥-下风蚀地-阿如村-北-1个-f.json | 34 ----- .../狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json} | 6 +- .../狗粮-枫丹-白露区-秋分山东侧-2个-f.json | 3 +- .../狗粮-枫丹-研究院区-中部塔内-9个.json | 12 +- .../狗粮-枫丹-研究院区-西北-6个／7个.json | 26 ++-- .../狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json | 8 +- .../狗粮-稻妻-清籁岛-平海砦西-8个-f.json | 8 +- .../狗粮-稻妻-清籁岛-越石村-8个-f.json | 28 +--- .../狗粮-稻妻-神无冢-东-5个／6个-f.json | 33 ++--- .../狗粮-稻妻-神无冢-堇色之庭-4个.json | 10 +- .../狗粮-稻妻-鹤观-东偏中-2个-f.json | 16 +-- 30 files changed, 386 insertions(+), 339 deletions(-) rename repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/{狗粮-璃月-珉林-奥藏山南-3个-f.json => 狗粮-璃月-珉林-奥藏山南-2个／3个-f.json} (69%) create mode 100644 repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json rename repo/{pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个-f.json => js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json} (99%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z => pathing/圣遗物/狗粮A线@Yang-z/备选}/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json (100%) rename repo/pathing/圣遗物/狗粮A线@Yang-z/备选/{狗粮-须弥-千壑沙地-塔尼特露营地-3个／5个.json => 狗粮-须弥-千壑沙地-塔尼特露营地-4个／6个.json} (57%) rename repo/pathing/圣遗物/狗粮A线@Yang-z/{狗粮-璃月-珉林-奥藏山南-3个-f.json => 狗粮-璃月-珉林-奥藏山南-2个／3个-f.json} (69%) create mode 100644 repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json delete mode 100644 repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个-f.json => pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json} (99%) diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-3个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-2个／3个-f.json similarity index 69% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-3个-f.json rename to repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-2个／3个-f.json index 0aa1df3b..e477e834 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-3个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-2个／3个-f.json @@ -12,14 +12,14 @@ "move_mode": "walk" }, { - "x": 1489.5419921875, - "y": 1046.02001953125, + "x": 1488.1298828125, + "y": 1045.87060546875, "type": "path", "move_mode": "run" }, { - "x": 1495.12890625, - "y": 1048.1572265625, + "x": 1495.365234375, + "y": 1048.619140625, "type": "target", "move_mode": "walk", "action": "", @@ -27,23 +27,39 @@ }, { - "x": 1510.791015625, - "y": 1035.6220703125, + "x": 1496.275390625, + "y": 1046.14794921875, "type": "path", - "move_mode": "run" + "move_mode": "walk" + }, + { + "x": 1505.380859375, + "y": 1040.8408203125, + "type": "path", + "move_mode": "walk" + }, + { + "x": 1507.3564453125, + "y": 1041.5107421875, + "type": "path", + "move_mode": "walk" }, { - "x": 1510.322265625, - "y": 1043.10107421875, + "x": 1509.87890625, + "y": 1043.0966796875, "type": "target", "move_mode": "walk", "action": "", "No.": "2" - }, + } + + ], + + "positions_not_actived": [ { "x": 1451.478515625, "y": 1028.56396484375, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json new file mode 100644 index 00000000..dd7f63c2 --- /dev/null +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json @@ -0,0 +1,79 @@ +{ + "info": { + "name": "", + "type": "collect", + "author":"Yang-z" + }, + "positions": [ + { + "x": 9520.5634765625, + "y": -1779.60302734375, + "type": "teleport", + "move_mode": "walk", + "action": "force_tp" + }, + { + "x": 9545.9140625, + "y": -1774.8564453125, + "type": "path", + "move_mode": "walk" + }, + { + "x": 9544.2265625, + "y": -1765.392578125, + "type": "path", + "move_mode": "fly", + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" + }, + + { + "x": 9542.546875, + "y": -1764.77685546875, + "type": "target", + "move_mode": "walk", + "#": "1" + }, + + { + "x": 9545.076171875, + "y": -1766.88134765625, + "type": "path", + "move_mode": "walk" + }, + { + "x": 9541.2958984375, + "y": -1771.8271484375, + "type": "path", + "move_mode": "walk" + }, + + { + "x": 9540.861328125, + "y": -1782.04150390625, + "type": "target", + "move_mode": "walk", + "#": "2" + }, + { + "x": 9539.1494140625, + "y": -1781.53076171875, + "type": "path", + "move_mode": "walk" + }, + { + "x": 9535.1435546875, + "y": -1777.7138671875, + "type": "target", + "move_mode": "walk", + "#": "3" + }, + { + "x": 9532.529296875, + "y": -1777.7744140625, + "type": "path", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json similarity index 99% rename from repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个-f.json rename to repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json index 88a55508..a2e24e14 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json @@ -168,8 +168,10 @@ "No.": "6" } - ], + + + "positions_not_actived": [ { "x": 3760.6845703125, @@ -194,7 +196,7 @@ "y": -791.34326171875, "type": "target", "move_mode": "walk", - "action":"pick_around", + "action":"", "NO.": "7 (重兵把守，不去)" } ] diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个-f.json index 55cee405..3e96e611 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个-f.json @@ -30,7 +30,8 @@ "y": 2526.17431640625, "type": "target", "move_mode": "run", - "action":"", + "action": "combat_script", + "action_params": "wait(0.8)", "#" : "2" } ] 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 342bcd71..86ed248b 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 @@ -136,8 +136,8 @@ }, { - "x": 4397.99755859375, - "y": 4928.9580078125, + "x": 4398.13671875, + "y": 4928.1826171875, "type": "path", "move_mode": "walk" }, @@ -185,14 +185,14 @@ }, { - "x": 4406.68798828125, - "y": 4927.37353515625, + "x": 4405.81787109375, + "y": 4927.55078125, "type": "path", "move_mode": "walk" }, { - "x": 4401.42578125, - "y": 4921.8740234375, + "x": 4403.23828125, + "y": 4922.1796875, "type": "path", "move_mode": "walk" }, 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 391200a3..e8b216a1 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 @@ -83,32 +83,22 @@ "type": "path", "move_mode": "walk" }, - { - "x": 4705.22705078125, - "y": 4928.8642578125, + "x": 4731.576171875, + "y": 4946.5927734375, "type": "path", "move_mode": "run" }, { - "x": 4705.22705078125, - "y": 4928.8642578125, + "x": 4726.74853515625, + "y": 4935.31982421875, "type": "path", - "move_mode": "walk" - }, - { - "x": 4717.4814453125, - "y": 4929.82568359375, - "type": "path", - "move_mode": "walk" + "move_mode": "fly", + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.2),click", + "//": "stop_flying" }, - { - "x": 4720.4013671875, - "y": 4931.0986328125, - "type": "path", - "move_mode": "fly" - }, { "x": 4723.99169921875, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json index 6fb6acc9..1687c465 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json @@ -50,16 +50,12 @@ "#" : "2" }, - - { - "x": 4956.78759765625, - "y": 4451.00390625, + "x": 4953.875, + "y": 4448.837890625, "type": "path", "move_mode": "run" }, - - { "x": 4873.21484375, "y": 4377.4365234375, 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 88c406aa..cad0b0d4 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 @@ -126,14 +126,14 @@ }, { - "x": -4228.125, - "y": -4239.2822265625, + "x": -4227.126953125, + "y": -4241.9287109375, "type": "path", "move_mode": "run" }, { - "x": -4228.341796875, - "y": -4238.9560546875, + "x": -4228.68359375, + "y": -4237.1826171875, "type": "target", "move_mode": "walk", "action": "", 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 dd57e129..d0894bc1 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 @@ -41,16 +41,8 @@ }, { - "x": -3982.96484375, - "y": -4437.3515625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "2" - }, - { - "x": -3982.5927734375, - "y": -4437.373046875, + "x": -3983.2861328125, + "y": -4437.548828125, "type": "target", "move_mode": "walk", "action": "", @@ -163,10 +155,12 @@ }, { - "x": -3969.2734375, - "y": -4383.6376953125, + "x": -3969.388671875, + "y": -4383.3857421875, "type": "path", - "move_mode": "fly" + "move_mode": "fly", + "action": "combat_script", + "action_params": "keypress(VK_SPACE)" }, { "x": -3969.5478515625, @@ -175,14 +169,6 @@ "move_mode": "walk", "action": "", "#": "8" - }, - { - "x": -3969.2138671875, - "y": -4383.59375, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "8" } ] diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-东-5个／6个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-东-5个／6个-f.json index 4e7da690..f6f70f91 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-东-5个／6个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-东-5个／6个-f.json @@ -59,8 +59,8 @@ }, { - "x": -3439.7509765625, - "y": -3551.4111328125, + "x": -3445.89453125, + "y": -3544.0205078125, "type": "path", "move_mode": "fly", "action": "combat_script", @@ -68,39 +68,26 @@ "//": "stop_flying" }, { - "x": -3443.9296875, - "y": -3552.51953125, - "type": "path", - "move_mode": "walk" - }, - { - "x": -3446.1787109375, - "y": -3553.0732421875, - "type": "target", - "move_mode": "fly", - "#" : "4" - }, - { - "x": -3446.853515625, - "y": -3553.337890625, + "x": -3446.6904296875, + "y": -3550.2265625, "type": "target", "move_mode": "walk" }, { - "x": -3445.0634765625, - "y": -3554.5224609375, - "type": "path", - "move_mode": "walk" + "x": -3445.5810546875, + "y": -3553.40625, + "type": "target", + "move_mode": "walk", + "#" : "4" }, - { "x": -3435.5322265625, "y": -3566.9013671875, "type": "target", "move_mode": "run", "action": "combat_script", - "action_params": "wait(0.8)", + "action_params": "wait(0.5)", "#" : "5" } 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 4e11d057..eec76daa 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 @@ -102,8 +102,8 @@ }, { - "x": -3987.6181640625, - "y": -3228.1220703125, + "x": -3988.2529296875, + "y": -3229.8310546875, "type": "target", "move_mode": "walk", "action": "combat_script", @@ -111,9 +111,9 @@ "#": 4 }, { - "x": -3988.51953125, - "y": -3231.46875, - "type": "target", + "x": -3986.27734375, + "y": -3233.6826171875, + "type": "path", "move_mode": "walk" } diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json index 43b723c3..7a4f6033 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json @@ -25,22 +25,22 @@ }, { - "x": -3034.861328125, - "y": -6182.2666015625, + "x": -3034.7744140625, + "y": -6181.5390625, "type": "target", "move_mode": "walk", - "action": "" + "#": "1" }, { - "x": -3032.9755859375, - "y": -6182.5380859375, + "x": -3032.583984375, + "y": -6182.5283203125, "type": "target", "move_mode": "walk", - "action": "" + "#": "2" }, { - "x": -3035.11328125, - "y": -6182.3037109375, + "x": -3030.5546875, + "y": -6181.2529296875, "type": "path", "move_mode": "walk" } diff --git a/repo/js/AutoArtifacts_A_B_Extra/main.js b/repo/js/AutoArtifacts_A_B_Extra/main.js index 05faa205..b06aa430 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/main.js +++ b/repo/js/AutoArtifacts_A_B_Extra/main.js @@ -9,20 +9,20 @@ "狗粮-璃月-碧水源-盐中之地-3个-f.json", "狗粮-璃月-珉林-东北-9个-f.json", "狗粮-璃月-珉林-北-5个.json", - "狗粮-璃月-珉林-奥藏山南-3个-f.json", + "狗粮-璃月-珉林-奥藏山南-2个／3个-f.json", "狗粮-璃月-珉林-绝云间-3个-m.json", "（恢复）狗粮-璃月-琼玑野.json", "狗粮-璃月-琼玑野-绿华池-3个-f.json", "狗粮-须弥-须弥城-4个.json", "狗粮-须弥-二净甸-七天神像-4个／8个.json", - "狗粮-须弥-二净甸-觉王之殿南-6个-f.json", + "狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json", "（恢复）狗粮-须弥-失落的苗圃.json", "狗粮-须弥-失落的苗圃-南-8个-f.json", - "狗粮-须弥-下风蚀地-阿如村-北-1个-f.json", "狗粮-纳塔-万火之瓯-竞技场东-2个／4个-f.json", "狗粮-纳塔-涌流地-流泉之众-4个.json", "（恢复）狗粮-纳塔-涌流地.json", "狗粮-纳塔-镜璧山-南-9个-f.json", + "狗粮-纳塔-镜璧山-七天神像下-3个-f.json", "狗粮-纳塔-翘枝崖-北-6个-f.json", "狗粮-纳塔-奥奇卡纳塔-七天神像-14个.json", "狗粮-纳塔-奥奇卡纳塔-流灰之街-4个-f.json", @@ -31,7 +31,7 @@ "【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个-f.json", "【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json", "【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json" - ]; // 97+21个 + ]; // 98+21个 const pathingB = [ "狗粮-枫丹-枫丹庭区-3个.json", @@ -78,8 +78,8 @@ ]; // 13个 // 每日拾取点位数及耗时 - // A: 97 + 21 + 8 + 10 = 136 (~47 minutes) - // B: 97 + 20 + 8 + 13 = 138 (~45 minutes) + // A: 98 + 21 + 8 + 10 = 137 ~(34 + 12 = 46 minutes) + // B: 97 + 20 + 8 + 13 = 138 ~(33 + 12 = 45 minutes) // 读取用户设置 @@ -90,8 +90,10 @@ let autoSalvage = settings.autoSalvage != undefined && settings.autoSalvage != '是' ? false : true; let autoSalvage4 = settings.autoSalvage4 != undefined && settings.autoSalvage4 != '否' ? true : false; let autoSalvageSpan = settings.autoSalvageSpan != undefined && ~~settings.autoSalvageSpan > 0 ? ~~settings.autoSalvageSpan : 10; + let activeRestore = settings.activeRestore != undefined && settings.activeRestore != '是' ? false : true; - log.debug(`path: ${path}; swapPath: ${swapPath}; extra: ${extra}; extraAB: ${extraAB}; autoSalvage: ${autoSalvage}; autoSalvage4: ${autoSalvage4}; autoSalvageSpan: ${autoSalvageSpan};`); + + log.debug(`path: ${path}; swapPath: ${swapPath}; extra: ${extra}; extraAB: ${extraAB}; autoSalvage: ${autoSalvage}; autoSalvage4: ${autoSalvage4}; autoSalvageSpan: ${autoSalvageSpan}; activeRestore: ${activeRestore};`); // await sleep(30000); // 路线 @@ -155,10 +157,12 @@ // 单一脚本执行 async function runFile(filePath, times = 2) { - log.info(filePath); try { + // 如关闭主动去神像恢复，则依赖队伍配置持续恢复角色，及bgi的低血量被动恢复 + let isToRestore = filePath.search("（恢复）") != -1; + if (isToRestore && !activeRestore) return; + // 暂不支持关闭自动拾取 - // let isToRestore = filePath.search("（恢复）") != -1; // if (isToRestore) dispatcher.removeTimer(...); // else... @@ -175,6 +179,7 @@ if (shouldResizeMap) await resizeMap(); times--; + log.info(filePath); await pathingScript.runFile(filePath); } catch (error) { // bgi已捕获可预期异常，此处仅做兜底 diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index e7da3ca5..edeab9f1 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.1.4", + "version": "2.2.0", "bgi_version": "0.38.1", "description": "圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。", "authors": [ diff --git a/repo/js/AutoArtifacts_A_B_Extra/settings.json b/repo/js/AutoArtifacts_A_B_Extra/settings.json index 18e542e6..ef0146b9 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/settings.json +++ b/repo/js/AutoArtifacts_A_B_Extra/settings.json @@ -60,5 +60,15 @@ "name": "autoSalvageSpan", "type": "input-text", "label": "自动分解在多少路径后执行一次（默认：10）" + }, + + { + "name": "activeRestore", + "type": "select", + "label": "主动去神像恢复（默认：是）", + "options": [ + "是", + "否" + ] } ] \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json similarity index 100% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-须弥-千壑沙地-塔尼特露营地-3个／5个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-须弥-千壑沙地-塔尼特露营地-4个／6个.json similarity index 57% rename from repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-须弥-千壑沙地-塔尼特露营地-3个／5个.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-须弥-千壑沙地-塔尼特露营地-4个／6个.json index 51f9a248..46d7daef 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-须弥-千壑沙地-塔尼特露营地-3个／5个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-须弥-千壑沙地-塔尼特露营地-4个／6个.json @@ -7,135 +7,87 @@ "positions": [ { - "x": 5063.70263671875, - "y": -1587.78515625, + "x": 5063.78662109375, + "y": -1587.7099609375, "type": "teleport", "move_mode": "walk" }, { - "x": 5095.08740234375, - "y": -1547.1875, + "x": 5093.35791015625, + "y": -1546.265625, "type": "path", "move_mode": "fly", "action": "stop_flying" }, { - "x": 5098.50439453125, - "y": -1542.10205078125, + "x": 5097.888671875, + "y": -1541.68798828125, "type": "target", "move_mode": "walk", - "action": "", "#": "1" }, - { - "x": 5101.54736328125, - "y": -1542.041015625, - "type": "path", - "move_mode": "walk" - }, - { - "x": 5098.45361328125, - "y": -1541.93701171875, - "type": "path", - "move_mode": "walk" - }, - { - "x": 5096.35107421875, - "y": -1543.46240234375, - "type": "path", - "move_mode": "walk" - }, { - "x": 5095.0478515625, - "y": -1560.07080078125, + "x": 5082.39697265625, + "y": -1556.51611328125, "type": "path", "move_mode": "run" }, { - "x": 5115.654296875, - "y": -1579.087890625, + "x": 5064.29833984375, + "y": -1580.19775390625, "type": "path", "move_mode": "fly", "action": "stop_flying" }, { - "x": 5119.06494140625, - "y": -1575.28662109375, - "type": "path", - "move_mode": "walk" - }, - { - "x": 5119.556640625, - "y": -1570.14306640625, + "x": 5064.29833984375, + "y": -1580.19775390625, "type": "target", "move_mode": "walk", - "action": "", "#": "2" }, + { - "x": 5118.291015625, - "y": -1569.4208984375, + "x": 5070.91015625, + "y": -1575.80419921875, "type": "path", "move_mode": "walk" }, { - "x": 5122.73681640625, - "y": -1568.61767578125, - "type": "path", - "move_mode": "walk" - }, - - - { - "x": 5124.4140625, - "y": -1579.7197265625, + "x": 5114.79345703125, + "y": -1569.8623046875, "type": "path", "move_mode": "run" }, { - "x": 5074.4140625, - "y": -1577.09033203125, + "x": 5119.69091796875, + "y": -1569.5595703125, + "type": "target", + "move_mode": "walk", + "#": "3" + }, + + { + "x": 5125.9716796875, + "y": -1570, + "type": "path", + "move_mode": "walk" + }, + { + "x": 5163.4697265625, + "y": -1561.7490234375, "type": "path", "move_mode": "run" }, { - "x": 5068.55224609375, - "y": -1577.5400390625, - "type": "path", - "move_mode": "walk" - }, - { - "x": 5064.50537109375, - "y": -1579.88525390625, + "x": 5170.14501953125, + "y": -1559.32421875, "type": "target", "move_mode": "walk", - "action": "", - "#": "3" - }, - { - "x": 5064.50537109375, - "y": -1579.88525390625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "3" - }, - { - "x": 5064.50537109375, - "y": -1579.88525390625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "3" - }, - { - "x": 5063.34375, - "y": -1580.521484375, - "type": "path", - "move_mode": "walk" + "#": "4" } - + ], @@ -180,7 +132,7 @@ "y": -1494.58642578125, "type": "target", "move_mode": "walk", - "action": "pick_around" + "action": "" }, { "x": 4966.5419921875, @@ -199,7 +151,7 @@ "y": -1408.6962890625, "type": "target", "move_mode": "walk", - "action": "pick_around" + "action": "" }, { "x": 5026.16552734375, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-3个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-2个／3个-f.json similarity index 69% rename from repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-3个-f.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-2个／3个-f.json index 0aa1df3b..e477e834 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-3个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-奥藏山南-2个／3个-f.json @@ -12,14 +12,14 @@ "move_mode": "walk" }, { - "x": 1489.5419921875, - "y": 1046.02001953125, + "x": 1488.1298828125, + "y": 1045.87060546875, "type": "path", "move_mode": "run" }, { - "x": 1495.12890625, - "y": 1048.1572265625, + "x": 1495.365234375, + "y": 1048.619140625, "type": "target", "move_mode": "walk", "action": "", @@ -27,23 +27,39 @@ }, { - "x": 1510.791015625, - "y": 1035.6220703125, + "x": 1496.275390625, + "y": 1046.14794921875, "type": "path", - "move_mode": "run" + "move_mode": "walk" + }, + { + "x": 1505.380859375, + "y": 1040.8408203125, + "type": "path", + "move_mode": "walk" + }, + { + "x": 1507.3564453125, + "y": 1041.5107421875, + "type": "path", + "move_mode": "walk" }, { - "x": 1510.322265625, - "y": 1043.10107421875, + "x": 1509.87890625, + "y": 1043.0966796875, "type": "target", "move_mode": "walk", "action": "", "No.": "2" - }, + } + + ], + + "positions_not_actived": [ { "x": 1451.478515625, "y": 1028.56396484375, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json new file mode 100644 index 00000000..dd7f63c2 --- /dev/null +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json @@ -0,0 +1,79 @@ +{ + "info": { + "name": "", + "type": "collect", + "author":"Yang-z" + }, + "positions": [ + { + "x": 9520.5634765625, + "y": -1779.60302734375, + "type": "teleport", + "move_mode": "walk", + "action": "force_tp" + }, + { + "x": 9545.9140625, + "y": -1774.8564453125, + "type": "path", + "move_mode": "walk" + }, + { + "x": 9544.2265625, + "y": -1765.392578125, + "type": "path", + "move_mode": "fly", + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.5),click", + "//": "stop_flying" + }, + + { + "x": 9542.546875, + "y": -1764.77685546875, + "type": "target", + "move_mode": "walk", + "#": "1" + }, + + { + "x": 9545.076171875, + "y": -1766.88134765625, + "type": "path", + "move_mode": "walk" + }, + { + "x": 9541.2958984375, + "y": -1771.8271484375, + "type": "path", + "move_mode": "walk" + }, + + { + "x": 9540.861328125, + "y": -1782.04150390625, + "type": "target", + "move_mode": "walk", + "#": "2" + }, + { + "x": 9539.1494140625, + "y": -1781.53076171875, + "type": "path", + "move_mode": "walk" + }, + { + "x": 9535.1435546875, + "y": -1777.7138671875, + "type": "target", + "move_mode": "walk", + "#": "3" + }, + { + "x": 9532.529296875, + "y": -1777.7744140625, + "type": "path", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json deleted file mode 100644 index 955ca2f5..00000000 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-北-1个-f.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "info": { - "name": "", - "type": "collect", - "author":"Yang-z" - }, - "positions": [ - { - "x": 4271.57421875, - "y": -1666.736328125, - "type": "teleport", - "move_mode": "walk" - }, - { - "x": 4283.01953125, - "y": -1671.53515625, - "type": "path", - "move_mode": "run" - }, - { - "x": 4286.05810546875, - "y": -1672.95751953125, - "type": "target", - "move_mode": "walk", - "action":"" - }, - { - "x": 4287.4296875, - "y": -1670.16015625, - "type": "path", - "move_mode": "walk" - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json similarity index 99% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个-f.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json index 88a55508..a2e24e14 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json @@ -168,8 +168,10 @@ "No.": "6" } - ], + + + "positions_not_actived": [ { "x": 3760.6845703125, @@ -194,7 +196,7 @@ "y": -791.34326171875, "type": "target", "move_mode": "walk", - "action":"pick_around", + "action":"", "NO.": "7 (重兵把守，不去)" } ] diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个-f.json index 55cee405..3e96e611 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个-f.json @@ -30,7 +30,8 @@ "y": 2526.17431640625, "type": "target", "move_mode": "run", - "action":"", + "action": "combat_script", + "action_params": "wait(0.8)", "#" : "2" } ] diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json index 342bcd71..86ed248b 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json @@ -136,8 +136,8 @@ }, { - "x": 4397.99755859375, - "y": 4928.9580078125, + "x": 4398.13671875, + "y": 4928.1826171875, "type": "path", "move_mode": "walk" }, @@ -185,14 +185,14 @@ }, { - "x": 4406.68798828125, - "y": 4927.37353515625, + "x": 4405.81787109375, + "y": 4927.55078125, "type": "path", "move_mode": "walk" }, { - "x": 4401.42578125, - "y": 4921.8740234375, + "x": 4403.23828125, + "y": 4922.1796875, "type": "path", "move_mode": "walk" }, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json index 391200a3..e8b216a1 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json @@ -83,32 +83,22 @@ "type": "path", "move_mode": "walk" }, - { - "x": 4705.22705078125, - "y": 4928.8642578125, + "x": 4731.576171875, + "y": 4946.5927734375, "type": "path", "move_mode": "run" }, { - "x": 4705.22705078125, - "y": 4928.8642578125, + "x": 4726.74853515625, + "y": 4935.31982421875, "type": "path", - "move_mode": "walk" - }, - { - "x": 4717.4814453125, - "y": 4929.82568359375, - "type": "path", - "move_mode": "walk" + "move_mode": "fly", + "action": "combat_script", + "action_params": "keypress(VK_SPACE),wait(0.2),click", + "//": "stop_flying" }, - { - "x": 4720.4013671875, - "y": 4931.0986328125, - "type": "path", - "move_mode": "fly" - }, { "x": 4723.99169921875, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json index 6fb6acc9..1687c465 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-芒索斯山东-3个-f.json @@ -50,16 +50,12 @@ "#" : "2" }, - - { - "x": 4956.78759765625, - "y": 4451.00390625, + "x": 4953.875, + "y": 4448.837890625, "type": "path", "move_mode": "run" }, - - { "x": 4873.21484375, "y": 4377.4365234375, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个-f.json index 88c406aa..cad0b0d4 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个-f.json @@ -126,14 +126,14 @@ }, { - "x": -4228.125, - "y": -4239.2822265625, + "x": -4227.126953125, + "y": -4241.9287109375, "type": "path", "move_mode": "run" }, { - "x": -4228.341796875, - "y": -4238.9560546875, + "x": -4228.68359375, + "y": -4237.1826171875, "type": "target", "move_mode": "walk", "action": "", diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json index dd57e129..d0894bc1 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json @@ -41,16 +41,8 @@ }, { - "x": -3982.96484375, - "y": -4437.3515625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "2" - }, - { - "x": -3982.5927734375, - "y": -4437.373046875, + "x": -3983.2861328125, + "y": -4437.548828125, "type": "target", "move_mode": "walk", "action": "", @@ -163,10 +155,12 @@ }, { - "x": -3969.2734375, - "y": -4383.6376953125, + "x": -3969.388671875, + "y": -4383.3857421875, "type": "path", - "move_mode": "fly" + "move_mode": "fly", + "action": "combat_script", + "action_params": "keypress(VK_SPACE)" }, { "x": -3969.5478515625, @@ -175,14 +169,6 @@ "move_mode": "walk", "action": "", "#": "8" - }, - { - "x": -3969.2138671875, - "y": -4383.59375, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "8" } ] diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-东-5个／6个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-东-5个／6个-f.json index 4e7da690..f6f70f91 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-东-5个／6个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-东-5个／6个-f.json @@ -59,8 +59,8 @@ }, { - "x": -3439.7509765625, - "y": -3551.4111328125, + "x": -3445.89453125, + "y": -3544.0205078125, "type": "path", "move_mode": "fly", "action": "combat_script", @@ -68,39 +68,26 @@ "//": "stop_flying" }, { - "x": -3443.9296875, - "y": -3552.51953125, - "type": "path", - "move_mode": "walk" - }, - { - "x": -3446.1787109375, - "y": -3553.0732421875, - "type": "target", - "move_mode": "fly", - "#" : "4" - }, - { - "x": -3446.853515625, - "y": -3553.337890625, + "x": -3446.6904296875, + "y": -3550.2265625, "type": "target", "move_mode": "walk" }, { - "x": -3445.0634765625, - "y": -3554.5224609375, - "type": "path", - "move_mode": "walk" + "x": -3445.5810546875, + "y": -3553.40625, + "type": "target", + "move_mode": "walk", + "#" : "4" }, - { "x": -3435.5322265625, "y": -3566.9013671875, "type": "target", "move_mode": "run", "action": "combat_script", - "action_params": "wait(0.8)", + "action_params": "wait(0.5)", "#" : "5" } diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json index 4e11d057..eec76daa 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json @@ -102,8 +102,8 @@ }, { - "x": -3987.6181640625, - "y": -3228.1220703125, + "x": -3988.2529296875, + "y": -3229.8310546875, "type": "target", "move_mode": "walk", "action": "combat_script", @@ -111,9 +111,9 @@ "#": 4 }, { - "x": -3988.51953125, - "y": -3231.46875, - "type": "target", + "x": -3986.27734375, + "y": -3233.6826171875, + "type": "path", "move_mode": "walk" } diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json index 43b723c3..7a4f6033 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json @@ -25,22 +25,22 @@ }, { - "x": -3034.861328125, - "y": -6182.2666015625, + "x": -3034.7744140625, + "y": -6181.5390625, "type": "target", "move_mode": "walk", - "action": "" + "#": "1" }, { - "x": -3032.9755859375, - "y": -6182.5380859375, + "x": -3032.583984375, + "y": -6182.5283203125, "type": "target", "move_mode": "walk", - "action": "" + "#": "2" }, { - "x": -3035.11328125, - "y": -6182.3037109375, + "x": -3030.5546875, + "y": -6181.2529296875, "type": "path", "move_mode": "walk" }