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