From 9209bcc060ae2256493ce2efd5dae6a3230c07d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90?= <121607261+jiegedabaobei@users.noreply.github.com> Date: Sun, 19 Apr 2026 06:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=97=E7=B2=AE=E5=B0=8F=E5=B8=83=E4=B8=814.?= =?UTF-8?q?18=20(#3141)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../执行/512枫丹-歌剧院右下2.json | 12 +-- .../执行/622纳塔-悠悠集市栈道南7.json | 78 +++++++++++-------- .../普通98点1号线/执行/643纳塔-提提岛东3.json | 28 ++++--- .../01普通/622纳塔-悠悠集市栈道南7.json | 78 +++++++++++-------- .../高铁2号线/01普通/643纳塔-提提岛东3.json | 28 ++++--- .../AAA-Artifacts-Bulk-Supply/manifest.json | 2 +- repo/js/ArtifactsGroupPurchasing/README.md | 1 + .../执行/629【多人】纳塔-悠悠集市西北岸8.json | 17 +++- repo/js/ArtifactsGroupPurchasing/main.js | 32 ++++++-- .../js/ArtifactsGroupPurchasing/manifest.json | 2 +- 10 files changed, 170 insertions(+), 108 deletions(-) diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/512枫丹-歌剧院右下2.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/512枫丹-歌剧院右下2.json index d2bd0bafa..af28052a9 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/512枫丹-歌剧院右下2.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/512枫丹-歌剧院右下2.json @@ -9,7 +9,7 @@ "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1766672405611, + "last_modified_time": 1776449925403, "map_match_method": "", "map_name": "Teyvat", "name": "512枫丹-歌剧院右下2", @@ -27,13 +27,13 @@ "y": 3254.333251953125 }, { - "action": "", - "action_params": "", + "action": "combat_script", + "action_params": "attack(0.1)", "id": 2, "move_mode": "dash", "type": "path", - "x": 3618.656212474212, - "y": 3272.375075789818 + "x": 3618.25, + "y": 3271.2815155056996 }, { "action": "combat_script", @@ -46,7 +46,7 @@ }, { "action": "combat_script", - "action_params": "keypress(f),w(0.2),keypress(f),wait(0.1),keypress(f);迪希雅 attack(0.08),e;", + "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.1),keypress(f);迪希雅 attack(0.08),e;", "id": 4, "move_mode": "dash", "type": "path", diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/622纳塔-悠悠集市栈道南7.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/622纳塔-悠悠集市栈道南7.json index 8c30edd2d..be8f3786e 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/622纳塔-悠悠集市栈道南7.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/622纳塔-悠悠集市栈道南7.json @@ -9,7 +9,7 @@ "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1771055550181, + "last_modified_time": 1776534884177, "map_match_method": "", "map_name": "Teyvat", "name": "622纳塔-悠悠集市栈道南7", @@ -27,10 +27,20 @@ "x": 13756.095703125, "y": 385.05859375 }, + { + "action": "", + "action_params": "", + "id": 2, + "locked": false, + "move_mode": "fly", + "type": "orientation", + "x": 13772.312588876866, + "y": 402.43680273368045 + }, { "action": "combat_script", "action_params": "attack(0.3)", - "id": 2, + "id": 3, "move_mode": "fly", "type": "path", "x": 13772.312588876866, @@ -39,7 +49,7 @@ { "action": "combat_script", "action_params": "keypress(f),s(0.2),d(0.15);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 3, + "id": 4, "move_mode": "dash", "type": "target", "x": 13778.564453125, @@ -48,7 +58,7 @@ { "action": "", "action_params": "", - "id": 4, + "id": 5, "move_mode": "walk", "type": "teleport", "x": 13756.095703125, @@ -57,7 +67,7 @@ { "action": "", "action_params": "", - "id": 5, + "id": 6, "move_mode": "dash", "type": "path", "x": 13740.099609375, @@ -66,7 +76,7 @@ { "action": "combat_script", "action_params": "wait(1.1)", - "id": 6, + "id": 7, "move_mode": "dash", "type": "orientation", "x": 13736.154296875, @@ -75,7 +85,7 @@ { "action": "combat_script", "action_params": "keypress(f),keypress(x),wait(0.2),keypress(x),keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 7, + "id": 8, "move_mode": "dash", "type": "target", "x": 13736.154296875, @@ -84,7 +94,7 @@ { "action": "", "action_params": "", - "id": 8, + "id": 9, "move_mode": "climb", "type": "path", "x": 13738.2080078125, @@ -93,7 +103,7 @@ { "action": "combat_script", "action_params": "keypress(t),wait(0.2),keypress(t),wait(0.8),a(0.5)", - "id": 9, + "id": 10, "move_mode": "walk", "type": "orientation", "x": 13738.2099609375, @@ -102,7 +112,7 @@ { "action": "", "action_params": "", - "id": 10, + "id": 11, "move_mode": "run", "type": "path", "x": 13730.404296875, @@ -111,7 +121,7 @@ { "action": "", "action_params": "", - "id": 11, + "id": 12, "move_mode": "climb", "type": "target", "x": 13733.9775390625, @@ -120,18 +130,9 @@ { "action": "combat_script", "action_params": "a(0.4),keydown(w),wait(0.25),keypress(e),wait(2),keypress(e),wait(0.6),keyup(w)", - "id": 12, - "move_mode": "dash", - "type": "orientation", - "x": 13761.7021484375, - "y": 258.89990234375 - }, - { - "action": "", - "action_params": "", "id": 13, "move_mode": "dash", - "type": "path", + "type": "orientation", "x": 13761.7021484375, "y": 258.89990234375 }, @@ -141,13 +142,22 @@ "id": 14, "move_mode": "dash", "type": "path", + "x": 13761.7021484375, + "y": 258.89990234375 + }, + { + "action": "", + "action_params": "", + "id": 15, + "move_mode": "dash", + "type": "path", "x": 13760.41015625, "y": 239.271484375 }, { "action": "combat_script", "action_params": "keypress(f),keypress(x),wait(0.2),keypress(f),keypress(x),s(0.2)", - "id": 15, + "id": 16, "move_mode": "run", "type": "target", "x": 13756.1435546875, @@ -156,7 +166,7 @@ { "action": "", "action_params": "", - "id": 16, + "id": 17, "move_mode": "dash", "type": "path", "x": 13773.4609375, @@ -165,7 +175,7 @@ { "action": "combat_script", "action_params": "keypress(x),wait(0.2),keydown(Q),keypress(f),wait(0.8),keypress(f),keyup(Q),wait(0.1),j,keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),attack(0.08)", - "id": 17, + "id": 18, "move_mode": "dash", "type": "path", "x": 13769.43359375, @@ -174,7 +184,7 @@ { "action": "", "action_params": "", - "id": 18, + "id": 19, "move_mode": "swim", "type": "target", "x": 13764.375, @@ -183,7 +193,7 @@ { "action": "", "action_params": "", - "id": 19, + "id": 20, "move_mode": "swim", "type": "path", "x": 13763.9375, @@ -192,7 +202,7 @@ { "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "id": 20, + "id": 21, "move_mode": "swim", "type": "target", "x": 13763.9921875, @@ -201,7 +211,7 @@ { "action": "combat_script", "action_params": "keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2),wait(3);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 21, + "id": 22, "move_mode": "walk", "type": "path", "x": 13761.0244140625, @@ -210,7 +220,7 @@ { "action": "", "action_params": "", - "id": 22, + "id": 23, "move_mode": "dash", "type": "path", "x": 13753.490234375, @@ -219,7 +229,7 @@ { "action": "combat_script", "action_params": "keypress(f);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 23, + "id": 24, "move_mode": "dash", "type": "target", "x": 13753.125, @@ -228,7 +238,7 @@ { "action": "", "action_params": "", - "id": 24, + "id": 25, "move_mode": "run", "type": "path", "x": 13745.78125, @@ -237,7 +247,7 @@ { "action": "", "action_params": "", - "id": 25, + "id": 26, "move_mode": "run", "type": "path", "x": 13738.4453125, @@ -246,7 +256,7 @@ { "action": "combat_script", "action_params": "keydown(w),wait(0.5),j,keyup(w),keypress(f),wait(0.6);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 26, + "id": 27, "move_mode": "climb", "type": "orientation", "x": 13737.6953125, @@ -255,7 +265,7 @@ { "action": "combat_script", "action_params": "keydown(w),wait(0.5),j,keyup(w),keypress(f)", - "id": 27, + "id": 28, "move_mode": "climb", "type": "orientation", "x": 13737.6953125, diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/643纳塔-提提岛东3.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/643纳塔-提提岛东3.json index 1948eeefb..9dae3b70c 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/643纳塔-提提岛东3.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/643纳塔-提提岛东3.json @@ -9,7 +9,7 @@ "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1762602291296, + "last_modified_time": 1776450173969, "map_match_method": "", "map_name": "Teyvat", "name": "643纳塔-提提岛东3", @@ -69,13 +69,22 @@ "id": 6, "move_mode": "dash", "type": "path", + "x": 15036.787109375, + "y": 1406.43701171875 + }, + { + "action": "", + "action_params": "", + "id": 7, + "move_mode": "climb", + "type": "path", "x": 15039.6259765625, "y": 1407.97900390625 }, { "action": "", "action_params": "", - "id": 7, + "id": 8, "move_mode": "climb", "type": "target", "x": 15038.63671875, @@ -84,8 +93,7 @@ { "action": "combat_script", "action_params": "keypress(f),w(0.1);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 8, - "locked": false, + "id": 9, "move_mode": "dash", "type": "orientation", "x": 15034.2138671875, @@ -94,7 +102,7 @@ { "action": "", "action_params": "", - "id": 9, + "id": 10, "move_mode": "dash", "type": "path", "x": 15034.2138671875, @@ -103,7 +111,7 @@ { "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),a(0.15);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 10, + "id": 11, "move_mode": "climb", "type": "target", "x": 15032.81640625, @@ -112,7 +120,7 @@ { "action": "", "action_params": "", - "id": 11, + "id": 12, "move_mode": "dash", "type": "path", "x": 15035.798828125, @@ -121,7 +129,7 @@ { "action": "", "action_params": "", - "id": 12, + "id": 13, "move_mode": "dash", "type": "path", "x": 15031.126953125, @@ -130,7 +138,7 @@ { "action": "", "action_params": "", - "id": 13, + "id": 14, "move_mode": "dash", "type": "path", "x": 15037.6103515625, @@ -139,7 +147,7 @@ { "action": "combat_script", "action_params": "keypress(f),s(0.1);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 14, + "id": 15, "move_mode": "climb", "type": "target", "x": 15037.427734375, diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/622纳塔-悠悠集市栈道南7.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/622纳塔-悠悠集市栈道南7.json index 8c30edd2d..be8f3786e 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/622纳塔-悠悠集市栈道南7.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/622纳塔-悠悠集市栈道南7.json @@ -9,7 +9,7 @@ "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1771055550181, + "last_modified_time": 1776534884177, "map_match_method": "", "map_name": "Teyvat", "name": "622纳塔-悠悠集市栈道南7", @@ -27,10 +27,20 @@ "x": 13756.095703125, "y": 385.05859375 }, + { + "action": "", + "action_params": "", + "id": 2, + "locked": false, + "move_mode": "fly", + "type": "orientation", + "x": 13772.312588876866, + "y": 402.43680273368045 + }, { "action": "combat_script", "action_params": "attack(0.3)", - "id": 2, + "id": 3, "move_mode": "fly", "type": "path", "x": 13772.312588876866, @@ -39,7 +49,7 @@ { "action": "combat_script", "action_params": "keypress(f),s(0.2),d(0.15);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 3, + "id": 4, "move_mode": "dash", "type": "target", "x": 13778.564453125, @@ -48,7 +58,7 @@ { "action": "", "action_params": "", - "id": 4, + "id": 5, "move_mode": "walk", "type": "teleport", "x": 13756.095703125, @@ -57,7 +67,7 @@ { "action": "", "action_params": "", - "id": 5, + "id": 6, "move_mode": "dash", "type": "path", "x": 13740.099609375, @@ -66,7 +76,7 @@ { "action": "combat_script", "action_params": "wait(1.1)", - "id": 6, + "id": 7, "move_mode": "dash", "type": "orientation", "x": 13736.154296875, @@ -75,7 +85,7 @@ { "action": "combat_script", "action_params": "keypress(f),keypress(x),wait(0.2),keypress(x),keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 7, + "id": 8, "move_mode": "dash", "type": "target", "x": 13736.154296875, @@ -84,7 +94,7 @@ { "action": "", "action_params": "", - "id": 8, + "id": 9, "move_mode": "climb", "type": "path", "x": 13738.2080078125, @@ -93,7 +103,7 @@ { "action": "combat_script", "action_params": "keypress(t),wait(0.2),keypress(t),wait(0.8),a(0.5)", - "id": 9, + "id": 10, "move_mode": "walk", "type": "orientation", "x": 13738.2099609375, @@ -102,7 +112,7 @@ { "action": "", "action_params": "", - "id": 10, + "id": 11, "move_mode": "run", "type": "path", "x": 13730.404296875, @@ -111,7 +121,7 @@ { "action": "", "action_params": "", - "id": 11, + "id": 12, "move_mode": "climb", "type": "target", "x": 13733.9775390625, @@ -120,18 +130,9 @@ { "action": "combat_script", "action_params": "a(0.4),keydown(w),wait(0.25),keypress(e),wait(2),keypress(e),wait(0.6),keyup(w)", - "id": 12, - "move_mode": "dash", - "type": "orientation", - "x": 13761.7021484375, - "y": 258.89990234375 - }, - { - "action": "", - "action_params": "", "id": 13, "move_mode": "dash", - "type": "path", + "type": "orientation", "x": 13761.7021484375, "y": 258.89990234375 }, @@ -141,13 +142,22 @@ "id": 14, "move_mode": "dash", "type": "path", + "x": 13761.7021484375, + "y": 258.89990234375 + }, + { + "action": "", + "action_params": "", + "id": 15, + "move_mode": "dash", + "type": "path", "x": 13760.41015625, "y": 239.271484375 }, { "action": "combat_script", "action_params": "keypress(f),keypress(x),wait(0.2),keypress(f),keypress(x),s(0.2)", - "id": 15, + "id": 16, "move_mode": "run", "type": "target", "x": 13756.1435546875, @@ -156,7 +166,7 @@ { "action": "", "action_params": "", - "id": 16, + "id": 17, "move_mode": "dash", "type": "path", "x": 13773.4609375, @@ -165,7 +175,7 @@ { "action": "combat_script", "action_params": "keypress(x),wait(0.2),keydown(Q),keypress(f),wait(0.8),keypress(f),keyup(Q),wait(0.1),j,keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),attack(0.08)", - "id": 17, + "id": 18, "move_mode": "dash", "type": "path", "x": 13769.43359375, @@ -174,7 +184,7 @@ { "action": "", "action_params": "", - "id": 18, + "id": 19, "move_mode": "swim", "type": "target", "x": 13764.375, @@ -183,7 +193,7 @@ { "action": "", "action_params": "", - "id": 19, + "id": 20, "move_mode": "swim", "type": "path", "x": 13763.9375, @@ -192,7 +202,7 @@ { "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "id": 20, + "id": 21, "move_mode": "swim", "type": "target", "x": 13763.9921875, @@ -201,7 +211,7 @@ { "action": "combat_script", "action_params": "keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2),wait(3);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 21, + "id": 22, "move_mode": "walk", "type": "path", "x": 13761.0244140625, @@ -210,7 +220,7 @@ { "action": "", "action_params": "", - "id": 22, + "id": 23, "move_mode": "dash", "type": "path", "x": 13753.490234375, @@ -219,7 +229,7 @@ { "action": "combat_script", "action_params": "keypress(f);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 23, + "id": 24, "move_mode": "dash", "type": "target", "x": 13753.125, @@ -228,7 +238,7 @@ { "action": "", "action_params": "", - "id": 24, + "id": 25, "move_mode": "run", "type": "path", "x": 13745.78125, @@ -237,7 +247,7 @@ { "action": "", "action_params": "", - "id": 25, + "id": 26, "move_mode": "run", "type": "path", "x": 13738.4453125, @@ -246,7 +256,7 @@ { "action": "combat_script", "action_params": "keydown(w),wait(0.5),j,keyup(w),keypress(f),wait(0.6);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 26, + "id": 27, "move_mode": "climb", "type": "orientation", "x": 13737.6953125, @@ -255,7 +265,7 @@ { "action": "combat_script", "action_params": "keydown(w),wait(0.5),j,keyup(w),keypress(f)", - "id": 27, + "id": 28, "move_mode": "climb", "type": "orientation", "x": 13737.6953125, diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/643纳塔-提提岛东3.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/643纳塔-提提岛东3.json index 1948eeefb..9dae3b70c 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/643纳塔-提提岛东3.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/643纳塔-提提岛东3.json @@ -9,7 +9,7 @@ "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1762602291296, + "last_modified_time": 1776450173969, "map_match_method": "", "map_name": "Teyvat", "name": "643纳塔-提提岛东3", @@ -69,13 +69,22 @@ "id": 6, "move_mode": "dash", "type": "path", + "x": 15036.787109375, + "y": 1406.43701171875 + }, + { + "action": "", + "action_params": "", + "id": 7, + "move_mode": "climb", + "type": "path", "x": 15039.6259765625, "y": 1407.97900390625 }, { "action": "", "action_params": "", - "id": 7, + "id": 8, "move_mode": "climb", "type": "target", "x": 15038.63671875, @@ -84,8 +93,7 @@ { "action": "combat_script", "action_params": "keypress(f),w(0.1);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 8, - "locked": false, + "id": 9, "move_mode": "dash", "type": "orientation", "x": 15034.2138671875, @@ -94,7 +102,7 @@ { "action": "", "action_params": "", - "id": 9, + "id": 10, "move_mode": "dash", "type": "path", "x": 15034.2138671875, @@ -103,7 +111,7 @@ { "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),a(0.15);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 10, + "id": 11, "move_mode": "climb", "type": "target", "x": 15032.81640625, @@ -112,7 +120,7 @@ { "action": "", "action_params": "", - "id": 11, + "id": 12, "move_mode": "dash", "type": "path", "x": 15035.798828125, @@ -121,7 +129,7 @@ { "action": "", "action_params": "", - "id": 12, + "id": 13, "move_mode": "dash", "type": "path", "x": 15031.126953125, @@ -130,7 +138,7 @@ { "action": "", "action_params": "", - "id": 13, + "id": 14, "move_mode": "dash", "type": "path", "x": 15037.6103515625, @@ -139,7 +147,7 @@ { "action": "combat_script", "action_params": "keypress(f),s(0.1);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 14, + "id": 15, "move_mode": "climb", "type": "target", "x": 15037.427734375, diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json index cd961e399..b57d3859a 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮批发", - "version": "2.4.0", + "version": "2.4.1", "tags": [ "狗粮" ], diff --git a/repo/js/ArtifactsGroupPurchasing/README.md b/repo/js/ArtifactsGroupPurchasing/README.md index 7cb6cdf26..e59aa8a68 100644 --- a/repo/js/ArtifactsGroupPurchasing/README.md +++ b/repo/js/ArtifactsGroupPurchasing/README.md @@ -1 +1,2 @@ +联机狗粮仅供有过运行狗粮批发经验,会使用BGI的参与,基础BGI使用问题请前往大群 联机群:985946536 \ No newline at end of file diff --git a/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/度假村/执行/629【多人】纳塔-悠悠集市西北岸8.json b/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/度假村/执行/629【多人】纳塔-悠悠集市西北岸8.json index 4be6efee7..8906f45ab 100644 --- a/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/度假村/执行/629【多人】纳塔-悠悠集市西北岸8.json +++ b/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/度假村/执行/629【多人】纳塔-悠悠集市西北岸8.json @@ -9,7 +9,7 @@ "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1774890427031, + "last_modified_time": 1776534769609, "map_match_method": "", "map_name": "Teyvat", "name": "629【多人】纳塔-悠悠集市西北岸8", @@ -193,6 +193,15 @@ "action": "", "action_params": "", "id": 20, + "move_mode": "walk", + "type": "target", + "x": 14071.1787109375, + "y": 571.48828125 + }, + { + "action": "", + "action_params": "", + "id": 21, "move_mode": "dash", "type": "path", "x": 14067.958984375, @@ -201,7 +210,7 @@ { "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 21, + "id": 22, "move_mode": "dash", "type": "target", "x": 14058.0068359375, @@ -210,7 +219,7 @@ { "action": "", "action_params": "", - "id": 22, + "id": 23, "move_mode": "dash", "type": "path", "x": 14023.177734375, @@ -219,7 +228,7 @@ { "action": "combat_script", "action_params": "keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", - "id": 23, + "id": 24, "move_mode": "climb", "type": "target", "x": 14018.1416015625, diff --git a/repo/js/ArtifactsGroupPurchasing/main.js b/repo/js/ArtifactsGroupPurchasing/main.js index 321a69dd0..083578118 100644 --- a/repo/js/ArtifactsGroupPurchasing/main.js +++ b/repo/js/ArtifactsGroupPurchasing/main.js @@ -27,6 +27,7 @@ let expGain; let skipRunning = false; let crashType = null; // 记录炸车类型 let rideTime = new Date().toISOString(); // 记录上车时间 +let enteredPlayers = []; // 记录已进入的玩家(全局变量) let runnedEnding = false; let onlineRecord = { lastRunTime: new Date(0).toISOString(), @@ -139,6 +140,7 @@ let onlineRecord = { }; Object.assign(autoEnterSettings, permits); + enteredPlayers = []; log.info(`等待他人进入自己世界,目标人数:${autoEnterSettings.maxEnterCount}`); notification.send(`等待他人进入自己世界,目标人数:${autoEnterSettings.maxEnterCount}`); } else { @@ -788,7 +790,6 @@ async function autoEnter(autoEnterSettings) { // ===== 状态 ===== let enterCount = 0; let targetsRo = []; - let enteredPlayers = []; let success = false; // ===== 初始化 ===== @@ -1899,6 +1900,7 @@ async function writeOnlineRecord(isCrash) { const record = { onlineInfo: correctedOnlineInfo, isCrash: isCrash, + isHost: isHost, endTime: new Date().toISOString() }; @@ -1954,7 +1956,7 @@ async function handleOnlineRecordAndReonline(isCrash, crashType = null) { // 检查是否所有运行记录(不含炸车)均未当过房主 const hasBeenHost = onlineRecord.todayRecords.some(record => - !record.isCrash && record.onlineInfo && !record.onlineInfo.notHost + !record.isCrash && record.isHost ); log.info(`今日是否当过房主: ${hasBeenHost}`); @@ -2025,7 +2027,7 @@ async function generateReonlineCommand(onlineInfo = null, isCrash = false, crash // 如果是炸车 if (isCrash) { - // 情况2:房主超时未等到所有队员到达预期坐标 - 无需报告,直接上线和启动一条龙 + // 情况2:房主超时未等到所有队员到达预期坐标 - 无需报告,直接上线和启动等待一条龙 if (crashType === "waitForPlayersArrive") { // 第一个指令:上线 commandData["command"] = "online"; @@ -2065,14 +2067,28 @@ async function generateReonlineCommand(onlineInfo = null, isCrash = false, crash let crashInfo = { "crashType": crashType || "超时", "rideTime": rideTime, - "rideMembers": teamMembers + "rideMembers": teamMembers, + "reporter": { + "username": onlineInfo.gameName, + "uid": onlineInfo.uid, + "position": jsonConfig ? jsonConfig.myPosition : "1" + } }; if (crashType === "waitForExpectedPlayers") { // 情况1:房主超时未等到预期人数 // 说明自己在队伍中编号,成功进入的人如实写,没成功进入的人也如实写 crashInfo.myPosition = jsonConfig ? jsonConfig.myPosition : "1"; - crashInfo.enteredPlayers = onlineInfo.enteredPlayers || []; - crashInfo.notEnteredPlayers = onlineInfo.notEnteredPlayers || []; + crashInfo.enteredPlayers = enteredPlayers || []; + + // 计算未进入的玩家:从teamMembers中排除自己(房主)和已进入的玩家 + const allPlayerNames = teamMembers + .filter(m => m.position !== "1") // 排除房主(位置1) + .map(m => m.username); + const enteredPlayerNames = enteredPlayers || []; + crashInfo.notEnteredPlayers = allPlayerNames.filter(name => !enteredPlayerNames.includes(name)); + + log.info(`炸车报告 - 已进入玩家: ${crashInfo.enteredPlayers.join(', ') || '无'}`); + log.info(`炸车报告 - 未进入玩家: ${crashInfo.notEnteredPlayers.join(', ') || '无'}`); } else if (crashType === "waitForPlayersArrive") { // 情况2:房主超时未等到所有队员到达预期坐标 // 说明自己在队伍中编号,成功进入的人留空,没成功进入的人写自己 @@ -2115,7 +2131,7 @@ async function generateReonlineCommand(onlineInfo = null, isCrash = false, crash log.info(`添加炸车报告指令`); } } - // 如果不是炸车但settings.waitingOneDragon存在,添加启动一条龙指令 + // 正常结束且settings.waitingOneDragon存在,上线,启动等待一条龙 else if (settings.waitingOneDragon) { commandData["command"] = "online"; commandData["params"] = { @@ -2131,7 +2147,7 @@ async function generateReonlineCommand(onlineInfo = null, isCrash = false, crash }; log.info(`添加启动一条龙指令: ${settings.waitingOneDragon}`); } - // 正常情况:只上线 + // 正常结束且settings.waitingOneDragon不存在,只上线 else { commandData["command"] = "online"; commandData["params"] = { diff --git a/repo/js/ArtifactsGroupPurchasing/manifest.json b/repo/js/ArtifactsGroupPurchasing/manifest.json index c1674973c..6abc88dfa 100644 --- a/repo/js/ArtifactsGroupPurchasing/manifest.json +++ b/repo/js/ArtifactsGroupPurchasing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮联机团购", - "version": "2.0.1", + "version": "2.2.1", "tags": [ "狗粮" ],