From c930922d1b3c4dde05d04edfe3590c0164fb82b3 Mon Sep 17 00:00:00 2001 From: mno <718135749@qq.com> Date: Wed, 28 May 2025 16:31:27 +0800 Subject: [PATCH] =?UTF-8?q?js:=20=E7=8B=97=E7=B2=AE=E9=87=8D=E5=88=B6?= =?UTF-8?q?=E7=89=88=E8=B7=AF=E7=BA=BF=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BF=9B=E5=BA=A6=E8=BE=93=E5=87=BA=20(#943)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../A路线/01普通/601纳塔-流泉之众4.json | 16 ++- .../A路线/02收尾/【收尾】稻妻-踏鞴砂②-7.json | 81 ++++++++----- .../A路线/02收尾/【收尾】稻妻-踏鞴砂③-8.json | 17 +-- .../B路线/02收尾/【收尾】稻妻-清籁丸20.json | 108 ++++++++---------- .../assets/AutoPath/盗宝团-战斗点.json | 9 ++ repo/js/AutoArtifactsPro/main.js | 12 ++ repo/js/AutoArtifactsPro/record.txt | 6 +- 7 files changed, 147 insertions(+), 102 deletions(-) diff --git a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/601纳塔-流泉之众4.json b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/601纳塔-流泉之众4.json index 6dbfbbe9..958cbf1c 100644 --- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/601纳塔-流泉之众4.json +++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/01普通/601纳塔-流泉之众4.json @@ -5,7 +5,8 @@ "author": "汐", "version": "", "description": "", - "bgiVersion": "0.42.3" + "map_name": "Teyvat", + "bgi_version": "0.45.0" }, "positions": [ { @@ -84,6 +85,15 @@ }, { "id": 10, + "x": 9053.48828125, + "y": -2797.310546875, + "type": "path", + "move_mode": "walk", + "action": "combat_script", + "action_params": "keypress(f),w(0.2)" + }, + { + "id": 11, "x": 9054.71875, "y": -2797.2811172015245, "action": "combat_script", @@ -92,7 +102,7 @@ "type": "target" }, { - "id": 11, + "id": 12, "x": 9060.9853515625, "y": -2791.96484375, "action": "combat_script", @@ -101,7 +111,7 @@ "type": "target" }, { - "id": 12, + "id": 13, "x": 9068.6044921875, "y": -2798.8125, "action": "combat_script", diff --git a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/02收尾/【收尾】稻妻-踏鞴砂②-7.json b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/02收尾/【收尾】稻妻-踏鞴砂②-7.json index b7fd4741..ce27caa4 100644 --- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/02收尾/【收尾】稻妻-踏鞴砂②-7.json +++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/02收尾/【收尾】稻妻-踏鞴砂②-7.json @@ -5,7 +5,8 @@ "author": "汐", "version": "", "description": "", - "bgiVersion": "0.42.3" + "map_name": "Teyvat", + "bgi_version": "0.45.0" }, "positions": [ { @@ -180,63 +181,91 @@ }, { "id": 22, - "x": -3119.843793450913, - "y": -3621.656295473891, + "x": -3118.541015625, + "y": -3622.6650390625, "action": "combat_script", "move_mode": "walk", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),", + "action_params": "keypress(f),w(0.2),keypress(f),w(0.2),keypress(f)", "type": "target" }, { "id": 23, - "x": -3127.1142578125, - "y": -3602.75390625, + "x": -3116.9765625, + "y": -3617.94921875, "action": "", - "move_mode": "dash", + "move_mode": "walk", + "action_params": "", "type": "path" }, { "id": 24, - "x": -3149.3203125, - "y": -3568.7509765625, + "x": -3127.1142578125, + "y": -3602.75390625, "action": "", "move_mode": "run", "type": "path" }, { "id": 25, - "x": -3141.4990234375, - "y": -3567.3935546875, - "type": "path", - "move_mode": "walk", + "x": -3140.1611328125, + "y": -3580.916015625, "action": "", - "action_params": "" + "move_mode": "run", + "action_params": "", + "type": "path" }, { "id": 26, - "x": -3136.4072265625, - "y": -3568.052734375, + "x": -3142.0937243244607, + "y": -3573.4998105254563, "action": "", - "move_mode": "fly", + "move_mode": "walk", + "action_params": "", "type": "path" }, { "id": 27, - "x": -3139.1494140625, - "y": -3570.892578125, - "type": "target", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)," + "x": -3153.0205078125, + "y": -3562.748046875, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" }, { "id": 28, + "x": -3141.4990234375, + "y": -3567.3935546875, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 29, + "x": -3136.4072265625, + "y": -3568.052734375, + "action": "", + "move_mode": "jump", + "type": "path" + }, + { + "id": 30, + "x": -3139.1494140625, + "y": -3570.892578125, + "action": "combat_script", + "move_mode": "walk", + "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),", + "type": "target" + }, + { + "id": 31, "x": -3136.2646484375, "y": -3571.576171875, - "type": "path", - "move_mode": "walk", "action": "", - "action_params": "" + "move_mode": "walk", + "action_params": "", + "type": "path" } ] } \ No newline at end of file diff --git a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/02收尾/【收尾】稻妻-踏鞴砂③-8.json b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/02收尾/【收尾】稻妻-踏鞴砂③-8.json index 657211cc..74e9a38a 100644 --- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/02收尾/【收尾】稻妻-踏鞴砂③-8.json +++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/A路线/02收尾/【收尾】稻妻-踏鞴砂③-8.json @@ -57,7 +57,7 @@ "y": -3744.3037109375, "action": "combat_script", "move_mode": "climb", - "action_params": "芙宁娜 e;玛薇卡 e;千织 e;", + "action_params": "wait(0.2),keypress(e)", "type": "path" }, { @@ -88,8 +88,8 @@ }, { "id": 10, - "x": -3114.6142578125, - "y": -3727.2353515625, + "x": -3115.25003950083, + "y": -3726.437697053525, "action": "", "move_mode": "walk", "type": "path" @@ -114,8 +114,8 @@ }, { "id": 13, - "x": -3112.478515625, - "y": -3723.0224609375, + "x": -3111.84371049917, + "y": -3721.594098633159, "action": "", "move_mode": "walk", "type": "path" @@ -264,10 +264,11 @@ }, { "id": 31, - "x": -3140.2431640625, - "y": -3700.9541015625, - "action": "", + "x": -3138.1561176722207, + "y": -3701.812295367494, + "action": "combat_script", "move_mode": "climb", + "action_params": "wait(0.6)", "type": "path" }, { diff --git a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/02收尾/【收尾】稻妻-清籁丸20.json b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/02收尾/【收尾】稻妻-清籁丸20.json index 4b6cc573..7e35e904 100644 --- a/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/02收尾/【收尾】稻妻-清籁丸20.json +++ b/repo/js/AutoArtifactsPro/assets/ArtifactsPath/B路线/02收尾/【收尾】稻妻-清籁丸20.json @@ -6,9 +6,7 @@ "version": "", "description": "", "map_name": "Teyvat", - "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1746819816606 + "bgi_version": "0.45.0" }, "positions": [ { @@ -266,6 +264,15 @@ }, { "id": 31, + "x": -3776.328125, + "y": -4425.9326171875, + "type": "path", + "move_mode": "dash", + "action": "", + "action_params": "" + }, + { + "id": 32, "x": -3761.71875, "y": -4427.312511066539, "action": "", @@ -274,7 +281,7 @@ "type": "path" }, { - "id": 32, + "id": 33, "x": -3747.8125, "y": -4426.0311172015245, "action": "", @@ -282,7 +289,7 @@ "type": "path" }, { - "id": 33, + "id": 34, "x": -3743.921875, "y": -4436.001953125, "action": "", @@ -290,7 +297,7 @@ "type": "path" }, { - "id": 34, + "id": 35, "x": -3742.7294921875, "y": -4441.98828125, "action": "", @@ -298,7 +305,7 @@ "type": "target" }, { - "id": 35, + "id": 36, "x": -3740.7060546875, "y": -4439.869140625, "action": "", @@ -306,7 +313,7 @@ "type": "path" }, { - "id": 36, + "id": 37, "x": -3738.31640625, "y": -4442.064453125, "action": "", @@ -314,7 +321,7 @@ "type": "target" }, { - "id": 37, + "id": 38, "x": -3740.6142578125, "y": -4435.5537109375, "action": "", @@ -322,7 +329,7 @@ "type": "path" }, { - "id": 38, + "id": 39, "x": -3741.0341796875, "y": -4425.9443359375, "action": "", @@ -330,7 +337,7 @@ "type": "path" }, { - "id": 39, + "id": 40, "x": -3743.734375, "y": -4424.8876953125, "action": "", @@ -338,7 +345,7 @@ "type": "path" }, { - "id": 40, + "id": 41, "x": -3764.1240234375, "y": -4438.958984375, "action": "", @@ -346,7 +353,7 @@ "type": "path" }, { - "id": 41, + "id": 42, "x": -3772.146484375, "y": -4439.849609375, "action": "", @@ -354,7 +361,7 @@ "type": "target" }, { - "id": 42, + "id": 43, "x": -3776.125, "y": -4439.281316399238, "action": "", @@ -362,7 +369,7 @@ "type": "target" }, { - "id": 43, + "id": 44, "x": -3775.8125, "y": -4441.625154931555, "action": "", @@ -370,7 +377,7 @@ "type": "path" }, { - "id": 44, + "id": 45, "x": -3767.134765625, "y": -4439.3466796875, "action": "", @@ -378,7 +385,7 @@ "type": "path" }, { - "id": 45, + "id": 46, "x": -3756.236328125, "y": -4437.08203125, "action": "", @@ -386,7 +393,7 @@ "type": "path" }, { - "id": 46, + "id": 47, "x": -3746.0966796875, "y": -4434.9072265625, "action": "combat_script", @@ -395,7 +402,7 @@ "type": "path" }, { - "id": 47, + "id": 48, "x": -3741.365234375, "y": -4432.560546875, "action": "", @@ -403,7 +410,7 @@ "type": "target" }, { - "id": 48, + "id": 49, "x": -3744.125, "y": -4437.344281193904, "action": "", @@ -412,7 +419,7 @@ "type": "path" }, { - "id": 49, + "id": 50, "x": -3735.40625, "y": -4437.937477866921, "action": "", @@ -421,7 +428,7 @@ "type": "path" }, { - "id": 50, + "id": 51, "x": -3728.7265625, "y": -4437.8623046875, "action": "", @@ -429,7 +436,7 @@ "type": "path" }, { - "id": 51, + "id": 52, "x": -3726.888671875, "y": -4433.171875, "action": "", @@ -437,7 +444,7 @@ "type": "target" }, { - "id": 52, + "id": 53, "x": -3726.6484375, "y": -4431.6826171875, "action": "combat_script", @@ -445,49 +452,26 @@ "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),", "type": "target" }, - { - "id": 53, - "x": -3727.5048828125, - "y": -4431.0224609375, - "action": "", - "move_mode": "walk", - "type": "path" - }, { "id": 54, - "x": -3730.1171875, - "y": -4429.974609375, - "action": "", + "x": -3726.5517578125, + "y": -4438.2099609375, + "type": "path", "move_mode": "walk", - "type": "path" + "action": "", + "action_params": "" }, { "id": 55, - "x": -3733.7587890625, - "y": -4429.880859375, + "x": -3722.61328125, + "y": -4437.4814453125, + "type": "path", + "move_mode": "jump", "action": "", - "move_mode": "walk", - "type": "path" + "action_params": "" }, { "id": 56, - "x": -3733.937462474212, - "y": -4432.531287894908, - "action": "", - "move_mode": "walk", - "type": "target" - }, - { - "id": 57, - "x": -3731.53125, - "y": -4432.781227866921, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 58, "x": -3718.216796875, "y": -4433.0048828125, "action": "combat_script", @@ -496,7 +480,7 @@ "type": "path" }, { - "id": 59, + "id": 57, "x": -3719.4345703125, "y": -4431.1865234375, "action": "combat_script", @@ -505,7 +489,7 @@ "type": "target" }, { - "id": 60, + "id": 58, "x": -3720.29296875, "y": -4430.4189453125, "action": "combat_script", @@ -514,7 +498,7 @@ "type": "target" }, { - "id": 61, + "id": 59, "x": -3719.6875, "y": -4433.218938131175, "action": "", @@ -522,7 +506,7 @@ "type": "path" }, { - "id": 62, + "id": 60, "x": -3726.1875, "y": -4428.843628268063, "action": "combat_script", @@ -531,7 +515,7 @@ "type": "path" }, { - "id": 63, + "id": 61, "x": -3726.1875, "y": -4428.843628268063, "action": "", diff --git a/repo/js/AutoArtifactsPro/assets/AutoPath/盗宝团-战斗点.json b/repo/js/AutoArtifactsPro/assets/AutoPath/盗宝团-战斗点.json index 82f98bda..14a4a627 100644 --- a/repo/js/AutoArtifactsPro/assets/AutoPath/盗宝团-战斗点.json +++ b/repo/js/AutoArtifactsPro/assets/AutoPath/盗宝团-战斗点.json @@ -11,6 +11,15 @@ "positions": [ { "id": 1, + "x": -2741.25, + "y": -3441, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path" + }, + { + "id": 2, "x": -2757.28125, "y": -3468.4376106653963, "action": "", diff --git a/repo/js/AutoArtifactsPro/main.js b/repo/js/AutoArtifactsPro/main.js index 8fbbeea3..1373b238 100644 --- a/repo/js/AutoArtifactsPro/main.js +++ b/repo/js/AutoArtifactsPro/main.js @@ -251,10 +251,14 @@ async function runArtifactsPaths(runRouteA) { } } + let currentTask = 0; // 当前任务计数器 + // 执行普通路线的地图追踪文件 for (const fileName of jsonFileNames) { const fullPath = fileName; await fakeLog(fileName, false, true, 0); + currentTask += 1; // 更新当前任务计数器 + log.info(`当前进度：普通${folderName}第${currentTask}/${jsonFileNames.length}个`); await pathingScript.runFile(fullPath); //捕获任务取消的信息并跳出循环 try { @@ -280,10 +284,14 @@ async function runArtifactsPaths(runRouteA) { } } + let currentTask = 0; // 当前任务计数器 + // 执行收尾路线的地图追踪文件 for (const fileName of jsonFileNames) { const fullPath = fileName; await fakeLog(fileName, false, true, 0); + currentTask += 1; // 更新当前任务计数器 + log.info(`当前进度：收尾${folderName}第${currentTask}/${jsonFileNames.length}个`); await pathingScript.runFile(fullPath); //捕获任务取消的信息并跳出循环 try { @@ -309,10 +317,14 @@ async function runArtifactsPaths(runRouteA) { } } + let currentTask = 0; // 当前任务计数器 + // 执行额外路线的地图追踪文件 for (const fileName of jsonFileNames) { const fullPath = fileName; await fakeLog(fileName, false, true, 0); + currentTask += 1; // 更新当前任务计数器 + log.info(`当前进度：额外${folderName}第${currentTask}/${jsonFileNames.length}个`); await pathingScript.runFile(fullPath); //捕获任务取消的信息并跳出循环 try { diff --git a/repo/js/AutoArtifactsPro/record.txt b/repo/js/AutoArtifactsPro/record.txt index 57cf651d..2fb9a301 100644 --- a/repo/js/AutoArtifactsPro/record.txt +++ b/repo/js/AutoArtifactsPro/record.txt @@ -1,3 +1,3 @@ -上次运行完成日期: 2025/05/27 -上次结束时间: 2025-05-27T00:00:58.107Z -上次运行路线: B \ No newline at end of file +上次运行完成日期: 2025/05/25 +上次结束时间: 2025-05-24T20:00:00.000Z +上次运行路线: A \ No newline at end of file