From 8945aa623b06daed7be3e1f6ac56930bfa97d50b Mon Sep 17 00:00:00 2001 From: Yang-z Date: Fri, 29 Nov 2024 14:59:32 +0800 Subject: [PATCH] update artifacts pathing and js scripts --- ...收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json | 30 ++++---- ...收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json | 6 ++ .../狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json | 30 +++++--- .../狗粮-纳塔-翘枝崖-北-6个.json | 26 +++++-- .../狗粮-须弥-失落的苗圃-南-8个.json | 14 +++- .../【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json | 9 ++- .../狗粮-枫丹-研究院区-西北-6个／7个.json | 51 +++++++++++--- .../狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json | 2 +- .../assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json} | 18 +++-- .../assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json} | 15 ++-- repo/js/AutoArtifacts_A_B_Extra/main.js | 19 ++--- repo/js/AutoArtifacts_A_B_Extra/manifest.json | 2 +- repo/js/AutoArtifacts_A_B_Extra/settings.json | 11 +-- .../【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json | 30 ++++---- .../【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json | 6 ++ .../狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json | 30 +++++--- .../狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json | 26 +++++-- .../狗粮-须弥-失落的苗圃-南-8个.json | 14 +++- .../【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json | 9 ++- .../备选/狗粮-枫丹-研究院区-东-3个（重兵把守）.json} | 0 .../备选}/狗粮-枫丹-莫尔泰区-七天神像-1个.json | 20 ++++-- .../狗粮-枫丹-研究院区-东-3个.json | 70 ------------------- .../狗粮-枫丹-研究院区-西北-6个／7个.json | 51 +++++++++++--- .../狗粮-枫丹-莫尔泰区-七天神像-1个.json | 55 --------------- .../狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json | 2 +- .../狗粮-稻妻-鹤观-东偏中-2个.json | 43 ++++++++++++ .../狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json | 43 ++++++++++++ 27 files changed, 384 insertions(+), 248 deletions(-) rename repo/{pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-稻妻-鹤观-东北-2个（无法就近传送）.json => js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json} (71%) rename repo/{pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-稻妻-鹤观-南-2个（远）.json => js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json} (71%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json => pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-枫丹-研究院区-东-3个（重兵把守）.json} (100%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z => pathing/圣遗物/狗粮B线@Yang-z/备选}/狗粮-枫丹-莫尔泰区-七天神像-1个.json (71%) delete mode 100644 repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json delete mode 100644 repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-莫尔泰区-七天神像-1个.json create mode 100644 repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json create mode 100644 repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json index 251b0b90..7ce3c08d 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json @@ -89,8 +89,8 @@ "#": "3" }, { - "x": -3209.9853515625, - "y": -3604.7265625, + "x": -3211.962890625, + "y": -3603.951171875, "type": "target", "move_mode": "walk", "action": "", @@ -166,24 +166,30 @@ "move_mode": "walk" }, { - "x": -3154.5869140625, - "y": -3833.73828125, + "x": -3170.4130859375, + "y": -3850.8359375, "type": "path", "move_mode": "run" }, { - "x": -3145.6025390625, - "y": -3775.583984375, - "type": "path", - "move_mode": "fly" - }, - { - "x": -3149.576171875, - "y": -3829.484375, + "x": -3168.654296875, + "y": -3839.994140625, "type": "path", "move_mode": "fly", "action": "stop_flying" }, + { + "x": -3151.0654296875, + "y": -3842.669921875, + "type": "path", + "move_mode": "run" + }, + { + "x": -3149.3564453125, + "y": -3837.0224609375, + "type": "path", + "move_mode": "run" + }, { "x": -3152.970703125, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json index 383ebf8e..085b78b3 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json @@ -408,6 +408,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": -3027.904296875, + "y": -3641.369140625, + "type": "path", + "move_mode": "walk" + }, { "x": -3031.6767578125, "y": -3640.1640625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json index 39da6d81..91ef446f 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json @@ -100,8 +100,6 @@ "move_mode": "walk" }, - - { "x": 7727.3740234375, "y": -1545.806640625, @@ -109,33 +107,43 @@ "move_mode": "run" }, { - "x": 7738.97216796875, - "y": -1539.4287109375, + "x": 7732.88671875, + "y": -1542.5927734375, + "type": "path", + "move_mode": "run" + }, + { + "x": 7737.70751953125, + "y": -1541.71484375, + "type": "path", + "move_mode": "walk" + }, + + { + "x": 7739.0556640625, + "y": -1538.3515625, "type": "target", "move_mode": "walk", "action": "", "No.": "3" }, { - "x": 7738.73681640625, - "y": -1539.34033203125, + "x": 7738.9873046875, + "y": -1539.18212890625, "type": "target", "move_mode": "walk", "action": "", "No.": "3" }, { - "x": 7738.73681640625, - "y": -1539.34033203125, + "x": 7739.42822265625, + "y": -1539.6357421875, "type": "target", "move_mode": "walk", "action": "", "No.": "3" }, - - - { "x": 7735.0078125, "y": -1541.712890625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json index 3d012168..f7b669d8 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json @@ -26,12 +26,27 @@ "move_mode": "walk" }, { - "x": 9767.912109375, - "y": -806.7685546875, + "x": 9766.494140625, + "y": -804.9052734375, "type": "target", - "move_mode": "fly", + "move_mode": "walk" + }, + + { + "x": 9768.205078125, + "y": -806.55517578125, + "type": "target", + "move_mode": "walk", "#": "1" }, + { + "x": 9768.197265625, + "y": -806.56494140625, + "type": "target", + "move_mode": "walk", + "#": "1" + }, + { "x": 9766.7099609375, "y": -800.212890625, @@ -74,6 +89,7 @@ }, + { "x": 9719.1982421875, "y": -852.04931640625, @@ -88,8 +104,8 @@ "move_mode": "run" }, { - "x": 9700.9248046875, - "y": -871.435546875, + "x": 9701.865234375, + "y": -872.02490234375, "type": "target", "move_mode": "fly", "action": "stop_flying" diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个.json index 179fae2e..b7e2c676 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个.json @@ -148,6 +148,14 @@ "action": "", "#": "4" }, + { + "x": 4022.77783203125, + "y": -1058.47802734375, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "4" + }, { "x": 4025.650390625, @@ -215,10 +223,10 @@ "move_mode": "walk" }, { - "x": 3996.50048828125, - "y": -1052.4130859375, + "x": 3996.8916015625, + "y": -1052.46142578125, "type": "target", - "move_mode": "walk", + "move_mode": "run", "action": "", "#": "7" }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json index c26ee067..58509f4c 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json @@ -462,14 +462,18 @@ "#": "12" }, - - { "x": -3742.904296875, "y": -4436.3154296875, "type": "path", "move_mode": "walk" }, + { + "x": -3740.294921875, + "y": -4437.44921875, + "type": "target", + "move_mode": "walk" + }, { "x": -3738.1171875, "y": -4437.6005859375, @@ -482,6 +486,7 @@ "type": "path", "move_mode": "walk" }, + { "x": -3726.888671875, "y": -4433.171875, 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 cb79f617..d3bbe3dd 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 @@ -13,8 +13,8 @@ }, { - "x": 4611.33056640625, - "y": 4929.84326171875, + "x": 4609.60595703125, + "y": 4937.71826171875, "type": "path", "move_mode": "run" }, @@ -27,13 +27,19 @@ "#": "1" }, { - "x": 4605.20068359375, - "y": 4934.0498046875, + "x": 4604.48583984375, + "y": 4934.646484375, "type": "target", "move_mode": "walk", "action": "", "#": "1" }, + { + "x": 4609.60595703125, + "y": 4937.71826171875, + "type": "path", + "move_mode": "walk" + }, { "x": 4695.14013671875, @@ -47,22 +53,35 @@ "type": "path", "move_mode": "run" }, + { - "x": 4677.40771484375, - "y": 4998.9794921875, + "x": 4681.24267578125, + "y": 5003.5537109375, + "type": "path", + "move_mode": "walk" + }, + { + "x": 4678.181640625, + "y": 4999.17431640625, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, { - "x": 4678.38671875, - "y": 5000.13232421875, + "x": 4678.181640625, + "y": 4999.17431640625, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, + { + "x": 4688.0302734375, + "y": 4989.86865234375, + "type": "path", + "move_mode": "walk" + }, { "x": 4712.2392578125, @@ -90,6 +109,12 @@ "action": "", "#": "3" }, + { + "x": 4723.48974609375, + "y": 4933.87158203125, + "type": "path", + "move_mode": "walk" + }, { "x": 4706.38916015625, "y": 4924.84423828125, @@ -110,6 +135,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": 4737.34423828125, + "y": 4906.07568359375, + "type": "target", + "move_mode": "walk" + }, { "x": 4735.310546875, "y": 4902.712890625, @@ -119,8 +150,8 @@ "#": "4" }, { - "x": 4735.5859375, - "y": 4904.025390625, + "x": 4735.37744140625, + "y": 4902.59423828125, "type": "target", "move_mode": "walk", "action": "", diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json index 1ad5de1f..da40f229 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json @@ -62,7 +62,7 @@ { "x": -989.744140625, "y": -3705.7880859375, - "type": "path", + "type": "target", "move_mode": "walk" }, { diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-稻妻-鹤观-东北-2个（无法就近传送）.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json similarity index 71% rename from repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-稻妻-鹤观-东北-2个（无法就近传送）.json rename to repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json index e8b4440c..4221252c 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-稻妻-鹤观-东北-2个（无法就近传送）.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json @@ -12,26 +12,32 @@ "move_mode": "walk" }, - { - "x": -3040.3984375, - "y": -6180.708984375, + "x": -3037.77734375, + "y": -6187.048828125, "type": "path", - "move_mode": "walk" + "move_mode": "run" }, + { "x": -3034.861328125, "y": -6182.2666015625, "type": "target", "move_mode": "walk", - "action": "pick_around" + "action": "" }, { "x": -3032.9755859375, "y": -6182.5380859375, "type": "target", "move_mode": "walk", - "action": "pick_around" + "action": "" + }, + { + "x": -3035.11328125, + "y": -6182.3037109375, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-稻妻-鹤观-南-2个（远）.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json similarity index 71% rename from repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-稻妻-鹤观-南-2个（远）.json rename to repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json index 7269fff0..6a1cd95c 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-稻妻-鹤观-南-2个（远）.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json @@ -12,8 +12,8 @@ "move_mode": "walk" }, { - "x": -2589.5419921875, - "y": -6527.3603515625, + "x": -2581.470703125, + "y": -6529.7802734375, "type": "path", "move_mode": "fly", "action": "stop_flying" @@ -23,14 +23,21 @@ "y": -6529.7802734375, "type": "target", "move_mode": "walk", - "action": "pick_around" + "action": "" }, { "x": -2579.80859375, "y": -6533.02734375, "type": "target", "move_mode": "walk", - "action": "pick_around" + "action": "" + }, + + { + "x": -2582.0341796875, + "y": -6525.9619140625, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/main.js b/repo/js/AutoArtifacts_A_B_Extra/main.js index 946a2e67..eece04c6 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/main.js +++ b/repo/js/AutoArtifacts_A_B_Extra/main.js @@ -36,9 +36,7 @@ const pathingB = [ "狗粮-枫丹-白露区-秋分山东侧-2个.json", "狗粮-枫丹-白露区-秋分山西侧-北-2个.json", - "狗粮-枫丹-莫尔泰区-七天神像-1个.json", "狗粮-枫丹-伊黎耶林区-欧庇克莱歌剧院东南-2个.json", - "狗粮-枫丹-研究院区-东-3个.json", "（恢复）狗粮-枫丹-研究院区.json", "狗粮-枫丹-研究院区-学术会堂-1个／2个.json", "狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json", @@ -61,6 +59,8 @@ "狗粮-稻妻-清籁岛-越石村-8个.json", "狗粮-稻妻-清籁岛-平海砦西-8个.json", "狗粮-稻妻-鹤观-东-3个.json", + "狗粮-稻妻-鹤观-东偏中-2个.json", + "狗粮-稻妻-鹤观-南-2个.json", "（恢复）狗粮-稻妻-清籁岛.json", "【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json", "（恢复）狗粮-稻妻-清籁岛.json", @@ -73,16 +73,6 @@ ]; // 17个（其中纳塔第2个似乎是一次性的） - let tryTimes = 2; // 尝试次数 - function updateTryTimes() { - try { - tryTimes = ~~settings.tryTimes ? ~~settings.tryTimes : 2; - } catch (error) { - log.error(error.toString()); - } - log.debug(`全局尝试次数：${tryTimes}`); - } - let path = ''; // 路线 function determinePath() { try { @@ -136,13 +126,13 @@ } // 单一脚本执行 - async function runFile(filePath, times = tryTimes) { + async function runFile(filePath, times = 2) { log.info(filePath); try { times--; await pathingScript.runFile(filePath); } - catch (error) { + catch (error) { // bgi已捕获可预期异常，此处仅做兜底 log.error(error.toString()); await sleep(3000); if (times > 0) await runFile(filePath, times); @@ -162,7 +152,6 @@ } // main - updateTryTimes(); determinePath(); await init(); diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index 21f0e4ae..38296b38 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": "1.4.2", + "version": "1.5", "bgi_version": "0.37.1", "description": "圣遗物狗粮AB路线自动轮换，及额外点位拾取，途中自动分解。更新纳塔5.2优质点位。", "authors": [ diff --git a/repo/js/AutoArtifacts_A_B_Extra/settings.json b/repo/js/AutoArtifacts_A_B_Extra/settings.json index 866790a3..67293b8c 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/settings.json +++ b/repo/js/AutoArtifacts_A_B_Extra/settings.json @@ -1,9 +1,10 @@ [ - { - "name": "tryTimes", - "type": "input-text", - "label": "尝试次数" - }, + // bgi已捕获可预期异常并设置重试次数 + // { + // "name": "tryTimes", + // "type": "input-text", + // "label": "尝试次数" + // }, { "name": "path", diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json index 251b0b90..7ce3c08d 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json @@ -89,8 +89,8 @@ "#": "3" }, { - "x": -3209.9853515625, - "y": -3604.7265625, + "x": -3211.962890625, + "y": -3603.951171875, "type": "target", "move_mode": "walk", "action": "", @@ -166,24 +166,30 @@ "move_mode": "walk" }, { - "x": -3154.5869140625, - "y": -3833.73828125, + "x": -3170.4130859375, + "y": -3850.8359375, "type": "path", "move_mode": "run" }, { - "x": -3145.6025390625, - "y": -3775.583984375, - "type": "path", - "move_mode": "fly" - }, - { - "x": -3149.576171875, - "y": -3829.484375, + "x": -3168.654296875, + "y": -3839.994140625, "type": "path", "move_mode": "fly", "action": "stop_flying" }, + { + "x": -3151.0654296875, + "y": -3842.669921875, + "type": "path", + "move_mode": "run" + }, + { + "x": -3149.3564453125, + "y": -3837.0224609375, + "type": "path", + "move_mode": "run" + }, { "x": -3152.970703125, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json index 383ebf8e..085b78b3 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json @@ -408,6 +408,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": -3027.904296875, + "y": -3641.369140625, + "type": "path", + "move_mode": "walk" + }, { "x": -3031.6767578125, "y": -3640.1640625, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json index 39da6d81..91ef446f 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json @@ -100,8 +100,6 @@ "move_mode": "walk" }, - - { "x": 7727.3740234375, "y": -1545.806640625, @@ -109,33 +107,43 @@ "move_mode": "run" }, { - "x": 7738.97216796875, - "y": -1539.4287109375, + "x": 7732.88671875, + "y": -1542.5927734375, + "type": "path", + "move_mode": "run" + }, + { + "x": 7737.70751953125, + "y": -1541.71484375, + "type": "path", + "move_mode": "walk" + }, + + { + "x": 7739.0556640625, + "y": -1538.3515625, "type": "target", "move_mode": "walk", "action": "", "No.": "3" }, { - "x": 7738.73681640625, - "y": -1539.34033203125, + "x": 7738.9873046875, + "y": -1539.18212890625, "type": "target", "move_mode": "walk", "action": "", "No.": "3" }, { - "x": 7738.73681640625, - "y": -1539.34033203125, + "x": 7739.42822265625, + "y": -1539.6357421875, "type": "target", "move_mode": "walk", "action": "", "No.": "3" }, - - - { "x": 7735.0078125, "y": -1541.712890625, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json index 3d012168..f7b669d8 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-翘枝崖-北-6个.json @@ -26,12 +26,27 @@ "move_mode": "walk" }, { - "x": 9767.912109375, - "y": -806.7685546875, + "x": 9766.494140625, + "y": -804.9052734375, "type": "target", - "move_mode": "fly", + "move_mode": "walk" + }, + + { + "x": 9768.205078125, + "y": -806.55517578125, + "type": "target", + "move_mode": "walk", "#": "1" }, + { + "x": 9768.197265625, + "y": -806.56494140625, + "type": "target", + "move_mode": "walk", + "#": "1" + }, + { "x": 9766.7099609375, "y": -800.212890625, @@ -74,6 +89,7 @@ }, + { "x": 9719.1982421875, "y": -852.04931640625, @@ -88,8 +104,8 @@ "move_mode": "run" }, { - "x": 9700.9248046875, - "y": -871.435546875, + "x": 9701.865234375, + "y": -872.02490234375, "type": "target", "move_mode": "fly", "action": "stop_flying" diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个.json index 179fae2e..b7e2c676 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个.json @@ -148,6 +148,14 @@ "action": "", "#": "4" }, + { + "x": 4022.77783203125, + "y": -1058.47802734375, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "4" + }, { "x": 4025.650390625, @@ -215,10 +223,10 @@ "move_mode": "walk" }, { - "x": 3996.50048828125, - "y": -1052.4130859375, + "x": 3996.8916015625, + "y": -1052.46142578125, "type": "target", - "move_mode": "walk", + "move_mode": "run", "action": "", "#": "7" }, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json index c26ee067..58509f4c 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json @@ -462,14 +462,18 @@ "#": "12" }, - - { "x": -3742.904296875, "y": -4436.3154296875, "type": "path", "move_mode": "walk" }, + { + "x": -3740.294921875, + "y": -4437.44921875, + "type": "target", + "move_mode": "walk" + }, { "x": -3738.1171875, "y": -4437.6005859375, @@ -482,6 +486,7 @@ "type": "path", "move_mode": "walk" }, + { "x": -3726.888671875, "y": -4433.171875, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-枫丹-研究院区-东-3个（重兵把守）.json similarity index 100% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json rename to repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-枫丹-研究院区-东-3个（重兵把守）.json diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-莫尔泰区-七天神像-1个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-枫丹-莫尔泰区-七天神像-1个.json similarity index 71% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-莫尔泰区-七天神像-1个.json rename to repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-枫丹-莫尔泰区-七天神像-1个.json index b2ae36e4..8544e8a1 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-莫尔泰区-七天神像-1个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/狗粮-枫丹-莫尔泰区-七天神像-1个.json @@ -18,6 +18,18 @@ "move_mode": "run" }, + { + "x": 3591.27197265625, + "y": 3063.642578125, + "type": "path", + "move_mode": "run" + }, + { + "x": 3591.27197265625, + "y": 3063.642578125, + "type": "path", + "move_mode": "run" + }, { "x": 3591.27197265625, "y": 3063.642578125, @@ -26,8 +38,8 @@ }, { - "x": 3588.08544921875, - "y": 3069.444580078125, + "x": 3590.8828125, + "y": 3072.693603515625, "type": "path", "move_mode": "walk" }, @@ -46,8 +58,8 @@ "move_mode": "walk" }, { - "x": 3585.4072265625, - "y": 3068.656494140625, + "x": 3585.630859375, + "y": 3069.217529296875, "type": "path", "move_mode": "walk" } diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json deleted file mode 100644 index 741c5ee7..00000000 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "info": { - "name": "", - "type": "collect", - "author":"Yang-z" - }, - "positions": [ - { - "x": 3636.08251953125, - "y": 4795.94384765625, - "type": "teleport", - "move_mode": "walk" - }, - { - "x": 3586.474609375, - "y": 4721.8291015625, - "type": "path", - "move_mode": "run" - }, - - - { - "x": 3580.4384765625, - "y": 4716.591796875, - "type": "target", - "move_mode": "walk", - "action": "", - "#" : "1" - }, - { - "x": 3580.36376953125, - "y": 4713.65234375, - "type": "target", - "move_mode": "walk", - "action": "", - "#" : "2" - }, - { - "x": 3580.36376953125, - "y": 4713.65234375, - "type": "target", - "move_mode": "walk", - "action": "", - "#" : "2" - }, - - { - "x": 3585.587890625, - "y": 4717.0830078125, - "type": "path", - "move_mode": "run" - }, - - - { - "x": 3556.82568359375, - "y": 4736.08056640625, - "type": "path", - "move_mode": "run" - }, - { - "x": 3552.07763671875, - "y": 4737.794921875, - "type": "target", - "move_mode": "walk", - "action": "", - "#" : "3" - } - ] -} \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json index cb79f617..d3bbe3dd 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json @@ -13,8 +13,8 @@ }, { - "x": 4611.33056640625, - "y": 4929.84326171875, + "x": 4609.60595703125, + "y": 4937.71826171875, "type": "path", "move_mode": "run" }, @@ -27,13 +27,19 @@ "#": "1" }, { - "x": 4605.20068359375, - "y": 4934.0498046875, + "x": 4604.48583984375, + "y": 4934.646484375, "type": "target", "move_mode": "walk", "action": "", "#": "1" }, + { + "x": 4609.60595703125, + "y": 4937.71826171875, + "type": "path", + "move_mode": "walk" + }, { "x": 4695.14013671875, @@ -47,22 +53,35 @@ "type": "path", "move_mode": "run" }, + { - "x": 4677.40771484375, - "y": 4998.9794921875, + "x": 4681.24267578125, + "y": 5003.5537109375, + "type": "path", + "move_mode": "walk" + }, + { + "x": 4678.181640625, + "y": 4999.17431640625, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, { - "x": 4678.38671875, - "y": 5000.13232421875, + "x": 4678.181640625, + "y": 4999.17431640625, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, + { + "x": 4688.0302734375, + "y": 4989.86865234375, + "type": "path", + "move_mode": "walk" + }, { "x": 4712.2392578125, @@ -90,6 +109,12 @@ "action": "", "#": "3" }, + { + "x": 4723.48974609375, + "y": 4933.87158203125, + "type": "path", + "move_mode": "walk" + }, { "x": 4706.38916015625, "y": 4924.84423828125, @@ -110,6 +135,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": 4737.34423828125, + "y": 4906.07568359375, + "type": "target", + "move_mode": "walk" + }, { "x": 4735.310546875, "y": 4902.712890625, @@ -119,8 +150,8 @@ "#": "4" }, { - "x": 4735.5859375, - "y": 4904.025390625, + "x": 4735.37744140625, + "y": 4902.59423828125, "type": "target", "move_mode": "walk", "action": "", diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-莫尔泰区-七天神像-1个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-莫尔泰区-七天神像-1个.json deleted file mode 100644 index b2ae36e4..00000000 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-莫尔泰区-七天神像-1个.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "info": { - "name": "", - "type": "collect", - "author":"Yang-z" - }, - "positions": [ - { - "x": 3563.25537109375, - "y": 3018.392578125, - "type": "teleport", - "move_mode": "walk" - }, - { - "x": 3579.912109375, - "y": 3031.2421875, - "type": "path", - "move_mode": "run" - }, - - { - "x": 3591.27197265625, - "y": 3063.642578125, - "type": "path", - "move_mode": "run" - }, - - { - "x": 3588.08544921875, - "y": 3069.444580078125, - "type": "path", - "move_mode": "walk" - }, - { - "x": 3586.4267578125, - "y": 3070.46240234375, - "type": "target", - "move_mode": "walk", - "action": "", - "#" : "1" - }, - { - "x": 3583.62255859375, - "y": 3071.27734375, - "type": "path", - "move_mode": "walk" - }, - { - "x": 3585.4072265625, - "y": 3068.656494140625, - "type": "path", - "move_mode": "walk" - } - ] -} \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json index 1ad5de1f..da40f229 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json @@ -62,7 +62,7 @@ { "x": -989.744140625, "y": -3705.7880859375, - "type": "path", + "type": "target", "move_mode": "walk" }, { diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json new file mode 100644 index 00000000..4221252c --- /dev/null +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个.json @@ -0,0 +1,43 @@ +{ + "info": { + "name": "", + "type": "collect", + "author":"Yang-z" + }, + "positions": [ + { + "x": -3103.740234375, + "y": -6268.5400390625, + "type": "teleport", + "move_mode": "walk" + }, + + { + "x": -3037.77734375, + "y": -6187.048828125, + "type": "path", + "move_mode": "run" + }, + + { + "x": -3034.861328125, + "y": -6182.2666015625, + "type": "target", + "move_mode": "walk", + "action": "" + }, + { + "x": -3032.9755859375, + "y": -6182.5380859375, + "type": "target", + "move_mode": "walk", + "action": "" + }, + { + "x": -3035.11328125, + "y": -6182.3037109375, + "type": "path", + "move_mode": "walk" + } + ] +} \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json new file mode 100644 index 00000000..6a1cd95c --- /dev/null +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-南-2个.json @@ -0,0 +1,43 @@ +{ + "info": { + "name": "", + "type": "collect", + "author":"Yang-z" + }, + "positions": [ + { + "x": -2612.30078125, + "y": -6508.21875, + "type": "teleport", + "move_mode": "walk" + }, + { + "x": -2581.470703125, + "y": -6529.7802734375, + "type": "path", + "move_mode": "fly", + "action": "stop_flying" + }, + { + "x": -2581.470703125, + "y": -6529.7802734375, + "type": "target", + "move_mode": "walk", + "action": "" + }, + { + "x": -2579.80859375, + "y": -6533.02734375, + "type": "target", + "move_mode": "walk", + "action": "" + }, + + { + "x": -2582.0341796875, + "y": -6525.9619140625, + "type": "path", + "move_mode": "walk" + } + ] +} \ No newline at end of file