From 379206e0239aae40272b8a96e01ff0d5778c8bbe Mon Sep 17 00:00:00 2001 From: Yang-z Date: Wed, 29 Jan 2025 23:20:53 +0800 Subject: [PATCH] autoArtifacts: adapt to bgi v0.40.0 --- .../狗粮-璃月-珉林-东北-9个-f.json | 15 ++---- .../狗粮-璃月-珉林-绝云间-3个-m.json | 46 +++++++++---------- .../狗粮-璃月-碧水源-盐中之地-3个-f.json | 6 +-- .../狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json | 2 + .../狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json | 12 +++-- .../狗粮-须弥-失落的苗圃-南-8个-f.json | 12 ++--- .../狗粮-枫丹-研究院区-中部塔内-9个.json | 4 +- .../狗粮-枫丹-研究院区-西南偏南-6个-m-f.json | 8 +--- .../狗粮-枫丹-研究院区-西南偏西-4个-f.json | 3 +- .../狗粮-稻妻-神无冢-堇色之庭-4个.json | 19 +++----- .../狗粮-稻妻-鹤观-东偏中-2个-f.json | 8 +--- ...】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json | 20 +++----- .../【额外】狗粮-纳塔-灵谜纹+13个.json | 19 ++++---- .../【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json | 18 +++----- .../【额外】狗粮-须弥-水天丛林+7个-f.json | 19 +++----- repo/js/AutoArtifacts_A_B_Extra/main.js | 6 +-- repo/js/AutoArtifacts_A_B_Extra/manifest.json | 4 +- .../狗粮-璃月-珉林-东北-9个-f.json | 15 ++---- .../狗粮-璃月-珉林-绝云间-3个-m.json | 46 +++++++++---------- .../狗粮-璃月-碧水源-盐中之地-3个-f.json | 6 +-- .../狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json | 2 + .../狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json | 12 +++-- .../狗粮-须弥-失落的苗圃-南-8个-f.json | 12 ++--- .../狗粮-枫丹-研究院区-中部塔内-9个.json | 4 +- .../狗粮-枫丹-研究院区-西南偏南-6个-m-f.json | 8 +--- .../狗粮-枫丹-研究院区-西南偏西-4个-f.json | 3 +- .../狗粮-稻妻-神无冢-堇色之庭-4个.json | 19 +++----- .../狗粮-稻妻-鹤观-东偏中-2个-f.json | 8 +--- ...外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json | 20 +++----- .../【额外】狗粮-纳塔-灵谜纹+13个.json | 19 ++++---- .../【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json | 18 +++----- .../【额外】狗粮-须弥-水天丛林+7个-f.json | 19 +++----- 32 files changed, 169 insertions(+), 263 deletions(-) diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个-f.json index 5a95554a..5cdb576a 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个-f.json @@ -268,18 +268,11 @@ "type": "target", "move_mode": "walk", "action": "", - "No.": "9" - }, - { - "x": 645.1220703125, - "y": 833.75927734375, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "9" - } + "No.": "9", - + "x_": 645.1220703125, + "y_": 833.75927734375 + } ] } \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个-m.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个-m.json index aa4a737f..ac807e77 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个-m.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个-m.json @@ -12,10 +12,10 @@ "move_mode": "walk" }, { - "x": 1188.5419921875, - "y": 620.3544921875, + "x": 1189.333984375, + "y": 619.7275390625, "type": "path", - "move_mode": "run" + "move_mode": "walk" }, { "x": 1172.51171875, @@ -34,23 +34,15 @@ }, { - "x": 1162.9501953125, - "y": 562.392578125, + "x": 1163.6103515625, + "y": 563.8779296875, "type": "path", "move_mode": "fly" }, { - "x": 1159.7470703125, - "y": 558.45849609375, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "2" - }, - { - "x": 1159.3759765625, - "y": 557.38232421875, + "x": 1159.9677734375, + "y": 558.46630859375, "type": "target", "move_mode": "walk", "action": "", @@ -58,10 +50,16 @@ }, { - "x": 1155.384765625, - "y": 558.2109375, + "x": 1158.4697265625, + "y": 555.63037109375, "type": "path", - "move_mode": "fly" + "move_mode": "walk" + }, + { + "x": 1153.23046875, + "y": 557.69970703125, + "type": "path", + "move_mode": "walk" }, { @@ -73,20 +71,20 @@ "No.": "3" }, { - "x": 1144.2958984375, - "y": 561.6005859375, + "x": 1144.01953125, + "y": 562.1396484375, "type": "path", "move_mode": "walk" }, { - "x": 1145.23828125, - "y": 562.7548828125, + "x": 1144.6865234375, + "y": 562.3701171875, "type": "path", "move_mode": "walk" }, { - "x": 1147.16796875, - "y": 563.333984375, + "x": 1147.0361328125, + "y": 563.318359375, "type": "path", "move_mode": "walk" } diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-碧水源-盐中之地-3个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-碧水源-盐中之地-3个-f.json index 74fc56ee..f29bc274 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-碧水源-盐中之地-3个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-璃月-碧水源-盐中之地-3个-f.json @@ -15,19 +15,19 @@ "x": -171.73828125, "y": 1225.6494140625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -147.2490234375, "y": 1261.24951171875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -95.0634765625, "y": 1238.294921875, "type": "target", - "move_mode": "run", + "move_mode": "dash", "action":"" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json index a7c27c63..bde75149 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json @@ -69,6 +69,8 @@ "y": 230.787109375, "type": "target", "move_mode": "walk", + "action": "combat_script", + "action_params": "wait(0.5)", "#": "5" }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json index a2e24e14..e876908a 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json @@ -81,10 +81,10 @@ }, { - "x": 3640.95849609375, - "y": -778.646484375, + "x": 3641.6064453125, + "y": -776.0947265625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { @@ -97,6 +97,12 @@ "No.": "4" }, + { + "x": 3645.6181640625, + "y": -793.22607421875, + "type": "path", + "move_mode": "walk" + }, { "x": 3648.5458984375, "y": -818.228515625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json index 0a530be5..57605422 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json @@ -134,14 +134,10 @@ "y": -1058.283203125, "type": "target", "move_mode": "walk", - "#": "4" - }, - { - "x": 4021.0546875, - "y": -1058.57568359375, - "type": "target", - "move_mode": "walk", - "#": "4" + "#": "4", + + "x_": 4021.0546875, + "y_": -1058.57568359375 }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json index 86ed248b..1a1ed4c0 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json @@ -39,13 +39,13 @@ "x": 4428.1611328125, "y": 5032.60498046875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4376.3173828125, "y": 4970.154296875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4418.76025390625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏南-6个-m-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏南-6个-m-f.json index ad8b786f..0fe47fc3 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏南-6个-m-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏南-6个-m-f.json @@ -57,17 +57,11 @@ "#": "1-2" }, - { - "x": 4510.43115234375, - "y": 4633.318359375, - "type": "path", - "move_mode": "run" - }, { "x": 4480.5830078125, "y": 4585.60888671875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4463.65234375, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json index bd520e48..a205ba8c 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json @@ -84,7 +84,8 @@ }, { - "x": 4568.73779296875, + "x0": 4568.73779296875, + "x": 4568.23779296875, "y": 4826.36181640625, "type": "target", "move_mode": "walk", diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json index eec76daa..7a6fc584 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json @@ -18,19 +18,18 @@ "move_mode": "walk" }, { - "x": -3936.80859375, - "y": -3203.115234375, + "x": -3939.6318359375, + "y": -3204.3203125, "type": "path", "move_mode": "fly" }, { - "x": -3940.4013671875, - "y": -3205.8408203125, + "x": -3940.5126953125, + "y": -3205.3515625, "type": "path", "move_mode": "fly" }, - { "x": -3954.767578125, "y": -3198.376953125, @@ -102,19 +101,13 @@ }, { - "x": -3988.2529296875, - "y": -3229.8310546875, + "x": -3988.3955078125, + "y": -3228.4501953125, "type": "target", "move_mode": "walk", "action": "combat_script", "action_params": "click,wait(0.5),click,wait(0.5),click,wait(0.2)", "#": 4 - }, - { - "x": -3986.27734375, - "y": -3233.6826171875, - "type": "path", - "move_mode": "walk" } ] diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json index 7a4f6033..be7de009 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json @@ -11,17 +11,11 @@ "type": "teleport", "move_mode": "walk" }, - { - "x": -3102.0263671875, - "y": -6266.6416015625, - "type": "path", - "move_mode": "run" - }, { "x": -3037.77734375, "y": -6187.048828125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json index ddcf99f3..986c8186 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json @@ -15,25 +15,19 @@ "x": 4445.49267578125, "y": 4615.71533203125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4376.025390625, "y": 4583.8095703125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4282.06689453125, "y": 4596, "type": "path", - "move_mode": "run" - }, - { - "x": 4274.20458984375, - "y": 4584.49267578125, - "type": "path", - "move_mode": "walk" + "move_mode": "dash" }, { @@ -93,13 +87,13 @@ "x": 4337.71875, "y": 4787.05126953125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4372.7822265625, "y": 4827.41943359375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { @@ -141,13 +135,13 @@ "x": 4428.43798828125, "y": 4838.923828125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4452.7392578125, "y": 4861.34375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json index 08c1c20d..062f23b9 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json @@ -168,7 +168,7 @@ "x": 9316.2021484375, "y": -1547.384765625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 9324.3671875, @@ -309,13 +309,16 @@ }, { - "x": 10098.3720703125, - "y": -92.80908203125, + "x": 10100.201171875, + "y": -92.39599609375, "type": "path", "move_mode": "walk", "action": "combat_script", "action_params": "mousedown,wait(1.0),mouseup", - "#": "10" + "#": "10", + + "x_": 10098.3720703125, + "y_": -92.80908203125 }, @@ -327,18 +330,12 @@ "move_mode": "walk", "action": "force_tp" }, - { - "x": 10070.185546875, - "y": 30.2275390625, - "type": "path", - "move_mode": "walk" - }, { "x": 10071.48046875, "y": 78.560546875, "type": "path", - "move_mode": "run", + "move_mode": "dash", "action": "combat_script", "action_params": "wait(0.2),keypress(t),wait(2.8),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", "//": "附身，起跳" diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json index a5b568c4..b8dc3cbb 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json @@ -122,25 +122,25 @@ "x": 8374.5419921875, "y": -1222.99951171875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 8264.1640625, "y": -1248.92578125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 8213.8203125, "y": -1255.82275390625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 8132.12255859375, "y": -1276.19970703125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { @@ -214,7 +214,7 @@ "x": 8140.86962890625, "y": -1458.4140625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 8143.83251953125, @@ -234,17 +234,11 @@ "move_mode": "walk", "action": "force_tp" }, - { - "x": 9791.4345703125, - "y": -1763.97802734375, - "type": "path", - "move_mode": "run" - }, { "x": 9888.5888671875, "y": -1760.61376953125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个-f.json index 51dc14d4..ce97fec9 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个-f.json @@ -109,13 +109,13 @@ "x": 3221.9130859375, "y": -1706.65869140625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 3238.64013671875, "y": -1669.9541015625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 3243.7470703125, @@ -138,8 +138,6 @@ "#": "3" }, - - { "x": 3259.34619140625, "y": -1663.18896484375, @@ -165,7 +163,6 @@ "move_mode": "run" }, - { "x": 3333.64697265625, "y": -1609.5849609375, @@ -184,16 +181,15 @@ "x": 3352.87890625, "y": -1650.6552734375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 3343.59326171875, "y": -1723.4775390625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, - { "x": 3331.9384765625, "y": -1733.673828125, @@ -227,10 +223,9 @@ "x": 3282.2421875, "y": -1822.77490234375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, - { "x": 3236.48193359375, "y": -1828.24462890625, @@ -252,13 +247,11 @@ "move_mode": "walk" }, - - { "x": 3206.49755859375, "y": -1832.580078125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 3204.3251953125, diff --git a/repo/js/AutoArtifacts_A_B_Extra/main.js b/repo/js/AutoArtifacts_A_B_Extra/main.js index b06aa430..59d5a394 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/main.js +++ b/repo/js/AutoArtifacts_A_B_Extra/main.js @@ -170,11 +170,7 @@ let forceInteraction = filePath.search("-f") != -1; // dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": forceInteraction })); - // 调整地图缩放 - // - 比如，绝云间传送点和副本紧挨。如地图缩得过小且在绝云间附近， - // - 在新版本（bgi v0.37.5）的传送方法下，依然会不缩放直接点击传送点， - // - 此时出现一个副本（在上）和一个传送锚点（在下）两个图标，都是有效传送点， - // - bgi直接点击上面那个，导致传至副本门口。 + // 调整地图缩放 (bgi[v0.40.0]版本下仍需要，可能下个版本会解决) let shouldResizeMap = filePath.search("-m") != -1; if (shouldResizeMap) await resizeMap(); diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index edeab9f1..e518a201 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/manifest.json +++ b/repo/js/AutoArtifacts_A_B_Extra/manifest.json @@ -1,8 +1,8 @@ { "manifest_version": 1, "name": "狗粮ABE路线，自动拾取分解", - "version": "2.2.0", - "bgi_version": "0.38.1", + "version": "2.2.1", + "bgi_version": "0.40.0", "description": "圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。", "authors": [ { diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个-f.json index 5a95554a..5cdb576a 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-东北-9个-f.json @@ -268,18 +268,11 @@ "type": "target", "move_mode": "walk", "action": "", - "No.": "9" - }, - { - "x": 645.1220703125, - "y": 833.75927734375, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "9" - } + "No.": "9", - + "x_": 645.1220703125, + "y_": 833.75927734375 + } ] } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个-m.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个-m.json index aa4a737f..ac807e77 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个-m.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-珉林-绝云间-3个-m.json @@ -12,10 +12,10 @@ "move_mode": "walk" }, { - "x": 1188.5419921875, - "y": 620.3544921875, + "x": 1189.333984375, + "y": 619.7275390625, "type": "path", - "move_mode": "run" + "move_mode": "walk" }, { "x": 1172.51171875, @@ -34,23 +34,15 @@ }, { - "x": 1162.9501953125, - "y": 562.392578125, + "x": 1163.6103515625, + "y": 563.8779296875, "type": "path", "move_mode": "fly" }, { - "x": 1159.7470703125, - "y": 558.45849609375, - "type": "target", - "move_mode": "walk", - "action": "", - "No.": "2" - }, - { - "x": 1159.3759765625, - "y": 557.38232421875, + "x": 1159.9677734375, + "y": 558.46630859375, "type": "target", "move_mode": "walk", "action": "", @@ -58,10 +50,16 @@ }, { - "x": 1155.384765625, - "y": 558.2109375, + "x": 1158.4697265625, + "y": 555.63037109375, "type": "path", - "move_mode": "fly" + "move_mode": "walk" + }, + { + "x": 1153.23046875, + "y": 557.69970703125, + "type": "path", + "move_mode": "walk" }, { @@ -73,20 +71,20 @@ "No.": "3" }, { - "x": 1144.2958984375, - "y": 561.6005859375, + "x": 1144.01953125, + "y": 562.1396484375, "type": "path", "move_mode": "walk" }, { - "x": 1145.23828125, - "y": 562.7548828125, + "x": 1144.6865234375, + "y": 562.3701171875, "type": "path", "move_mode": "walk" }, { - "x": 1147.16796875, - "y": 563.333984375, + "x": 1147.0361328125, + "y": 563.318359375, "type": "path", "move_mode": "walk" } diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-碧水源-盐中之地-3个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-碧水源-盐中之地-3个-f.json index 74fc56ee..f29bc274 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-碧水源-盐中之地-3个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-璃月-碧水源-盐中之地-3个-f.json @@ -15,19 +15,19 @@ "x": -171.73828125, "y": 1225.6494140625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -147.2490234375, "y": 1261.24951171875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -95.0634765625, "y": 1238.294921875, "type": "target", - "move_mode": "run", + "move_mode": "dash", "action":"" }, { diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json index a7c27c63..bde75149 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json @@ -69,6 +69,8 @@ "y": 230.787109375, "type": "target", "move_mode": "walk", + "action": "combat_script", + "action_params": "wait(0.5)", "#": "5" }, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json index a2e24e14..e876908a 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-二净甸-觉王之殿南-6个／7个-f.json @@ -81,10 +81,10 @@ }, { - "x": 3640.95849609375, - "y": -778.646484375, + "x": 3641.6064453125, + "y": -776.0947265625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { @@ -97,6 +97,12 @@ "No.": "4" }, + { + "x": 3645.6181640625, + "y": -793.22607421875, + "type": "path", + "move_mode": "walk" + }, { "x": 3648.5458984375, "y": -818.228515625, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json index 0a530be5..57605422 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json @@ -134,14 +134,10 @@ "y": -1058.283203125, "type": "target", "move_mode": "walk", - "#": "4" - }, - { - "x": 4021.0546875, - "y": -1058.57568359375, - "type": "target", - "move_mode": "walk", - "#": "4" + "#": "4", + + "x_": 4021.0546875, + "y_": -1058.57568359375 }, { diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json index 86ed248b..1a1ed4c0 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json @@ -39,13 +39,13 @@ "x": 4428.1611328125, "y": 5032.60498046875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4376.3173828125, "y": 4970.154296875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4418.76025390625, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏南-6个-m-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏南-6个-m-f.json index ad8b786f..0fe47fc3 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏南-6个-m-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏南-6个-m-f.json @@ -57,17 +57,11 @@ "#": "1-2" }, - { - "x": 4510.43115234375, - "y": 4633.318359375, - "type": "path", - "move_mode": "run" - }, { "x": 4480.5830078125, "y": 4585.60888671875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4463.65234375, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json index bd520e48..a205ba8c 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西南偏西-4个-f.json @@ -84,7 +84,8 @@ }, { - "x": 4568.73779296875, + "x0": 4568.73779296875, + "x": 4568.23779296875, "y": 4826.36181640625, "type": "target", "move_mode": "walk", diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json index eec76daa..7a6fc584 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json @@ -18,19 +18,18 @@ "move_mode": "walk" }, { - "x": -3936.80859375, - "y": -3203.115234375, + "x": -3939.6318359375, + "y": -3204.3203125, "type": "path", "move_mode": "fly" }, { - "x": -3940.4013671875, - "y": -3205.8408203125, + "x": -3940.5126953125, + "y": -3205.3515625, "type": "path", "move_mode": "fly" }, - { "x": -3954.767578125, "y": -3198.376953125, @@ -102,19 +101,13 @@ }, { - "x": -3988.2529296875, - "y": -3229.8310546875, + "x": -3988.3955078125, + "y": -3228.4501953125, "type": "target", "move_mode": "walk", "action": "combat_script", "action_params": "click,wait(0.5),click,wait(0.5),click,wait(0.2)", "#": 4 - }, - { - "x": -3986.27734375, - "y": -3233.6826171875, - "type": "path", - "move_mode": "walk" } ] diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json index 7a4f6033..be7de009 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-鹤观-东偏中-2个-f.json @@ -11,17 +11,11 @@ "type": "teleport", "move_mode": "walk" }, - { - "x": -3102.0263671875, - "y": -6266.6416015625, - "type": "path", - "move_mode": "run" - }, { "x": -3037.77734375, "y": -6187.048828125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json index ddcf99f3..986c8186 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-枫丹-研究院区-新枫丹科学院周边+3个-f.json @@ -15,25 +15,19 @@ "x": 4445.49267578125, "y": 4615.71533203125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4376.025390625, "y": 4583.8095703125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4282.06689453125, "y": 4596, "type": "path", - "move_mode": "run" - }, - { - "x": 4274.20458984375, - "y": 4584.49267578125, - "type": "path", - "move_mode": "walk" + "move_mode": "dash" }, { @@ -93,13 +87,13 @@ "x": 4337.71875, "y": 4787.05126953125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4372.7822265625, "y": 4827.41943359375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { @@ -141,13 +135,13 @@ "x": 4428.43798828125, "y": 4838.923828125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 4452.7392578125, "y": 4861.34375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json index 08c1c20d..062f23b9 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json @@ -168,7 +168,7 @@ "x": 9316.2021484375, "y": -1547.384765625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 9324.3671875, @@ -309,13 +309,16 @@ }, { - "x": 10098.3720703125, - "y": -92.80908203125, + "x": 10100.201171875, + "y": -92.39599609375, "type": "path", "move_mode": "walk", "action": "combat_script", "action_params": "mousedown,wait(1.0),mouseup", - "#": "10" + "#": "10", + + "x_": 10098.3720703125, + "y_": -92.80908203125 }, @@ -327,18 +330,12 @@ "move_mode": "walk", "action": "force_tp" }, - { - "x": 10070.185546875, - "y": 30.2275390625, - "type": "path", - "move_mode": "walk" - }, { "x": 10071.48046875, "y": 78.560546875, "type": "path", - "move_mode": "run", + "move_mode": "dash", "action": "combat_script", "action_params": "wait(0.2),keypress(t),wait(2.8),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", "//": "附身，起跳" diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json index a5b568c4..b8dc3cbb 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+8个／9个-f.json @@ -122,25 +122,25 @@ "x": 8374.5419921875, "y": -1222.99951171875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 8264.1640625, "y": -1248.92578125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 8213.8203125, "y": -1255.82275390625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 8132.12255859375, "y": -1276.19970703125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { @@ -214,7 +214,7 @@ "x": 8140.86962890625, "y": -1458.4140625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 8143.83251953125, @@ -234,17 +234,11 @@ "move_mode": "walk", "action": "force_tp" }, - { - "x": 9791.4345703125, - "y": -1763.97802734375, - "type": "path", - "move_mode": "run" - }, { "x": 9888.5888671875, "y": -1760.61376953125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个-f.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个-f.json index 51dc14d4..ce97fec9 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个-f.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-须弥-水天丛林+7个-f.json @@ -109,13 +109,13 @@ "x": 3221.9130859375, "y": -1706.65869140625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 3238.64013671875, "y": -1669.9541015625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 3243.7470703125, @@ -138,8 +138,6 @@ "#": "3" }, - - { "x": 3259.34619140625, "y": -1663.18896484375, @@ -165,7 +163,6 @@ "move_mode": "run" }, - { "x": 3333.64697265625, "y": -1609.5849609375, @@ -184,16 +181,15 @@ "x": 3352.87890625, "y": -1650.6552734375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 3343.59326171875, "y": -1723.4775390625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, - { "x": 3331.9384765625, "y": -1733.673828125, @@ -227,10 +223,9 @@ "x": 3282.2421875, "y": -1822.77490234375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, - { "x": 3236.48193359375, "y": -1828.24462890625, @@ -252,13 +247,11 @@ "move_mode": "walk" }, - - { "x": 3206.49755859375, "y": -1832.580078125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 3204.3251953125,