From 08158c1e697a92ce07c24de34d9f291bd4cccb93 Mon Sep 17 00:00:00 2001 From: huiyadanli Date: Thu, 28 Nov 2024 16:31:33 +0000 Subject: [PATCH 1/7] update repo.json --- repo.json | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 1 deletion(-) diff --git a/repo.json b/repo.json index 17cc1832..98355f3b 100644 --- a/repo.json +++ b/repo.json @@ -1,5 +1,5 @@ { - "time": "20241128102001", + "time": "20241129003132", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "file": "repo.json", "indexes": [ @@ -7187,6 +7187,39 @@ "萃凝晶" ] }, + { + "name": "纳塔万火之欧01.json", + "type": "file", + "hash": "1ac19d0821d35d189f577679d4a679d81ec73e55", + "version": "1ac19d0", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, + { + "name": "纳塔万火之欧02.json", + "type": "file", + "hash": "4cd032f15b29ce34e81bc53ee71c0d5280f82b48", + "version": "4cd032f", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, + { + "name": "纳塔万火之欧03 (1).json", + "type": "file", + "hash": "8bd7d99c5713d8578ba866999982128670dab558", + "version": "8bd7d99", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, { "name": "纳塔坚岩缢谷01.json", "type": "file", @@ -7220,6 +7253,61 @@ "萃凝晶" ] }, + { + "name": "纳塔坚岩缢谷04.json", + "type": "file", + "hash": "0bae4378612524bf226abb4a78428413620328e2", + "version": "0bae437", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, + { + "name": "纳塔坚岩缢谷七天神像 (1).json", + "type": "file", + "hash": "2ccccf858a25418dcd9523a416b96396e6656372", + "version": "2ccccf8", + "author": "", + "description": "", + "tags": [ + "萃凝晶" + ] + }, + { + "name": "纳塔坚岩缢谷七天神像 2 (1).json", + "type": "file", + "hash": "2a6553ba9d191896ea2f14150454ee950239faef", + "version": "2a6553b", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, + { + "name": "纳塔奥奇卡纳塔下01.json", + "type": "file", + "hash": "9849c6f0eb859f6e5f1b17bdb027ed14e28f9a45", + "version": "9849c6f", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, + { + "name": "纳塔奥奇卡纳塔右边小岛01.json", + "type": "file", + "hash": "011510d41215fb1fb34de22f4e0e49719a695d8d", + "version": "011510d", + "author": "mfkvfhdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, { "name": "纳塔彩石顶01.json", "type": "file", @@ -7242,6 +7330,17 @@ "萃凝晶" ] }, + { + "name": "纳塔涌流地01 (1).json", + "type": "file", + "hash": "462e5f6ff3ff3523c9037cf1d1a03efc1d8677eb", + "version": "462e5f6", + "author": "", + "description": "", + "tags": [ + "萃凝晶" + ] + }, { "name": "纳塔深渊古瞭望所01.json", "type": "file", @@ -7264,6 +7363,28 @@ "萃凝晶" ] }, + { + "name": "纳塔溶水域01 (1).json", + "type": "file", + "hash": "3d679b76245368b9330e5f116d84cc86db38b011", + "version": "3d679b7", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, + { + "name": "纳塔溶水域02.json", + "type": "file", + "hash": "33e0f7e94f46d7ccde17d858084038ec5b8a5c83", + "version": "33e0f7e", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, { "name": "纳塔烟迷主.json", "type": "file", @@ -7275,6 +7396,17 @@ "萃凝晶" ] }, + { + "name": "纳塔翘枝崖 (1).json", + "type": "file", + "hash": "ba75b44288832e47f0ffbb48369ab055fd6c32c1", + "version": "ba75b44", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, { "name": "纳塔花羽会.json", "type": "file", @@ -7286,6 +7418,28 @@ "萃凝晶" ] }, + { + "name": "纳塔花羽会003.json", + "type": "file", + "hash": "d08c862cdc639a1e2cf682643b7597de75d70a01", + "version": "d08c862", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, + { + "name": "纳塔花羽会004.json", + "type": "file", + "hash": "ccdccd83a08a64ca4657a3bbcb22dd8beb832368", + "version": "ccdccd8", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, { "name": "纳塔花羽会02 (1).json", "type": "file", @@ -7308,6 +7462,17 @@ "萃凝晶" ] }, + { + "name": "纳塔虹灵净土.json", + "type": "file", + "hash": "ec1c1fa2a23afe5b5d79f5efb17b71e91331b459", + "version": "ec1c1fa", + "author": "mfkvfhpdx", + "description": "", + "tags": [ + "萃凝晶" + ] + }, { "name": "纳塔踞石山01.json", "type": "file", From 8945aa623b06daed7be3e1f6ac56930bfa97d50b Mon Sep 17 00:00:00 2001 From: Yang-z Date: Fri, 29 Nov 2024 14:59:32 +0800 Subject: [PATCH 2/7] 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 From 98dda4b156e0276d159e5b7a4c2dabd494c9b5ba Mon Sep 17 00:00:00 2001 From: phligl <49722225+phligl@users.noreply.github.com> Date: Fri, 29 Nov 2024 15:41:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8climb=20move=20mode?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=9B=A0=E4=B8=BA=E8=84=B1=E7=A6=BB?= =?UTF-8?q?=E5=8D=A1=E6=AD=BB=E5=8A=9F=E8=83=BD=E6=8E=89=E4=B8=8B=E6=9D=A5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo/pathing/落落莓/望风山地2x28.json | 382 ++++++++++++++------------ 1 file changed, 203 insertions(+), 179 deletions(-) diff --git a/repo/pathing/落落莓/望风山地2x28.json b/repo/pathing/落落莓/望风山地2x28.json index 935011b8..5175bfaf 100644 --- a/repo/pathing/落落莓/望风山地2x28.json +++ b/repo/pathing/落落莓/望风山地2x28.json @@ -1,180 +1,204 @@ { - "info":{ - "bgi_version":"0.34.5", - "version":"1.0", - "name":"望风山地2x28", - "description":"", - "type":"collect", - "author":"yulalaa" - }, - "positions":[ - { - "x":-1273.70703125, - "y":2721.664794921875, - "type":"teleport", - "move_mode":"walk", - "action":"" - }, - { - "x":-1277.54296875, - "y":2716.417724609375, - "type":"path", - "move_mode":"walk", - "action":"" - }, - { - "x":-1293.5673828125, - "y":2685.89208984375, - "type":"path", - "move_mode":"fly", - "action":"" - }, - { - "x":-1304.7099609375, - "y":2672.21484375, - "type":"path", - "move_mode":"walk", - "action":"" - }, - { - "x":-1307.853515625, - "y":2674.1318359375, - "type":"target", - "move_mode":"walk", - "action":"" - }, - { - "x":-1325.427734375, - "y":2679.72119140625, - "type":"path", - "move_mode":"fly", - "action":"" - }, - { - "x":-1362.875, - "y":2681.56884765625, - "type":"target", - "move_mode":"walk", - "action":"" - }, - { - "x":-1367.9921875, - "y":2681.28662109375, - "type":"target", - "move_mode":"walk", - "action":"" - }, - { - "x":-1368.8798828125, - "y":2684.73388671875, - "type":"target", - "move_mode":"walk", - "action":"" - }, - { - "x":-1414.0, - "y":2670.0, - "type":"path", - "move_mode":"fly", - "action":"" - }, - { - "x":-1425.8994140625, - "y":2671.697021484375, - "type":"target", - "move_mode":"fly", - "action":"" - }, - { - "x":-1442.8955078125, - "y":2672.922607421875, - "type":"target", - "move_mode":"walk", - "action":"" - }, - { - "x":-1461.328125, - "y":2673.90576171875, - "type":"path", - "move_mode":"walk", - "action":"" - }, - { - "x":-1487.2177734375, - "y":2669.09814453125, - "type":"target", - "move_mode":"walk", - "action":"" - }, - { - "x":-1451.1611328125, - "y":2711.33984375, - "type":"path", - "move_mode":"fly", - "action":"" - }, - { - "x":-1427.4111328125, - "y":2744.72412109375, - "type":"target", - "move_mode":"fly", - "action":"" - }, - { - "x":-1417.7353515625, - "y":2749.205322265625, - "type":"target", - "move_mode":"walk", - "action":"" - }, - { - "x":-1406.572265625, - "y":2767.641357421875, - "type":"path", - "move_mode":"walk", - "action":"" - }, - { - "x":-1404.0087890625, - "y":2806.2861328125, - "type":"path", - "move_mode":"walk", - "action":"" - }, - { - "x":-1416.3759765625, - "y":2820.66064453125, - "type":"path", - "move_mode":"walk", - "action":"" - }, - { - "x":-1455.2314453125, - "y":2840.6015625, - "type":"target", - "move_mode":"walk", - "action":"" - }, - { - "x":-1398.931640625, - "y":2844.23828125, - "type":"path", - "move_mode":"fly", - "action":"" - }, - { - "x":-1360.6103515625, - "y":2844.04296875, - "type":"path", - "move_mode":"fly", - "action":"" - }, - { - "x":-1350.5390625, - "y":2847.770263671875, - "type":"target", - "move_mode":"walk", - "action":"" - } - ] -} \ No newline at end of file + "info": { + "name": "望风山地2x28", + "type": "collect", + "author": "yulalaa", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "x": -1273.70703125, + "y": 2721.664794921875, + "action": "", + "move_mode": "walk", + "type": "teleport" + }, + { + "id": 2, + "x": -1277.54296875, + "y": 2716.417724609375, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 3, + "x": -1293.5673828125, + "y": 2685.89208984375, + "action": "", + "move_mode": "fly", + "type": "path" + }, + { + "id": 4, + "x": -1304.7099609375, + "y": 2672.21484375, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 5, + "x": -1307.853515625, + "y": 2674.1318359375, + "action": "", + "move_mode": "walk", + "type": "target" + }, + { + "id": 6, + "x": -1325.427734375, + "y": 2679.72119140625, + "action": "", + "move_mode": "climb", + "type": "path" + }, + { + "id": 7, + "x": -1362.875, + "y": 2681.56884765625, + "action": "", + "move_mode": "walk", + "type": "target" + }, + { + "id": 8, + "x": -1367.9921875, + "y": 2681.28662109375, + "action": "", + "move_mode": "walk", + "type": "target" + }, + { + "id": 9, + "x": -1368.8798828125, + "y": 2684.73388671875, + "action": "", + "move_mode": "climb", + "type": "target" + }, + { + "id": 10, + "x": -1414, + "y": 2670, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 11, + "x": -1425.8994140625, + "y": 2671.697021484375, + "action": "", + "move_mode": "climb", + "type": "target" + }, + { + "id": 12, + "x": -1442.8955078125, + "y": 2672.922607421875, + "action": "", + "move_mode": "walk", + "type": "target" + }, + { + "id": 13, + "x": -1461.328125, + "y": 2673.90576171875, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 14, + "x": -1487.2177734375, + "y": 2669.09814453125, + "action": "", + "move_mode": "walk", + "type": "target" + }, + { + "id": 15, + "x": -1451.1611328125, + "y": 2711.33984375, + "action": "", + "move_mode": "fly", + "type": "path" + }, + { + "id": 16, + "x": -1427.4111328125, + "y": 2744.72412109375, + "action": "", + "move_mode": "fly", + "type": "target" + }, + { + "id": 17, + "x": -1417.7353515625, + "y": 2749.205322265625, + "action": "", + "move_mode": "walk", + "type": "target" + }, + { + "id": 18, + "x": -1406.572265625, + "y": 2767.641357421875, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 19, + "x": -1404.0087890625, + "y": 2806.2861328125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 20, + "x": -1416.3759765625, + "y": 2820.66064453125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 21, + "x": -1455.2314453125, + "y": 2840.6015625, + "action": "", + "move_mode": "walk", + "type": "target" + }, + { + "id": 22, + "x": -1398.931640625, + "y": 2844.23828125, + "action": "", + "move_mode": "fly", + "type": "path" + }, + { + "id": 23, + "x": -1360.6103515625, + "y": 2844.04296875, + "action": "", + "move_mode": "fly", + "type": "path" + }, + { + "id": 24, + "x": -1350.5390625, + "y": 2847.770263671875, + "action": "", + "move_mode": "walk", + "type": "target" + } + ] +} From 51489367510b3c860fea7c14c95739b2c1265954 Mon Sep 17 00:00:00 2001 From: huiyadanli Date: Fri, 29 Nov 2024 08:46:50 +0000 Subject: [PATCH 4/7] update repo.json --- repo.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repo.json b/repo.json index 98355f3b..4c67dccb 100644 --- a/repo.json +++ b/repo.json @@ -1,5 +1,5 @@ { - "time": "20241129003132", + "time": "20241129164649", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "file": "repo.json", "indexes": [ @@ -7559,8 +7559,8 @@ { "name": "望风山地2x28.json", "type": "file", - "hash": "e2c3fd8eb169de45b059b0758a3131e3efdd42a3", - "version": "e2c3fd8", + "hash": "d447b3278f23c56409ee8240b1953ec780931c7c", + "version": "d447b32", "author": "yulalaa", "description": "", "tags": [ From 992d27cf01d088f6003584f258f217724eed0090 Mon Sep 17 00:00:00 2001 From: huiyadanli Date: Fri, 29 Nov 2024 08:48:49 +0000 Subject: [PATCH 5/7] update repo.json --- repo.json | 130 +++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/repo.json b/repo.json index 4c67dccb..fd32da07 100644 --- a/repo.json +++ b/repo.json @@ -1,5 +1,5 @@ { - "time": "20241129164649", + "time": "20241129164849", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "file": "repo.json", "indexes": [ @@ -820,8 +820,8 @@ { "name": "【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json", "type": "file", - "hash": "98363b946259aab000993b070fb04f5f8a3173e4", - "version": "98363b9", + "hash": "b6336b687bf96dc8d08e71955bcbd413bb747344", + "version": "b6336b6", "author": "Yang-z", "description": "", "tags": [ @@ -842,8 +842,8 @@ { "name": "【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json", "type": "file", - "hash": "993249db395d6d3561e36a2988bcabf01cda432b", - "version": "993249d", + "hash": "dde6098a8718e25f897925685a5fc6b80630fd6f", + "version": "dde6098", "author": "Yang-z", "description": "", "tags": [ @@ -1442,8 +1442,8 @@ { "name": "狗粮-纳塔-坚岩隘谷-回声之子南-6个／7个 .json", "type": "file", - "hash": "02ade0dea2fabcdca85660c1e0f87858e8e422df", - "version": "02ade0d", + "hash": "db42398df7987065967f323aa04bf2ef141bc553", + "version": "db42398", "author": "Yang-z", "description": "", "tags": [ @@ -1486,8 +1486,8 @@ { "name": "狗粮-纳塔-翘枝崖-北-6个.json", "type": "file", - "hash": "6c3ddd35fcc544f4006a36b4500d9c4dd21581e1", - "version": "6c3ddd3", + "hash": "df531ada5dc52c36fcb5d192a0b50afe3bfd26c4", + "version": "df531ad", "author": "Yang-z", "description": "", "tags": [ @@ -1552,8 +1552,8 @@ { "name": "狗粮-须弥-失落的苗圃-南-8个.json", "type": "file", - "hash": "f313244302e64960d9081e9489440bbd858d1466", - "version": "f313244", + "hash": "f7a5aa1642998586edbeaf18917764088ebd0f28", + "version": "f7a5aa1", "author": "Yang-z", "description": "", "tags": [ @@ -1635,8 +1635,8 @@ { "name": "【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json", "type": "file", - "hash": "bceab04570d9a1ebc31a3e791918892bde21591b", - "version": "bceab04", + "hash": "1b14fe4c9b0eb06a237a6e05b573674f74bd449e", + "version": "1b14fe4", "author": "Yang-z", "description": "", "tags": [ @@ -1707,6 +1707,18 @@ "备选" ] }, + { + "name": "狗粮-枫丹-研究院区-东-3个（重兵把守）.json", + "type": "file", + "hash": "729c34552514bae0f787d11860c3c997a8cce887", + "version": "729c345", + "author": "Yang-z", + "description": "", + "tags": [ + "圣遗物", + "备选" + ] + }, { "name": "狗粮-枫丹-研究院区-中央实验室遗址-2个（路线复杂）.json", "type": "file", @@ -1731,6 +1743,18 @@ "备选" ] }, + { + "name": "狗粮-枫丹-莫尔泰区-七天神像-1个.json", + "type": "file", + "hash": "e8c2942ad3e1b378362043bfc455a099b50824cd", + "version": "e8c2942", + "author": "Yang-z", + "description": "", + "tags": [ + "圣遗物", + "备选" + ] + }, { "name": "狗粮-枫丹-黎翡区-芒索斯山东-塔内-4个（远+飞入）.json", "type": "file", @@ -1743,30 +1767,6 @@ "备选" ] }, - { - "name": "狗粮-稻妻-鹤观-东北-2个（无法就近传送）.json", - "type": "file", - "hash": "19ce5fb06ef46c977d67d7a12a1bf35469b071bb", - "version": "19ce5fb", - "author": "Yang-z", - "description": "", - "tags": [ - "圣遗物", - "备选" - ] - }, - { - "name": "狗粮-稻妻-鹤观-南-2个（远）.json", - "type": "file", - "hash": "e104930953feb646ad40fc92a76faa367f5f7eb5", - "version": "e104930", - "author": "Yang-z", - "description": "", - "tags": [ - "圣遗物", - "备选" - ] - }, { "name": "（恢复）狗粮-枫丹-莫尔泰区.json", "type": "file", @@ -1826,17 +1826,6 @@ "圣遗物" ] }, - { - "name": "狗粮-枫丹-研究院区-东-3个.json", - "type": "file", - "hash": "729c34552514bae0f787d11860c3c997a8cce887", - "version": "729c345", - "author": "Yang-z", - "description": "", - "tags": [ - "圣遗物" - ] - }, { "name": "狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json", "type": "file", @@ -1873,8 +1862,8 @@ { "name": "狗粮-枫丹-研究院区-西北-6个／7个.json", "type": "file", - "hash": "dc10091d297fb6760c6b5ae88eed37ec6ddcbc79", - "version": "dc10091", + "hash": "9a83d36240a4ca0ffa2efd1e9910128dec7486c2", + "version": "9a83d36", "author": "Yang-z", "description": "", "tags": [ @@ -1903,17 +1892,6 @@ "圣遗物" ] }, - { - "name": "狗粮-枫丹-莫尔泰区-七天神像-1个.json", - "type": "file", - "hash": "50fea6fed2f13834e1a2dbf826767e18c0c8617b", - "version": "50fea6f", - "author": "Yang-z", - "description": "", - "tags": [ - "圣遗物" - ] - }, { "name": "狗粮-枫丹-黎翡区-七天神像-5个.json", "type": "file", @@ -1961,8 +1939,8 @@ { "name": "狗粮-稻妻-海祇岛-珊瑚宫东北-6个.json", "type": "file", - "hash": "f8e56a946d6badc3799105500dfdfd6a0f719ea5", - "version": "f8e56a9", + "hash": "75e50ebb8676ecffa3d958fcac5eb709b9c64224", + "version": "75e50eb", "author": "Yang-z", "description": "", "tags": [ @@ -2057,6 +2035,28 @@ "圣遗物" ] }, + { + "name": "狗粮-稻妻-鹤观-东偏中-2个.json", + "type": "file", + "hash": "6038b67b81765753d34f24813ac3fda2831294c1", + "version": "6038b67", + "author": "Yang-z", + "description": "", + "tags": [ + "圣遗物" + ] + }, + { + "name": "狗粮-稻妻-鹤观-南-2个.json", + "type": "file", + "hash": "5fab14ba98662e20b58fcbe7b4c86e90fc930926", + "version": "5fab14b", + "author": "Yang-z", + "description": "", + "tags": [ + "圣遗物" + ] + }, { "name": "（恢复）狗粮-枫丹-研究院区.json", "type": "file", @@ -9065,8 +9065,8 @@ { "name": "AutoArtifacts_A_B_Extra", "type": "directory", - "hash": "9f0e235eaa8cded8b25d946b41f19421b6385df9", - "version": "1.4.2", + "hash": "3920717b30e7bc1c091bb3c5a317bb5aa9052923", + "version": "1.5", "author": "Yang-z", "description": "狗粮ABE路线，自动拾取分解~|~圣遗物狗粮AB路线自动轮换，及额外点位拾取，途中自动分解。更新纳塔5.2优质点位。", "tags": [] From 243c351e772d6def4e001e01bd72bcd27bbb9f2b Mon Sep 17 00:00:00 2001 From: Yang-z Date: Sat, 30 Nov 2024 12:12:01 +0800 Subject: [PATCH 6/7] fix a severe issue causing a stuck state --- .../狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json | 12 +++++++++ .../狗粮-须弥-上风蚀地-东北营地-2个.json | 6 +++++ .../狗粮-须弥-下风蚀地-阿如村-4个.json | 17 +++++++----- .../狗粮-须弥-浮罗囿-甘露花海北-4个.json | 20 +++++++------- repo/js/AutoArtifacts_A_B_Extra/main.js | 26 ++++++++++--------- repo/js/AutoArtifacts_A_B_Extra/manifest.json | 2 +- repo/js/AutoArtifacts_A_B_Extra/settings.json | 6 ----- .../狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json | 12 +++++++++ .../狗粮-须弥-上风蚀地-东北营地-2个.json | 6 +++++ .../狗粮-须弥-下风蚀地-阿如村-4个.json | 17 +++++++----- .../狗粮-须弥-浮罗囿-甘露花海北-4个.json | 20 +++++++------- 11 files changed, 93 insertions(+), 51 deletions(-) diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json index b954f10e..556cd5bd 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json @@ -176,6 +176,18 @@ "type": "target", "move_mode": "walk", "#": "12" + }, + { + "x": 9834.365234375, + "y": -563.93701171875, + "type": "path", + "move_mode": "walk" + }, + { + "x": 9831.587890625, + "y": -563.4140625, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-上风蚀地-东北营地-2个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-上风蚀地-东北营地-2个.json index e3260d87..243cb26c 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-上风蚀地-东北营地-2个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-上风蚀地-东北营地-2个.json @@ -11,6 +11,12 @@ "type": "teleport", "move_mode": "walk" }, + { + "x": 4176.16455078125, + "y": -2726.15234375, + "type": "path", + "move_mode": "run" + }, { "x": 4166.1396484375, "y": -2730.453125, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-4个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-4个.json index 206df317..0c74eb5f 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-4个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-4个.json @@ -131,7 +131,6 @@ "action": "stop_flying" }, - { "x": 4200.22802734375, "y": -2047.04541015625, @@ -149,8 +148,6 @@ "#": "3" }, - - { "x": 4212.25146484375, "y": -2026.8671875, @@ -158,15 +155,21 @@ "move_mode": "walk" }, { - "x": 4215.18701171875, - "y": -2025.05859375, + "x": 4215.06982421875, + "y": -2024.91357421875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "4" + }, + { + "x": 4215.0322265625, + "y": -2024.9189453125, "type": "target", "move_mode": "walk", "action": "", "#": "4" } - - ] } \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-浮罗囿-甘露花海北-4个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-浮罗囿-甘露花海北-4个.json index eef6f523..3ec45c3f 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-浮罗囿-甘露花海北-4个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-浮罗囿-甘露花海北-4个.json @@ -126,20 +126,22 @@ "move_mode": "fly" }, { - "x": 5638.16845703125, - "y": 893.82373046875, + "x": 5639.48388671875, + "y": 893.79638671875, "type": "target", "move_mode": "walk", - "action": "" + "action": "", + "#": 3 }, { - "x": 5641.98193359375, - "y": 892.064453125, + "x": 5639.455078125, + "y": 893.81201171875, "type": "target", - "move_mode": "walk" + "move_mode": "walk", + "action": "", + "#": 3 }, - { "x": 5603.14794921875, "y": 890.646484375, @@ -148,7 +150,6 @@ "action": "stop_flying" }, - { "x": 5546.05126953125, "y": 938.8857421875, @@ -172,7 +173,8 @@ "y": 913.49169921875, "type": "target", "move_mode": "walk", - "action": "" + "action": "", + "#": 4 } ] } \ 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 eece04c6..36b743ae 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/main.js +++ b/repo/js/AutoArtifacts_A_B_Extra/main.js @@ -29,8 +29,7 @@ "（恢复）狗粮-稻妻-神无冢.json", "【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个／21个.json", "【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个.json", - "【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json", - "（恢复）狗粮-稻妻-神无冢.json" + "【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个.json" ]; // 97+21个 const pathingB = [ @@ -62,8 +61,7 @@ "狗粮-稻妻-鹤观-东偏中-2个.json", "狗粮-稻妻-鹤观-南-2个.json", "（恢复）狗粮-稻妻-清籁岛.json", - "【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json", - "（恢复）狗粮-稻妻-清籁岛.json", + "【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json" ]; // 97+20个 const pathingE = [ @@ -91,17 +89,20 @@ } // 准备 - async function init() { + async function init(resizeMap = true) { // restore and alignment await genshin.tp("253.146484375", "1285.14306640625"); await sleep(3000); - // zoom map to 75% - keyPress("M"); await sleep(1000); - for (let i = 0; i < 5; i++) { - click(42, 420); await sleep(500); // zoom in + if (resizeMap) { + // zoom map to 75% + keyPress("M"); await sleep(1000); + for (let i = 0; i < 5; i++) { + click(42, 420); await sleep(500); // zoom in + } + click(42, 645); await sleep(1000); // zoom out + keyPress("M"); await sleep(1000); } - click(42, 645); await sleep(1000); // zoom out - keyPress("M"); await sleep(1000); + } // 分解圣遗物 @@ -153,14 +154,15 @@ // main determinePath(); - await init(); // A or B + await init(); log.info(`开始执行${path}线路。`); if (path == 'A') await batch(folderA, pathingA); else await batch(folderB, pathingB); // Extra + await init(false); log.info(`开始执行额外线路。`); await batch(folderE, pathingE, true); // 强制交互 diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index 38296b38..75026a24 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.5", + "version": "1.5.1", "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 67293b8c..f125e866 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/settings.json +++ b/repo/js/AutoArtifacts_A_B_Extra/settings.json @@ -1,10 +1,4 @@ [ - // bgi已捕获可预期异常并设置重试次数 - // { - // "name": "tryTimes", - // "type": "input-text", - // "label": "尝试次数" - // }, { "name": "path", diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json index b954f10e..556cd5bd 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json @@ -176,6 +176,18 @@ "type": "target", "move_mode": "walk", "#": "12" + }, + { + "x": 9834.365234375, + "y": -563.93701171875, + "type": "path", + "move_mode": "walk" + }, + { + "x": 9831.587890625, + "y": -563.4140625, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-上风蚀地-东北营地-2个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-上风蚀地-东北营地-2个.json index e3260d87..243cb26c 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-上风蚀地-东北营地-2个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-上风蚀地-东北营地-2个.json @@ -11,6 +11,12 @@ "type": "teleport", "move_mode": "walk" }, + { + "x": 4176.16455078125, + "y": -2726.15234375, + "type": "path", + "move_mode": "run" + }, { "x": 4166.1396484375, "y": -2730.453125, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-4个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-4个.json index 206df317..0c74eb5f 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-4个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-下风蚀地-阿如村-4个.json @@ -131,7 +131,6 @@ "action": "stop_flying" }, - { "x": 4200.22802734375, "y": -2047.04541015625, @@ -149,8 +148,6 @@ "#": "3" }, - - { "x": 4212.25146484375, "y": -2026.8671875, @@ -158,15 +155,21 @@ "move_mode": "walk" }, { - "x": 4215.18701171875, - "y": -2025.05859375, + "x": 4215.06982421875, + "y": -2024.91357421875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "4" + }, + { + "x": 4215.0322265625, + "y": -2024.9189453125, "type": "target", "move_mode": "walk", "action": "", "#": "4" } - - ] } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-浮罗囿-甘露花海北-4个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-浮罗囿-甘露花海北-4个.json index eef6f523..3ec45c3f 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-浮罗囿-甘露花海北-4个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-浮罗囿-甘露花海北-4个.json @@ -126,20 +126,22 @@ "move_mode": "fly" }, { - "x": 5638.16845703125, - "y": 893.82373046875, + "x": 5639.48388671875, + "y": 893.79638671875, "type": "target", "move_mode": "walk", - "action": "" + "action": "", + "#": 3 }, { - "x": 5641.98193359375, - "y": 892.064453125, + "x": 5639.455078125, + "y": 893.81201171875, "type": "target", - "move_mode": "walk" + "move_mode": "walk", + "action": "", + "#": 3 }, - { "x": 5603.14794921875, "y": 890.646484375, @@ -148,7 +150,6 @@ "action": "stop_flying" }, - { "x": 5546.05126953125, "y": 938.8857421875, @@ -172,7 +173,8 @@ "y": 913.49169921875, "type": "target", "move_mode": "walk", - "action": "" + "action": "", + "#": 4 } ] } \ No newline at end of file From 97c67a718d8c639dbecbabcb113da2bf6e6eed1b Mon Sep 17 00:00:00 2001 From: huiyadanli Date: Sat, 30 Nov 2024 04:37:22 +0000 Subject: [PATCH 7/7] update repo.json --- repo.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/repo.json b/repo.json index fd32da07..c6d95cd1 100644 --- a/repo.json +++ b/repo.json @@ -1,5 +1,5 @@ { - "time": "20241129164849", + "time": "20241130123721", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "file": "repo.json", "indexes": [ @@ -1453,8 +1453,8 @@ { "name": "狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json", "type": "file", - "hash": "9a33adcdaece93c25bf3699789a884200618297f", - "version": "9a33adc", + "hash": "9e09a8c1fc60bdb69d327d1a43c83dc3091d618e", + "version": "9e09a8c", "author": "Yang-z", "description": "", "tags": [ @@ -1508,8 +1508,8 @@ { "name": "狗粮-须弥-上风蚀地-东北营地-2个.json", "type": "file", - "hash": "0fa3477235db9ace38cd6c78f3e77842a85b36c6", - "version": "0fa3477", + "hash": "7092642f7a0e8ddb0296a9897194bb444a798321", + "version": "7092642", "author": "Yang-z", "description": "", "tags": [ @@ -1519,8 +1519,8 @@ { "name": "狗粮-须弥-下风蚀地-阿如村-4个.json", "type": "file", - "hash": "299bb3b2aecd615093db69227507d5a64af8d529", - "version": "299bb3b", + "hash": "fb1b20870a85a80f5695354852b599fbe94ebfb6", + "version": "fb1b208", "author": "Yang-z", "description": "", "tags": [ @@ -1563,8 +1563,8 @@ { "name": "狗粮-须弥-浮罗囿-甘露花海北-4个.json", "type": "file", - "hash": "a6bb8bf7dfd893aa6c7dc1672d38f54be5b1cea0", - "version": "a6bb8bf", + "hash": "8cd2eda5b1a4cef8b1d705ee35cad198c84df1ae", + "version": "8cd2eda", "author": "Yang-z", "description": "", "tags": [ @@ -9065,8 +9065,8 @@ { "name": "AutoArtifacts_A_B_Extra", "type": "directory", - "hash": "3920717b30e7bc1c091bb3c5a317bb5aa9052923", - "version": "1.5", + "hash": "e9c88cf2d5596c2134b53cece351ddb0c4b661f1", + "version": "1.5.1", "author": "Yang-z", "description": "狗粮ABE路线，自动拾取分解~|~圣遗物狗粮AB路线自动轮换，及额外点位拾取，途中自动分解。更新纳塔5.2优质点位。", "tags": []