From 7e1f979545870ecd0c2d1ca0cbbc85aa80a2ee1f Mon Sep 17 00:00:00 2001 From: Yang-z Date: Thu, 21 Nov 2024 14:16:07 +0800 Subject: [PATCH] update js and pathing scripts --- .../狗粮-枫丹-白露区-秋分山东侧-2个.json | 10 ++++- .../狗粮-枫丹-研究院区-东-3个.json | 8 ++++ ...粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json | 6 +++ .../狗粮-稻妻-海祇岛-东方小岛-2个.json | 6 +++ .../狗粮-稻妻-海祇岛-望泷村西南-4个.json | 42 ++++++++++--------- .../狗粮-稻妻-清籁岛-平海砦西-8个.json | 8 ++++ repo/js/AutoArtifacts_A_B_Extra/main.js | 12 +++--- repo/js/AutoArtifacts_A_B_Extra/manifest.json | 2 +- .../狗粮-枫丹-白露区-秋分山东侧-2个.json | 10 ++++- .../狗粮-枫丹-研究院区-东-3个.json | 8 ++++ .../狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json | 6 +++ .../狗粮-稻妻-海祇岛-东方小岛-2个.json | 6 +++ .../狗粮-稻妻-海祇岛-望泷村西南-4个.json | 42 ++++++++++--------- .../狗粮-稻妻-清籁岛-平海砦西-8个.json | 8 ++++ 14 files changed, 123 insertions(+), 51 deletions(-) diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个.json index dd1af35b..4c0b9258 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个.json @@ -18,8 +18,8 @@ "move_mode": "run" }, { - "x": 3900.19775390625, - "y": 2543.629150390625, + "x": 3899.5673828125, + "y": 2543.31640625, "type": "target", "move_mode": "walk", "action":"", @@ -39,6 +39,12 @@ "move_mode": "walk", "action":"", "#" : "2" + }, + { + "x": 3879.810546875, + "y": 2521.3203125, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json index 8ea29451..741c5ee7 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json @@ -35,6 +35,14 @@ "action": "", "#" : "2" }, + { + "x": 3580.36376953125, + "y": 4713.65234375, + "type": "target", + "move_mode": "walk", + "action": "", + "#" : "2" + }, { "x": 3585.587890625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json index 2eb6a814..3c20b895 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json @@ -222,6 +222,12 @@ { "x": 4111.0791015625, "y": 4668.72021484375, + "type": "target", + "move_mode": "walk" + }, + { + "x": 4115.34521484375, + "y": 4671.7236328125, "type": "path", "move_mode": "walk" } diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个.json index 12f23b6f..bb6c9088 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个.json @@ -65,6 +65,12 @@ "move_mode": "walk", "action": "", "#": "2" + }, + { + "x": -1366.2890625, + "y": -3753.4658203125, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file 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 f7e124ba..020b6756 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 @@ -39,20 +39,12 @@ "move_mode": "run" }, { - "x": -676.8798828125, - "y": -4045.4677734375, + "x": -677.654296875, + "y": -4045.9296875, "type": "path", "move_mode": "run" }, - { - "x": -673.548828125, - "y": -4043.82421875, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "2" - }, { "x": -672.419921875, "y": -4043.4560546875, @@ -61,22 +53,23 @@ "action": "", "#": "2" }, + { + "x": -673.548828125, + "y": -4043.82421875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "2" + }, + { - "x": -684.21484375, - "y": -4042.994140625, + "x": -682.07421875, + "y": -4042.4619140625, "type": "path", "move_mode": "run" }, - { - "x": -687.501953125, - "y": -4042.25390625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "3" - }, { "x": -688.423828125, "y": -4042.2841796875, @@ -85,6 +78,15 @@ "action": "", "#": "3" }, + { + "x": -689.103515625, + "y": -4042.796875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "3" + }, + { "x": -682.83203125, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个.json index f527274a..fb6f335d 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个.json @@ -193,6 +193,14 @@ "move_mode": "run", "action": "", "#": "8" + }, + { + "x": -4185.59375, + "y": -4300.9140625, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "8" } ] } \ 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 3810cac6..a80310d8 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/main.js +++ b/repo/js/AutoArtifacts_A_B_Extra/main.js @@ -75,9 +75,9 @@ ]; // 97个 const pathingE = [ - "【额外】狗粮-须弥-水天丛林+7个.json", // 24小时刷新 "【额外】狗粮-纳塔+7个.json", // 凌晨刷新 - "【额外】狗粮-枫丹-研究院区-新枫丹科学院南+1个.json" + "【额外】狗粮-须弥-水天丛林+7个.json", // 24小时刷新 + "【额外】狗粮-枫丹-研究院区-新枫丹科学院南+1个.json" // 24小时刷新 ]; // 15个（其中纳塔第2个似乎是一次性的） @@ -116,9 +116,9 @@ // zoom map to 75% keyPress("M"); await sleep(1000); for (let i = 0; i < 5; i++) { - click(42, 420); await sleep(500); // zoom out + click(42, 420); await sleep(500); // zoom in } - click(42, 645); await sleep(1000); // zoom in + click(42, 645); await sleep(1000); // zoom out keyPress("M"); await sleep(1000); // 打开自动拾取 @@ -135,7 +135,7 @@ click(200, 150); await sleep(500); // 1 click(200, 220); await sleep(500); // 2 click(200, 300); await sleep(500); // 3 - // click(300, 380); await sleep(3000); // 4 + // click(200, 380); await sleep(3000); // 4 click(340, 1000); await sleep(1000); // 确认选择 click(1720, 1015); await sleep(1500); // 分解 @@ -183,7 +183,7 @@ // Extra log.info(`开始执行额外线路。`); await batch(folderE, pathingE); - keyPress('VK_LBUTTON'); // 砸开罐子拾取 + leftButtonClick(); // 砸开罐子拾取 await sleep(5000); })(); \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index 0689f1c2..7c8e531b 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.1", + "version": "1.2", "bgi_version": "0.36.1", "description": "圣遗物狗粮AB路线自动轮换，及额外点位拾取，途中自动分解。", "authors": [ diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个.json index dd1af35b..4c0b9258 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-白露区-秋分山东侧-2个.json @@ -18,8 +18,8 @@ "move_mode": "run" }, { - "x": 3900.19775390625, - "y": 2543.629150390625, + "x": 3899.5673828125, + "y": 2543.31640625, "type": "target", "move_mode": "walk", "action":"", @@ -39,6 +39,12 @@ "move_mode": "walk", "action":"", "#" : "2" + }, + { + "x": 3879.810546875, + "y": 2521.3203125, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json index 8ea29451..741c5ee7 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-东-3个.json @@ -35,6 +35,14 @@ "action": "", "#" : "2" }, + { + "x": 3580.36376953125, + "y": 4713.65234375, + "type": "target", + "move_mode": "walk", + "action": "", + "#" : "2" + }, { "x": 3585.587890625, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json index 2eb6a814..3c20b895 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json @@ -222,6 +222,12 @@ { "x": 4111.0791015625, "y": 4668.72021484375, + "type": "target", + "move_mode": "walk" + }, + { + "x": 4115.34521484375, + "y": 4671.7236328125, "type": "path", "move_mode": "walk" } diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个.json index 12f23b6f..bb6c9088 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个.json @@ -65,6 +65,12 @@ "move_mode": "walk", "action": "", "#": "2" + }, + { + "x": -1366.2890625, + "y": -3753.4658203125, + "type": "path", + "move_mode": "walk" } ] } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个.json index f7e124ba..020b6756 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个.json @@ -39,20 +39,12 @@ "move_mode": "run" }, { - "x": -676.8798828125, - "y": -4045.4677734375, + "x": -677.654296875, + "y": -4045.9296875, "type": "path", "move_mode": "run" }, - { - "x": -673.548828125, - "y": -4043.82421875, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "2" - }, { "x": -672.419921875, "y": -4043.4560546875, @@ -61,22 +53,23 @@ "action": "", "#": "2" }, + { + "x": -673.548828125, + "y": -4043.82421875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "2" + }, + { - "x": -684.21484375, - "y": -4042.994140625, + "x": -682.07421875, + "y": -4042.4619140625, "type": "path", "move_mode": "run" }, - { - "x": -687.501953125, - "y": -4042.25390625, - "type": "target", - "move_mode": "walk", - "action": "", - "#": "3" - }, { "x": -688.423828125, "y": -4042.2841796875, @@ -85,6 +78,15 @@ "action": "", "#": "3" }, + { + "x": -689.103515625, + "y": -4042.796875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "3" + }, + { "x": -682.83203125, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个.json index f527274a..fb6f335d 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-平海砦西-8个.json @@ -193,6 +193,14 @@ "move_mode": "run", "action": "", "#": "8" + }, + { + "x": -4185.59375, + "y": -4300.9140625, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "8" } ] } \ No newline at end of file