From 0244e5f0fbebde26f63a6849224aec386782afd1 Mon Sep 17 00:00:00 2001 From: Yang-z Date: Sun, 24 Nov 2024 14:46:24 +0800 Subject: [PATCH] update artifacts pathing and batch-run scripts - adjust path A - fine-tune --- .../【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json | 15 ++- .../狗粮-璃月-珉林-东北-9个.json | 20 ++- .../狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json} | 18 +-- .../assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json} | 20 +-- .../assets/狗粮A线@Yang-z/（恢复）狗粮-纳塔-涌流地.json} | 20 +-- .../【额外】狗粮-须弥-水天丛林+7个.json | 20 ++- repo/js/AutoArtifacts_A_B_Extra/main.js | 9 +- repo/js/AutoArtifacts_A_B_Extra/manifest.json | 2 +- repo/js/AutoArtifacts_A_B_Extra/settings.json | 43 ++++-- .../【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json | 15 ++- .../备选}/狗粮-璃月-珉林-绝云间-3个.json | 13 +- .../备选}/（恢复）狗粮-璃月-沉玉谷南陵.json | 0 .../备选}/（恢复）狗粮-璃月-珉林.json | 0 .../（恢复）狗粮-纳塔-镜璧山（旁边有采集点，容易点卡神像）.json} | 0 .../备选}/（恢复）狗粮-须弥-千壑沙地.json | 0 .../狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json | 20 ++- .../狗粮-璃月-珉林-绝云间-3个.json | 125 ------------------ .../狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json} | 18 +-- .../狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json} | 20 +-- .../狗粮A线@Yang-z/（恢复）狗粮-璃月-珉林.json | 33 ----- ...璃月-沉玉谷南陵.json => （恢复）狗粮-纳塔-涌流地.json} | 20 +-- .../狗粮A线@Yang-z/（恢复）狗粮-纳塔-镜璧山.json | 40 ------ .../（恢复）狗粮-须弥-千壑沙地.json | 33 ----- .../备选}/（恢复）狗粮-枫丹-莫尔泰区.json | 0 .../备选}/（恢复）狗粮-稻妻-鹤观.json | 0 .../（恢复）狗粮-枫丹-莫尔泰区.json | 33 ----- .../【额外】狗粮-须弥-水天丛林+7个.json | 20 ++- 27 files changed, 194 insertions(+), 363 deletions(-) rename repo/{pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json => js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json} (98%) rename repo/{pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json => js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json} (89%) rename repo/{pathing/圣遗物/狗粮B线@Yang-z/（恢复）狗粮-稻妻-鹤观.json => js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-纳塔-涌流地.json} (61%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z => pathing/圣遗物/狗粮A线@Yang-z/备选}/狗粮-璃月-珉林-绝云间-3个.json (90%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z => pathing/圣遗物/狗粮A线@Yang-z/备选}/（恢复）狗粮-璃月-沉玉谷南陵.json (100%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z => pathing/圣遗物/狗粮A线@Yang-z/备选}/（恢复）狗粮-璃月-珉林.json (100%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-纳塔-镜璧山.json => pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-纳塔-镜璧山（旁边有采集点，容易点卡神像）.json} (100%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z => pathing/圣遗物/狗粮A线@Yang-z/备选}/（恢复）狗粮-须弥-千壑沙地.json (100%) delete mode 100644 repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个.json rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json => pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json} (98%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json => pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json} (89%) delete mode 100644 repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-璃月-珉林.json rename repo/pathing/圣遗物/狗粮A线@Yang-z/{（恢复）狗粮-璃月-沉玉谷南陵.json => （恢复）狗粮-纳塔-涌流地.json} (61%) delete mode 100644 repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-纳塔-镜璧山.json delete mode 100644 repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-须弥-千壑沙地.json rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z => pathing/圣遗物/狗粮B线@Yang-z/备选}/（恢复）狗粮-枫丹-莫尔泰区.json (100%) rename repo/{js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z => pathing/圣遗物/狗粮B线@Yang-z/备选}/（恢复）狗粮-稻妻-鹤观.json (100%) delete mode 100644 repo/pathing/圣遗物/狗粮B线@Yang-z/（恢复）狗粮-枫丹-莫尔泰区.json diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json index 8312ee35..4b6fdfc9 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json @@ -701,18 +701,25 @@ "type": "target", "move_mode": "walk" }, + { + "x": -3156.2685546875, + "y": -3693.1943359375, + "type": "target", + "move_mode": "walk" + }, + { - "x": -3154.22265625, - "y": -3689.6806640625, + "x": -3154.5517578125, + "y": -3688.9306640625, "type": "target", "move_mode": "walk", "action": "", "#": "17" }, { - "x": -3154.22265625, - "y": -3689.6806640625, + "x": -3154.5517578125, + "y": -3688.9306640625, "type": "target", "move_mode": "walk", "action": "", diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json index 7c83f9c8..9ca691af 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json @@ -174,7 +174,6 @@ "move_mode": "walk" }, - { "x": 523.5693359375, "y": 907.1611328125, @@ -186,9 +185,6 @@ - - - { "x": 528.3486328125, "y": 904.05029296875, @@ -214,8 +210,14 @@ "move_mode": "run" }, { - "x": 578.40234375, - "y": 895.48291015625, + "x": 575.05078125, + "y": 898.53662109375, + "type": "path", + "move_mode": "run" + }, + { + "x": 602.28515625, + "y": 878.0556640625, "type": "path", "move_mode": "run" }, @@ -346,6 +348,12 @@ "move_mode": "walk" }, + { + "x": 646.8876953125, + "y": 834.0068359375, + "type": "path", + "move_mode": "walk" + }, { "x": 648.2548828125, "y": 829.93701171875, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json similarity index 98% rename from repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json rename to repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json index 367f5997..39da6d81 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json @@ -109,8 +109,8 @@ "move_mode": "run" }, { - "x": 7739.4453125, - "y": -1539.29296875, + "x": 7738.97216796875, + "y": -1539.4287109375, "type": "target", "move_mode": "walk", "action": "", @@ -195,15 +195,10 @@ "move_mode": "walk", "action": "", "No.": "4" - } - - ], + }, - "positions_not_actived": [ - { "#": "太零散，也有点远" }, - { "x": 7633.7626953125, "y": -1646.72509765625, @@ -292,10 +287,15 @@ "move_mode": "walk", "action": "", "No.": "6" - }, + } + + ], + "positions_not_actived": [ + { "#": "也有点远" }, + { "x": 7633.8603515625, "y": -1646.7119140625, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json similarity index 89% rename from repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json rename to repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json index e3023464..9a30633b 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json @@ -64,15 +64,10 @@ "type": "target", "move_mode": "walk", "#": "5" - } - - ], + }, - "positions_not_actived": [ - { "#": "有点远" }, - { "x": 9670.130859375, "y": 171.31884765625, @@ -87,12 +82,19 @@ "move_mode": "fly" }, { - "x": 9587.5390625, - "y": 171.439453125, + "x": 9587.501953125, + "y": 171.46044921875, "type": "target", "move_mode": "fly", "action": "stop_flying" }, + { + "x": 9587.2451171875, + "y": 171.51171875, + "type": "target", + "move_mode": "walk", + "#": "6" + }, { "x": 9587.501953125, "y": 171.46044921875, @@ -100,5 +102,7 @@ "move_mode": "walk", "#": "6" } + ] + } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/（恢复）狗粮-稻妻-鹤观.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-纳塔-涌流地.json similarity index 61% rename from repo/pathing/圣遗物/狗粮B线@Yang-z/（恢复）狗粮-稻妻-鹤观.json rename to repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-纳塔-涌流地.json index d0667f18..afa376ca 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/（恢复）狗粮-稻妻-鹤观.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-纳塔-涌流地.json @@ -6,32 +6,32 @@ }, "positions": [ { - "x": -3268.9658203125, - "y": -6133.853515625, + "x": 8582.041015625, + "y": -2675.1962890625, "type": "teleport", "move_mode": "walk" }, { - "x": -3270.83203125, - "y": -6134.12890625, + "x": 8579.4150390625, + "y": -2657.970703125, "type": "target", "move_mode": "walk" }, { - "x": -3272.109375, - "y": -6131.5322265625, + "x": 8578.6396484375, + "y": -2656.0966796875, "type": "target", "move_mode": "walk" }, { - "x": -3269.3427734375, - "y": -6129.86328125, + "x": 8579.435546875, + "y": -2656.6953125, "type": "target", "move_mode": "walk" }, { - "x": -3268.7265625, - "y": -6131.9873046875, + "x": 8579.17578125, + "y": -2657.7470703125, "type": "target", "move_mode": "walk" } diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个.json index 5c4caed6..ee11fd87 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个.json @@ -33,14 +33,20 @@ "#": "1" }, { - "x": 3159.9697265625, - "y": -1785.81494140625, + "x": 3165.9248046875, + "y": -1770.85107421875, "type": "path", "move_mode": "walk" }, { - "x": 3175.42333984375, - "y": -1782.19921875, + "x": 3170.3037109375, + "y": -1771.859375, + "type": "path", + "move_mode": "walk" + }, + { + "x": 3175.1484375, + "y": -1776.59130859375, "type": "path", "move_mode": "walk" }, @@ -60,6 +66,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": 3178.9228515625, + "y": -1743.14306640625, + "type": "path", + "move_mode": "walk" + }, { "x": 3170.59619140625, "y": -1737.13427734375, diff --git a/repo/js/AutoArtifacts_A_B_Extra/main.js b/repo/js/AutoArtifacts_A_B_Extra/main.js index 17989b55..b8517b1b 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/main.js +++ b/repo/js/AutoArtifacts_A_B_Extra/main.js @@ -7,7 +7,6 @@ const pathingA = [ "狗粮-璃月-珉林-北-5个.json", "狗粮-璃月-珉林-东北-9个.json", - "狗粮-璃月-珉林-绝云间-3个.json", "（恢复）狗粮-璃月-琼玑野.json", "狗粮-璃月-琼玑野-绿华池-3个.json", "狗粮-璃月-碧水源-盐中之地-3个.json", @@ -19,17 +18,17 @@ "狗粮-须弥-下风蚀地-阿如村-4个.json", "狗粮-须弥-千壑沙地-塔尼特露营地-3个／5个.json", "狗粮-须弥-浮罗囿-甘露花海北-4个.json", - "狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json", + "狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json", "狗粮-纳塔-万火之瓯-竞技场东-4个.json", "狗粮-纳塔-涌流地-流泉之众-4个.json", - "（恢复）狗粮-纳塔-镜璧山.json", + "（恢复）狗粮-纳塔-涌流地.json", "狗粮-纳塔-镜璧山-南-9个.json", "狗粮-纳塔-翘枝崖-北-6个.json", "狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json", - "狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json", + "狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json", "（恢复）狗粮-稻妻-神无冢.json", "【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json", - "（恢复）狗粮-须弥-二净甸.json", + "（恢复）狗粮-稻妻-神无冢.json" ]; // 97+21个 const pathingB = [ diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index e0cc00e2..d0b813ae 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.3", + "version": "1.4", "bgi_version": "0.36.5", "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 74ac41dd..866790a3 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/settings.json +++ b/repo/js/AutoArtifacts_A_B_Extra/settings.json @@ -1,4 +1,10 @@ [ + { + "name": "tryTimes", + "type": "input-text", + "label": "尝试次数" + }, + { "name": "path", "type": "select", @@ -9,14 +15,31 @@ "自动" ] }, - { - "name": "tryTimes", - "type": "input-text", - "label": "尝试次数" - }, - { - "name": "Extra", - "type": "checkbox", - "label": "额外点位" - } + // { + // "name": "swapPath", + // "type": "checkbox", + // "label": "自动选择路线时，交换AB路线" + // }, + + // { + // "name": "Extra", + // "type": "checkbox", + // "label": "拾取额外点位" + // }, + + // { + // "name": "autoSalvage", + // "type": "checkbox", + // "label": "自动分解" + // }, + // { + // "name": "autoSalvage4", + // "type": "checkbox", + // "label": "自动分解包括4星圣遗物" + // }, + // { + // "name": "autoSalvageSpan", + // "type": "input-text", + // "label": "自动分解在多少路径后执行一次" + // } ] \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json index 8312ee35..4b6fdfc9 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂-21个.json @@ -701,18 +701,25 @@ "type": "target", "move_mode": "walk" }, + { + "x": -3156.2685546875, + "y": -3693.1943359375, + "type": "target", + "move_mode": "walk" + }, + { - "x": -3154.22265625, - "y": -3689.6806640625, + "x": -3154.5517578125, + "y": -3688.9306640625, "type": "target", "move_mode": "walk", "action": "", "#": "17" }, { - "x": -3154.22265625, - "y": -3689.6806640625, + "x": -3154.5517578125, + "y": -3688.9306640625, "type": "target", "move_mode": "walk", "action": "", diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-璃月-珉林-绝云间-3个.json similarity index 90% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-璃月-珉林-绝云间-3个.json index 0cf7972c..689d61dc 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-璃月-珉林-绝云间-3个.json @@ -17,7 +17,6 @@ "type": "path", "move_mode": "walk" }, - { "x": 1178.974609375, "y": 573.78271484375, @@ -41,6 +40,12 @@ "action": "", "No.": "1" }, + { + "x": 1171.7880859375, + "y": 570.55615234375, + "type": "path", + "move_mode": "walk" + }, { "x": 1163.396484375, @@ -120,6 +125,12 @@ "y": 563.20654296875, "type": "path", "move_mode": "walk" + }, + { + "x": 1148.109375, + "y": 565.111328125, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-璃月-沉玉谷南陵.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-璃月-沉玉谷南陵.json similarity index 100% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-璃月-沉玉谷南陵.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-璃月-沉玉谷南陵.json diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-璃月-珉林.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-璃月-珉林.json similarity index 100% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-璃月-珉林.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-璃月-珉林.json diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-纳塔-镜璧山.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-纳塔-镜璧山（旁边有采集点，容易点卡神像）.json similarity index 100% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-纳塔-镜璧山.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-纳塔-镜璧山（旁边有采集点，容易点卡神像）.json diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-须弥-千壑沙地.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-须弥-千壑沙地.json similarity index 100% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/（恢复）狗粮-须弥-千壑沙地.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/备选/（恢复）狗粮-须弥-千壑沙地.json diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json index 7c83f9c8..9ca691af 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个.json @@ -174,7 +174,6 @@ "move_mode": "walk" }, - { "x": 523.5693359375, "y": 907.1611328125, @@ -186,9 +185,6 @@ - - - { "x": 528.3486328125, "y": 904.05029296875, @@ -214,8 +210,14 @@ "move_mode": "run" }, { - "x": 578.40234375, - "y": 895.48291015625, + "x": 575.05078125, + "y": 898.53662109375, + "type": "path", + "move_mode": "run" + }, + { + "x": 602.28515625, + "y": 878.0556640625, "type": "path", "move_mode": "run" }, @@ -346,6 +348,12 @@ "move_mode": "walk" }, + { + "x": 646.8876953125, + "y": 834.0068359375, + "type": "path", + "move_mode": "walk" + }, { "x": 648.2548828125, "y": 829.93701171875, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个.json deleted file mode 100644 index 0cf7972c..00000000 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "info": { - "name": "", - "type": "collect", - "author":"Yang-z" - }, - "positions": [ - { - "x": 1182.685546875, - "y": 626.04638671875, - "type": "teleport", - "move_mode": "walk" - }, - { - "x": 1191.91015625, - "y": 629.23388671875, - "type": "path", - "move_mode": "walk" - }, - - { - "x": 1178.974609375, - "y": 573.78271484375, - "type": "path", - "move_mode": "run" - }, - - { - "x": 1169.703125, - "y": 569.39404296875, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "1" - }, - { - "x": 1170.05078125, - "y": 569.162109375, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "1" - }, - - { - "x": 1163.396484375, - "y": 573.80615234375, - "type": "path", - "move_mode": "walk" - }, - { - "x": 1154.1103515625, - "y": 563.09521484375, - "type": "path", - "move_mode": "run" - }, - { - "x": 1152.111328125, - "y": 557.2080078125, - "type": "path", - "move_mode": "walk" - }, - - { - "x": 1158.2958984375, - "y": 557.2314453125, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "2" - }, - { - "x": 1158.7294921875, - "y": 557.53369140625, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "2" - }, - - { - "x": 1161.9443359375, - "y": 556.87646484375, - "type": "path", - "move_mode": "walk" - }, - - { - "x": 1159.6357421875, - "y": 559.4970703125, - "type": "path", - "move_mode": "walk" - }, - - - { - "x": 1152.5556640625, - "y": 559.8544921875, - "type": "path", - "move_mode": "walk" - }, - { - "x": 1147.025390625, - "y": 561.1103515625, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "3" - }, - - - { - "x": 1145.19140625, - "y": 560.70458984375, - "type": "path", - "move_mode": "walk" - }, - { - "x": 1145.2890625, - "y": 563.20654296875, - "type": "path", - "move_mode": "walk" - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json similarity index 98% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json index 367f5997..39da6d81 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-4个／7个 .json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json @@ -109,8 +109,8 @@ "move_mode": "run" }, { - "x": 7739.4453125, - "y": -1539.29296875, + "x": 7738.97216796875, + "y": -1539.4287109375, "type": "target", "move_mode": "walk", "action": "", @@ -195,15 +195,10 @@ "move_mode": "walk", "action": "", "No.": "4" - } - - ], + }, - "positions_not_actived": [ - { "#": "太零散，也有点远" }, - { "x": 7633.7626953125, "y": -1646.72509765625, @@ -292,10 +287,15 @@ "move_mode": "walk", "action": "", "No.": "6" - }, + } + + ], + "positions_not_actived": [ + { "#": "也有点远" }, + { "x": 7633.8603515625, "y": -1646.7119140625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json similarity index 89% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json index e3023464..9a30633b 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-5个／6个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个.json @@ -64,15 +64,10 @@ "type": "target", "move_mode": "walk", "#": "5" - } - - ], + }, - "positions_not_actived": [ - { "#": "有点远" }, - { "x": 9670.130859375, "y": 171.31884765625, @@ -87,12 +82,19 @@ "move_mode": "fly" }, { - "x": 9587.5390625, - "y": 171.439453125, + "x": 9587.501953125, + "y": 171.46044921875, "type": "target", "move_mode": "fly", "action": "stop_flying" }, + { + "x": 9587.2451171875, + "y": 171.51171875, + "type": "target", + "move_mode": "walk", + "#": "6" + }, { "x": 9587.501953125, "y": 171.46044921875, @@ -100,5 +102,7 @@ "move_mode": "walk", "#": "6" } + ] + } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-璃月-珉林.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-璃月-珉林.json deleted file mode 100644 index d11924f7..00000000 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-璃月-珉林.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "info": { - "name": "", - "type": "collect", - "author":"Yang-z" - }, - "positions": [ - { - "x": 1474.576171875, - "y": 763.63623046875, - "type": "teleport", - "move_mode": "walk" - }, - { - "x": 1470.76171875, - "y": 763.5576171875, - "type": "target", - "move_mode": "walk" - }, - { - "x": 1472.3759765625, - "y": 762.37646484375, - "type": "target", - "move_mode": "walk" - }, - { - "x": 1472.4384765625, - "y": 760.40478515625, - "type": "target", - "move_mode": "walk" - } - ] -} \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-璃月-沉玉谷南陵.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-纳塔-涌流地.json similarity index 61% rename from repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-璃月-沉玉谷南陵.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-纳塔-涌流地.json index 9b233150..afa376ca 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-璃月-沉玉谷南陵.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-纳塔-涌流地.json @@ -6,32 +6,32 @@ }, "positions": [ { - "x": 2323.908203125, - "y": 1605.05908203125, + "x": 8582.041015625, + "y": -2675.1962890625, "type": "teleport", "move_mode": "walk" }, { - "x": 2321.658203125, - "y": 1599.42041015625, + "x": 8579.4150390625, + "y": -2657.970703125, "type": "target", "move_mode": "walk" }, { - "x": 2325.3271484375, - "y": 1598.36962890625, + "x": 8578.6396484375, + "y": -2656.0966796875, "type": "target", "move_mode": "walk" }, { - "x": 2325.11328125, - "y": 1600.39794921875, + "x": 8579.435546875, + "y": -2656.6953125, "type": "target", "move_mode": "walk" }, { - "x": 2324.4482421875, - "y": 1601.2255859375, + "x": 8579.17578125, + "y": -2657.7470703125, "type": "target", "move_mode": "walk" } diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-纳塔-镜璧山.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-纳塔-镜璧山.json deleted file mode 100644 index b83d21aa..00000000 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-纳塔-镜璧山.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "info": { - "name": "", - "type": "collect", - "author":"Yang-z" - }, - "positions": [ - { - "x": 9540.57421875, - "y": -1784.568359375, - "type": "teleport", - "move_mode": "walk", - "action": "force_tp" - }, - { - "x": 9521.95703125, - "y": -1780.00146484375, - "type": "target", - "move_mode": "walk" - }, - { - "x": 9519.314453125, - "y": -1778.97705078125, - "type": "target", - "move_mode": "walk" - }, - { - "x": 9520.349609375, - "y": -1779.3251953125, - "type": "target", - "move_mode": "walk" - }, - { - "x": 9521.8037109375, - "y": -1778.33203125, - "type": "target", - "move_mode": "walk" - } - ] -} \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-须弥-千壑沙地.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-须弥-千壑沙地.json deleted file mode 100644 index b9cfaee7..00000000 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/（恢复）狗粮-须弥-千壑沙地.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "info": { - "name": "", - "type": "collect", - "author":"Yang-z" - }, - "positions": [ - { - "x": 5064.04052734375, - "y": -1587.7021484375, - "type": "teleport", - "move_mode": "walk" - }, - { - "x": 5069.73828125, - "y": -1588.7734375, - "type": "target", - "move_mode": "walk" - }, - { - "x": 5073.125, - "y": -1588.56005859375, - "type": "target", - "move_mode": "walk" - }, - { - "x": 5073.119140625, - "y": -1586.68896484375, - "type": "target", - "move_mode": "walk" - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/（恢复）狗粮-枫丹-莫尔泰区.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/（恢复）狗粮-枫丹-莫尔泰区.json similarity index 100% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/（恢复）狗粮-枫丹-莫尔泰区.json rename to repo/pathing/圣遗物/狗粮B线@Yang-z/备选/（恢复）狗粮-枫丹-莫尔泰区.json diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/（恢复）狗粮-稻妻-鹤观.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/备选/（恢复）狗粮-稻妻-鹤观.json similarity index 100% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/（恢复）狗粮-稻妻-鹤观.json rename to repo/pathing/圣遗物/狗粮B线@Yang-z/备选/（恢复）狗粮-稻妻-鹤观.json diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/（恢复）狗粮-枫丹-莫尔泰区.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/（恢复）狗粮-枫丹-莫尔泰区.json deleted file mode 100644 index 85107510..00000000 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/（恢复）狗粮-枫丹-莫尔泰区.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "info": { - "name": "", - "type": "collect", - "author":"Yang-z" - }, - "positions": [ - { - "x": 3563.1005859375, - "y": 3018.400390625, - "type": "teleport", - "move_mode": "walk" - }, - { - "x": 3554.3837890625, - "y": 3020.732177734375, - "type": "target", - "move_mode": "walk" - }, - { - "x": 3553.67724609375, - "y": 3021.087890625, - "type": "target", - "move_mode": "walk" - }, - { - "x": 3555.28271484375, - "y": 3022.454345703125, - "type": "target", - "move_mode": "walk" - } - ] -} \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个.json index 5c4caed6..ee11fd87 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个.json @@ -33,14 +33,20 @@ "#": "1" }, { - "x": 3159.9697265625, - "y": -1785.81494140625, + "x": 3165.9248046875, + "y": -1770.85107421875, "type": "path", "move_mode": "walk" }, { - "x": 3175.42333984375, - "y": -1782.19921875, + "x": 3170.3037109375, + "y": -1771.859375, + "type": "path", + "move_mode": "walk" + }, + { + "x": 3175.1484375, + "y": -1776.59130859375, "type": "path", "move_mode": "walk" }, @@ -60,6 +66,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": 3178.9228515625, + "y": -1743.14306640625, + "type": "path", + "move_mode": "walk" + }, { "x": 3170.59619140625, "y": -1737.13427734375,