diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/README.md b/repo/js/AAA-Artifacts-Bulk-Supply/README.md index 627469fbf..e099f627f 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/README.md +++ b/repo/js/AAA-Artifacts-Bulk-Supply/README.md @@ -82,6 +82,8 @@ https://www.kdocs.cn/wo/sl/v13uXscL ## 更新日志 +### 1.1.1（2025.08.25） +1.加入检测并点击过期物品弹窗 ### 1.1.0（2025.08.24） 1.开始尝试适配联机狗粮 ### 1.0.9（2025.08.23） diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/枫丹-科学院工坊TP刷CD.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/枫丹-科学院工坊TP刷CD.json new file mode 100644 index 000000000..63ded6894 --- /dev/null +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/枫丹-科学院工坊TP刷CD.json @@ -0,0 +1,40 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "汐" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1756056240851, + "map_match_method": "", + "map_name": "Teyvat", + "name": "枫丹-科学院工坊TP刷CD", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": 4429.1826171875, + "y": 5097.20703125 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "dash", + "type": "path", + "x": 4422.8466796875, + "y": 4990.0517578125 + } + ] +} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/稻妻-踏鞴砂TP刷CD.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/稻妻-踏鞴砂TP刷CD.json new file mode 100644 index 000000000..42cffef7f --- /dev/null +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/稻妻-踏鞴砂TP刷CD.json @@ -0,0 +1,58 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "汐" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1756054131751, + "map_match_method": "", + "map_name": "Teyvat", + "name": "稻妻-踏鞴砂TP刷CD", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": -3393.80859375, + "y": -3555.3330078125 + }, + { + "action": "stop_flying", + "action_params": "", + "id": 2, + "move_mode": "fly", + "type": "path", + "x": -3354.048828125, + "y": -3578.935546875 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "walk", + "type": "teleport", + "x": -3290.7158203125, + "y": -3653.0283203125 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "teleport", + "x": -3019.462890625, + "y": -3622.94921875 + } + ] +} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/稻妻-踏鞴砂多人狗粮踩点.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/稻妻-踏鞴砂多人狗粮踩点.json deleted file mode 100644 index 9cbc49b36..000000000 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/稻妻-踏鞴砂多人狗粮踩点.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "info": { - "name": "稻妻-踏鞴砂多人狗粮踩点", - "type": "collect", - "authors": [ - { - "name": "汐", - "links": "" - } - ], - "version": "1.0", - "description": "", - "map_name": "Teyvat", - "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1755710835874, - "enable_monster_loot_split": false, - "map_match_method": "" - }, - "positions": [ - { - "id": 1, - "action": "", - "move_mode": "walk", - "type": "teleport", - "x": -3393.80859375, - "y": -3555.3330078125, - "action_params": "" - }, - { - "id": 2, - "x": -3354.048828125, - "y": -3578.935546875, - "type": "path", - "move_mode": "fly", - "action": "stop_flying", - "action_params": "" - }, - { - "id": 3, - "x": -3354.048828125, - "y": -3578.9404296875, - "type": "target", - "move_mode": "climb", - "action": "", - "action_params": "" - } - ] -} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/纳塔-度假村多人狗粮踩点.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/纳塔-度假村TP刷CD.json similarity index 59% rename from repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/纳塔-度假村多人狗粮踩点.json rename to repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/纳塔-度假村TP刷CD.json index ab9bd481a..34625b7a0 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/纳塔-度假村多人狗粮踩点.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/纳塔-度假村TP刷CD.json @@ -1,86 +1,76 @@ { "info": { - "name": "纳塔-度假村多人狗粮踩点", - "type": "collect", "authors": [ { - "name": "汐", - "links": "" + "links": "", + "name": "汐" } ], - "version": "1.0", - "description": "", - "map_name": "Teyvat", "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1755700674183, + "description": "", "enable_monster_loot_split": false, - "map_match_method": "" + "last_modified_time": 1756055576667, + "map_match_method": "", + "map_name": "Teyvat", + "name": "纳塔-度假村TP刷CD", + "tags": [], + "type": "collect", + "version": "1.0" }, "positions": [ { + "action": "", + "action_params": "", "id": 1, + "move_mode": "walk", + "type": "teleport", "x": 13977.25390625, - "y": 468.34619140625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "teleport" + "y": 468.34619140625 }, { - "id": 2, - "x": 13982.29296875, - "y": 463.09814453125, "action": "combat_script", - "move_mode": "walk", "action_params": "keypress(t),wait(0.2),keypress(t),wait(0.4)", - "type": "orientation" - }, - { - "id": 3, - "x": 14034.53125, - "y": 459.5859375, - "action": "combat_script", + "id": 2, "move_mode": "walk", - "action_params": "keydown(w),wait(0.2),keypress(e),wait(1.7),keypress(e),wait(1.2),keyup(w)", - "type": "orientation" - }, - { - "id": 4, - "x": 14034.53125, - "y": 459.5859375, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 5, - "x": 14032.1982421875, - "y": 450.791015625, - "type": "path", - "move_mode": "dash", - "action": "", - "action_params": "" - }, - { - "id": 6, - "x": 14031.06640625, - "y": 440.19580078125, "type": "orientation", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keydown(w),wait(0.2),dash,wait(1),dash,keyup(w),wait(1.5)", - "locked": false + "x": 13982.29296875, + "y": 463.09814453125 + }, + { + "action": "combat_script", + "action_params": "keydown(w),wait(0.2),keypress(e),wait(1.7),keypress(e),wait(1.2),keyup(w)", + "id": 3, + "move_mode": "walk", + "type": "orientation", + "x": 14034.53125, + "y": 459.5859375 }, { - "id": 7, - "x": 14031.06640625, - "y": 440.19580078125, - "type": "path", - "move_mode": "climb", "action": "", - "action_params": "" + "action_params": "", + "id": 4, + "move_mode": "dash", + "type": "path", + "x": 14034.53125, + "y": 459.5859375 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "dash", + "type": "path", + "x": 14032.1982421875, + "y": 450.791015625 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "walk", + "type": "teleport", + "x": 14151.96875, + "y": 422.8125 } ] } \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/须弥-智障厅多人狗粮踩点.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/须弥-智障厅TP刷CD.json similarity index 52% rename from repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/须弥-智障厅多人狗粮踩点.json rename to repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/须弥-智障厅TP刷CD.json index 2b272cfbb..312b8bff1 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/须弥-智障厅多人狗粮踩点.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/须弥-智障厅TP刷CD.json @@ -1,67 +1,58 @@ { "info": { - "name": "须弥-智障厅多人狗粮踩点", - "type": "collect", "authors": [ { - "name": "汐", - "links": "" + "links": "", + "name": "汐" } ], - "version": "1.0", - "description": "", - "map_name": "Teyvat", "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1755708213100, + "description": "", "enable_monster_loot_split": false, - "map_match_method": "" + "last_modified_time": 1756056093502, + "map_match_method": "", + "map_name": "Teyvat", + "name": "须弥-智障厅TP刷CD", + "tags": [], + "type": "collect", + "version": "1.0" }, "positions": [ { + "action": "", + "action_params": "", "id": 1, - "x": 5384.2529296875, - "y": -2456.419921875, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "teleport" + "type": "teleport", + "x": 5168.88671875, + "y": -2347.021484375 }, { + "action": "", + "action_params": "", "id": 2, - "x": 5347.8359375, - "y": -2418.6884765625, + "move_mode": "walk", + "type": "teleport", + "x": 5384.2529296875, + "y": -2456.419921875 + }, + { "action": "stop_flying", - "move_mode": "fly", "action_params": "", - "type": "path" - }, - { "id": 3, - "x": 5347.0048828125, - "y": -2402.072265625, + "move_mode": "fly", + "type": "path", + "x": 5347.8359375, + "y": -2418.6884765625 + }, + { "action": "", - "move_mode": "dash", "action_params": "", - "type": "path" - }, - { "id": 4, - "x": 5319.275390625, - "y": -2398.5859375, - "type": "path", "move_mode": "dash", - "action": "", - "action_params": "" - }, - { - "id": 5, - "x": 5319.3515625, - "y": -2330.076171875, "type": "path", - "move_mode": "run", - "action": "combat_script", - "action_params": "dash" + "x": 5347.337890625, + "y": -2318.45703125 } ] } \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/main.js b/repo/js/AAA-Artifacts-Bulk-Supply/main.js index 5f78e8367..f9a57dcc9 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/main.js +++ b/repo/js/AAA-Artifacts-Bulk-Supply/main.js @@ -26,6 +26,8 @@ const confirmRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/ const doDecomposeRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/doDecompose.png")); const doDecompose2Ro = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/doDecompose2.png")); +const outDatedRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/ConfirmButton.png"), 760, 700, 100, 100); + const normalPathA = "assets/ArtifactsPath/普通A"; const normalPathB = "assets/ArtifactsPath/普通B"; const normalPathC = "assets/ArtifactsPath/普通C"; @@ -318,6 +320,10 @@ async function processArtifacts(times = 1) { async function decomposeArtifacts() { keyPress("B"); + if (await findAndClick(outDatedRo)) { + log.info("检测到过期物品弹窗，处理"); + await sleep(1000); + } await sleep(1000); await click(670, 45); await sleep(500); @@ -486,7 +492,6 @@ async function processArtifacts(times = 1) { await sleep(250); } } - log.error("已达到重试次数上限，仍未找到目标"); return false; } @@ -494,6 +499,10 @@ async function processArtifacts(times = 1) { await genshin.returnMainUi(); await sleep(250); keyPress("B"); + if (await findAndClick(outDatedRo)) { + log.info("检测到过期物品弹窗，处理"); + await sleep(1000); + } await sleep(500); await findAndClick(ArtifactsButtonRo, 5) try { diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json index 6043c2a91..4451a37fa 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": "1.1.0", + "version": "1.1.1", "tags": [ "狗粮" ], diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/600纳塔-度假村多人狗粮踩点.json b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/600纳塔-度假村多人狗粮踩点.json deleted file mode 100644 index ab9bd481a..000000000 --- a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/600纳塔-度假村多人狗粮踩点.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "info": { - "name": "纳塔-度假村多人狗粮踩点", - "type": "collect", - "authors": [ - { - "name": "汐", - "links": "" - } - ], - "version": "1.0", - "description": "", - "map_name": "Teyvat", - "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1755700674183, - "enable_monster_loot_split": false, - "map_match_method": "" - }, - "positions": [ - { - "id": 1, - "x": 13977.25390625, - "y": 468.34619140625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "teleport" - }, - { - "id": 2, - "x": 13982.29296875, - "y": 463.09814453125, - "action": "combat_script", - "move_mode": "walk", - "action_params": "keypress(t),wait(0.2),keypress(t),wait(0.4)", - "type": "orientation" - }, - { - "id": 3, - "x": 14034.53125, - "y": 459.5859375, - "action": "combat_script", - "move_mode": "walk", - "action_params": "keydown(w),wait(0.2),keypress(e),wait(1.7),keypress(e),wait(1.2),keyup(w)", - "type": "orientation" - }, - { - "id": 4, - "x": 14034.53125, - "y": 459.5859375, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 5, - "x": 14032.1982421875, - "y": 450.791015625, - "type": "path", - "move_mode": "dash", - "action": "", - "action_params": "" - }, - { - "id": 6, - "x": 14031.06640625, - "y": 440.19580078125, - "type": "orientation", - "move_mode": "walk", - "action": "combat_script", - "action_params": "keydown(w),wait(0.2),dash,wait(1),dash,keyup(w),wait(1.5)", - "locked": false - }, - { - "id": 7, - "x": 14031.06640625, - "y": 440.19580078125, - "type": "path", - "move_mode": "climb", - "action": "", - "action_params": "" - } - ] -} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/626纳塔-悠悠集市西13.json b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/626纳塔-悠悠集市西13.json deleted file mode 100644 index 0240f629c..000000000 --- a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/626纳塔-悠悠集市西13.json +++ /dev/null @@ -1,256 +0,0 @@ -{ - "info": { - "name": "626纳塔-悠悠集市西13", - "type": "collect", - "authors": [ - { - "name": "汐", - "links": "" - } - ], - "version": "1.0", - "description": "", - "map_name": "Teyvat", - "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1755262007032, - "enable_monster_loot_split": false, - "map_match_method": "" - }, - "positions": [ - { - "id": 1, - "x": 13915.443359375, - "y": 322.54638671875, - "action": "force_tp", - "move_mode": "walk", - "action_params": "", - "type": "teleport" - }, - { - "id": 2, - "x": 13976.095703125, - "y": 338.986328125, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 3, - "x": 14060.453125, - "y": 337.00634765625, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 4, - "x": 14073.1826171875, - "y": 332.0185546875, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "type": "target" - }, - { - "id": 5, - "x": 14084.7568359375, - "y": 346.3701171875, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),s(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);", - "type": "target" - }, - { - "id": 6, - "x": 14079.249992099834, - "y": 331.78124242101785, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),s(0.1),attack(0.08);万叶 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);", - "type": "target" - }, - { - "id": 7, - "x": 14088.1611328125, - "y": 329.46533203125, - "action": "", - "move_mode": "jump", - "action_params": "", - "type": "path" - }, - { - "id": 8, - "x": 14087.291015625, - "y": 324.818359375, - "action": "", - "move_mode": "jump", - "action_params": "", - "type": "path" - }, - { - "id": 9, - "x": 14083.916015625, - "y": 322.39404296875, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "type": "target" - }, - { - "id": 10, - "x": 14084.9287109375, - "y": 321.60498046875, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 11, - "x": 14082.4345703125, - "y": 318.43212890625, - "action": "", - "move_mode": "jump", - "action_params": "", - "type": "path" - }, - { - "id": 12, - "x": 14080.6923828125, - "y": 315.14306640625, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 13, - "x": 14082.6513671875, - "y": 318.8642578125, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 14, - "x": 14076.3701171875, - "y": 325.43896484375, - "action": "", - "move_mode": "jump", - "action_params": "", - "type": "path" - }, - { - "id": 15, - "x": 14076.5751953125, - "y": 327.431640625, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 16, - "x": 14070.185546875, - "y": 330.4970703125, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 17, - "x": 14049.06640625, - "y": 395.990234375, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 18, - "x": 14035.1337890625, - "y": 409.2099609375, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 19, - "x": 14032.6279296875, - "y": 403.32666015625, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 20, - "x": 14051.9140625, - "y": 441.26318359375, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "type": "path" - }, - { - "id": 21, - "x": 14053.3818359375, - "y": 435.306640625, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 22, - "x": 14100.9619140625, - "y": 438.86083984375, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 23, - "x": 14106.0634765625, - "y": 459.97607421875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 24, - "x": 14100.10546875, - "y": 463.0634765625, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 25, - "x": 14102.3173828125, - "y": 465.89208984375, - "action": "", - "move_mode": "climb", - "action_params": "", - "type": "path" - }, - { - "id": 26, - "x": 14074.822265625, - "y": 484.61181640625, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "type": "target" - } - ] -} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/627纳塔-悠悠集市西岸5.json b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/627纳塔-悠悠集市西岸5.json deleted file mode 100644 index 9b46b2a79..000000000 --- a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/627纳塔-悠悠集市西岸5.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "info": { - "name": "627纳塔-悠悠集市西岸5", - "type": "collect", - "authors": [ - { - "name": "汐", - "links": "" - } - ], - "version": "1.0", - "description": "", - "map_name": "Teyvat", - "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1755676523547, - "enable_monster_loot_split": false, - "map_match_method": "" - }, - "positions": [ - { - "id": 1, - "x": 14151.890625, - "y": 424.2080078125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "teleport" - }, - { - "id": 2, - "x": 14158.78515625, - "y": 418.5810546875, - "type": "target", - "move_mode": "climb", - "action": "combat_script", - "action_params": "keypress(f),wait(0.2),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": 3, - "x": 14161.125, - "y": 425.875354129269, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 4, - "x": 14159.1474609375, - "y": 423.78271484375, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "type": "target" - }, - { - "id": 5, - "x": 14148.251953125, - "y": 414.01171875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 6, - "x": 14141.8935546875, - "y": 406.57958984375, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 7, - "x": 14137.09375, - "y": 408.37494466730186, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "type": "target" - }, - { - "id": 8, - "x": 14136.2392578125, - "y": 406.61279296875, - "action": "combat_script", - "move_mode": "climb", - "action_params": "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);", - "type": "target" - }, - { - "id": 9, - "x": 14140.08203125, - "y": 403.56494140625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 10, - "x": 14136.46875, - "y": 387.40638279847644, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),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);wait(0.5)", - "type": "target" - } - ] -} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/629纳塔-悠悠集市西北岸8.json b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/629纳塔-悠悠集市西北岸8.json deleted file mode 100644 index 1639a3a26..000000000 --- a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/度假村/执行/629纳塔-悠悠集市西北岸8.json +++ /dev/null @@ -1,193 +0,0 @@ -{ - "info": { - "name": "629纳塔-悠悠集市西北岸8", - "type": "collect", - "authors": [ - { - "name": "汐", - "links": "" - } - ], - "version": "1.0", - "description": "", - "map_name": "Teyvat", - "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1755676763859, - "enable_monster_loot_split": false, - "map_match_method": "" - }, - "positions": [ - { - "id": 1, - "x": 14152.62890625, - "y": 423.48876953125, - "action": "force_tp", - "move_mode": "walk", - "action_params": "", - "type": "teleport" - }, - { - "id": 2, - "x": 14168.201171875, - "y": 489.3740234375, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 3, - "x": 14163.05078125, - "y": 508.8310546875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 4, - "x": 14150.46875, - "y": 534.5934069372706, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),s(0.1);万叶 attack(0.08),keydown(E),wait(0.8),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);", - "type": "target" - }, - { - "id": 5, - "x": 14148.0546875, - "y": 536.544921875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 6, - "x": 14135.3203125, - "y": 544.99072265625, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f);芙宁娜 e;", - "type": "path" - }, - { - "id": 7, - "x": 14127.30078125, - "y": 543.6484375, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 8, - "x": 14124.9287109375, - "y": 540.30126953125, - "action": "combat_script", - "move_mode": "walk", - "action_params": "keypress(t),wait(0.2),keypress(t),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(1.2),keypress(f),keydown(Q),keypress(f),wait(0.8),keypress(f),keyup(Q),wait(0.1),j,keypress(f),wait(0.2),keypress(f);迪希雅 e,attack(0.08),e;芙宁娜 e;", - "type": "orientation" - }, - { - "id": 9, - "x": 14124.9287109375, - "y": 540.30126953125, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f);万叶 attack(0.08),keydown(E),wait(0.8),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),q;", - "type": "target" - }, - { - "id": 10, - "x": 14106.11328125, - "y": 558.32958984375, - "type": "path", - "move_mode": "dash", - "action": "combat_script", - "action_params": "keypress(f),wait(0.2),keypress(f);迪希雅 e,attack(0.08),e;芙宁娜 e;" - }, - { - "id": 11, - "x": 14106.11328125, - "y": 558.32958984375, - "action": "combat_script", - "move_mode": "dash", - "action_params": "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);", - "type": "target" - }, - { - "id": 12, - "x": 14080.625, - "y": 566.2496237376508, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 13, - "x": 14069.0380859375, - "y": 569.39892578125, - "action": "combat_script", - "move_mode": "walk", - "action_params": "w(0.3),dash,w(1),", - "type": "orientation" - }, - { - "id": 14, - "x": 14069.0380859375, - "y": 569.39892578125, - "action": "", - "move_mode": "jump", - "action_params": "", - "type": "path" - }, - { - "id": 15, - "x": 14070.1142578125, - "y": 570.19921875, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 16, - "x": 14067.958984375, - "y": 553.3671875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 17, - "x": 14058.787109375, - "y": 544.890625, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),a(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);", - "type": "target" - }, - { - "id": 18, - "x": 14023.177734375, - "y": 576.03955078125, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 19, - "x": 14018.7900390625, - "y": 580.296875, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - } - ] -} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-中部塔内8.json b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔①-9.json similarity index 73% rename from repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-中部塔内8.json rename to repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔①-9.json index de65ca771..5e5264f25 100644 --- a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-中部塔内8.json +++ b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔①-9.json @@ -1,368 +1,359 @@ { "info": { - "name": "509【收尾】枫丹-中部塔内8", - "type": "collect", "authors": [ { - "name": "汐", - "links": "" + "links": "", + "name": "汐" } ], - "version": "1", - "description": "", - "map_name": "Teyvat", "bgi_version": "0.45.0", - "tags": [], - "last_modified_time": 1755716841847, + "description": "", "enable_monster_loot_split": false, - "map_match_method": "" + "last_modified_time": 1756059231291, + "map_match_method": "", + "map_name": "Teyvat", + "name": "509【收尾】枫丹-科学院工坊高塔①-9", + "tags": [], + "type": "collect", + "version": "1" }, "positions": [ { + "action": "", "id": 1, + "move_mode": "walk", + "type": "teleport", "x": 4434.34375, - "y": 5091.7138671875, - "action": "", - "move_mode": "walk", - "type": "teleport" + "y": 5091.7138671875 }, { + "action": "", "id": 2, + "move_mode": "run", + "type": "path", "x": 4421.781086071558, - "y": 5068.437810738251, - "action": "", - "move_mode": "run", - "type": "path" + "y": 5068.437810738251 }, { + "action": "", + "action_params": "", "id": 3, + "move_mode": "dash", + "type": "path", "x": 4372.52099609375, - "y": 5015.80419921875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" + "y": 5015.80419921875 }, { - "id": 4, - "x": 4365.3564453125, - "y": 4955.35498046875, "action": "combat_script", - "move_mode": "dash", "action_params": "wait(0.5)", - "type": "path" + "id": 4, + "move_mode": "dash", + "type": "path", + "x": 4365.3564453125, + "y": 4955.35498046875 }, { + "action": "", + "action_params": "", "id": 5, + "move_mode": "fly", + "type": "path", "x": 4413.000112577363, - "y": 4938.718894000653, - "action": "", - "move_mode": "fly", - "action_params": "", - "type": "path" + "y": 4938.718894000653 }, { + "action": "", + "action_params": "", "id": 6, + "move_mode": "fly", + "type": "path", "x": 4409.49267578125, - "y": 4930.6005859375, - "action": "", - "move_mode": "fly", - "action_params": "", - "type": "path" + "y": 4930.6005859375 }, { + "action": "", "id": 7, + "move_mode": "fly", + "type": "path", "x": 4407.50048828125, - "y": 4929.35205078125, - "action": "", - "move_mode": "fly", - "type": "path" + "y": 4929.35205078125 }, { - "id": 8, - "x": 4396.031178898507, - "y": 4929.281128736293, "action": "combat_script", - "move_mode": "dash", "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),s(0.6)", - "type": "target" - }, - { - "id": 9, - "x": 4400.09380332612, - "y": 4922.937674316579, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),w(0.2),keypress(f),w(0.2),keypress(f),", - "type": "target" - }, - { - "id": 10, - "x": 4395, - "y": 4925.7412109375, - "action": "combat_script", - "move_mode": "climb", - "action_params": "wait(0.3),keypress(x),wait(0.2),keypress(x)", - "type": "path" - }, - { - "id": 11, - "x": 4395.4921875, - "y": 4930.93212890625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 12, - "x": 4396.6796875, - "y": 4932.5673828125, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),w(0.2),keypress(f),a(0.3),keypress(f),", - "type": "target" - }, - { - "id": 13, - "x": 4398.7802734375, - "y": 4925.06640625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 14, - "x": 4395.999980249585, - "y": 4922.156325789818, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),w(0.2),keypress(f),w(0.2),keypress(f),s(0.5)", - "type": "target" - }, - { - "id": 15, - "x": 4402.06298828125, - "y": 4921.12841796875, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.3),keypress(f),wait(0.2),keypress(f),keypress(x),s(0.5),d(0.4);万叶 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);", - "type": "target" - }, - { - "id": 16, - "x": 4405.76416015625, - "y": 4927.8017578125, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(x),wait(0.3),keypress(x),wait(0.3),keypress(x)", - "type": "orientation" - }, - { - "id": 17, - "x": 4405.76416015625, - "y": 4927.8017578125, - "action": "", - "move_mode": "climb", - "action_params": "", - "type": "path" - }, - { - "id": 18, - "x": 4403.23828125, - "y": 4922.1796875, - "action": "", + "id": 8, "move_mode": "dash", - "type": "path" - }, - { - "id": 19, - "x": 4399.968848752073, - "y": 4927.844106212142, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 20, - "x": 4403.5556640625, - "y": 4921.7744140625, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 21, - "x": 4401.943359375, - "y": 4921.599609375, - "action": "", - "move_mode": "climb", - "action_params": "", - "type": "target" - }, - { - "id": 22, - "x": 4401.1943359375, - "y": 4921.052734375, - "action": "combat_script", - "move_mode": "climb", - "action_params": "wait(0.3),keypress(VK_SPACE),wait(0.5),keypress(VK_SPACE)", - "type": "target" - }, - { - "id": 23, - "x": 4399.66650390625, - "y": 4921.7080078125, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),w(0.3),keypress(f),d(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.51),keyup(E),attack(0.2),wait(0.5);琴 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);", - "type": "target" - }, - { - "id": 24, - "x": 4399.093769750415, - "y": 4933.593636315274, - "action": "", - "move_mode": "walk", - "type": "path" - }, - { - "id": 25, - "x": 4402.75146484375, - "y": 4932.09375, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 26, - "x": 4398.71875, - "y": 4920.1873672015245, - "action": "combat_script", - "move_mode": "climb", - "action_params": "keypress(f),wait(0.2),keypress(f),d(0.3),keypress(f),wait(0.2),keypress(x);万叶 attack(0.08),keydown(E),wait(0.51),keyup(E),attack(0.2),wait(0.5);琴 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);", - "type": "target" - }, - { - "id": 27, - "x": 4397.646484375, - "y": 4933.8046875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 28, - "x": 4410.732421875, - "y": 4922.47216796875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 29, - "x": 4425.1796875, - "y": 4919.65185546875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 30, - "x": 4437.28515625, - "y": 4936.17431640625, - "action": "", - "move_mode": "run", - "action_params": "", - "type": "path" - }, - { - "id": 31, - "x": 4493.9091796875, - "y": 4978.88232421875, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 32, - "x": 4503.7236328125, - "y": 4990.9091796875, - "action": "stop_flying", - "move_mode": "fly", - "action_params": "", - "type": "path" - }, - { - "id": 33, - "x": 4498.919921875, - "y": 4993.87890625, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "type": "target" - }, - { - "id": 34, - "x": 4493.6455078125, - "y": 4989.66748046875, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 35, - "x": 4463.6845703125, - "y": 4980.9755859375, - "action": "combat_script", - "move_mode": "walk", - "action_params": "w(0.3),dash,w(0.7),dash,wait(0.8)", - "type": "orientation" - }, - { - "id": 36, - "x": 4463.6845703125, - "y": 4980.9755859375, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 37, - "x": 4441.1171875, - "y": 4989.79248046875, - "action": "combat_script", - "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),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);", - "type": "target" - }, - { - "id": 38, - "x": 4419.857421875, - "y": 4989.95849609375, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 39, - "x": 4412.78515625, - "y": 4993.57080078125, "type": "target", - "move_mode": "climb", + "x": 4396.031178898507, + "y": 4929.281128736293 + }, + { "action": "combat_script", - "action_params": "s(0.01),wait(0.4),s(0.01),wait(0.1),keypress(f),wait(0.1),keypress(f),dash" + "action_params": "keypress(f),w(0.2),keypress(f),w(0.2),keypress(f),", + "id": 9, + "move_mode": "climb", + "type": "target", + "x": 4400.093803326119, + "y": 4922.937674316579 + }, + { + "action": "combat_script", + "action_params": "wait(0.3),keypress(x),wait(0.2),keypress(x)", + "id": 10, + "move_mode": "climb", + "type": "path", + "x": 4395, + "y": 4925.7412109375 + }, + { + "action": "", + "action_params": "", + "id": 11, + "move_mode": "walk", + "type": "path", + "x": 4395.4921875, + "y": 4930.93212890625 + }, + { + "action": "combat_script", + "action_params": "keypress(f),w(0.2),keypress(f),a(0.3),keypress(f),", + "id": 12, + "move_mode": "climb", + "type": "target", + "x": 4396.6796875, + "y": 4932.5673828125 + }, + { + "action": "", + "action_params": "", + "id": 13, + "move_mode": "walk", + "type": "path", + "x": 4398.7802734375, + "y": 4925.06640625 + }, + { + "action": "combat_script", + "action_params": "keypress(f),w(0.2),keypress(f),w(0.2),keypress(f),s(0.5)", + "id": 14, + "move_mode": "climb", + "type": "target", + "x": 4395.999980249584, + "y": 4922.156325789818 + }, + { + "action": "combat_script", + "action_params": "keypress(f),wait(0.3),keypress(f),wait(0.2),keypress(f),keypress(x),s(0.5),d(0.4);万叶 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": 15, + "move_mode": "climb", + "type": "target", + "x": 4402.06298828125, + "y": 4921.12841796875 + }, + { + "action": "combat_script", + "action_params": "keypress(x),wait(0.3),keypress(x),wait(0.3),keypress(x)", + "id": 16, + "move_mode": "climb", + "type": "orientation", + "x": 4405.76416015625, + "y": 4927.8017578125 + }, + { + "action": "", + "action_params": "", + "id": 17, + "move_mode": "climb", + "type": "path", + "x": 4405.76416015625, + "y": 4927.8017578125 + }, + { + "action": "", + "id": 18, + "move_mode": "dash", + "type": "path", + "x": 4403.23828125, + "y": 4922.1796875 + }, + { + "action": "", + "action_params": "", + "id": 19, + "move_mode": "walk", + "type": "path", + "x": 4399.9688487520725, + "y": 4927.844106212142 + }, + { + "action": "", + "action_params": "", + "id": 20, + "move_mode": "dash", + "type": "path", + "x": 4403.5556640625, + "y": 4921.7744140625 + }, + { + "action": "", + "action_params": "", + "id": 21, + "move_mode": "climb", + "type": "target", + "x": 4401.943359375, + "y": 4921.599609375 + }, + { + "action": "combat_script", + "action_params": "wait(0.3),keypress(VK_SPACE),wait(0.5),keypress(VK_SPACE)", + "id": 22, + "move_mode": "climb", + "type": "target", + "x": 4401.1943359375, + "y": 4921.052734375 + }, + { + "action": "combat_script", + "action_params": "keypress(f),w(0.3),keypress(f),d(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.51),keyup(E),attack(0.2),wait(0.5);琴 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, + "move_mode": "climb", + "type": "target", + "x": 4399.66650390625, + "y": 4921.7080078125 + }, + { + "action": "", + "id": 24, + "move_mode": "walk", + "type": "path", + "x": 4399.093769750416, + "y": 4933.593636315274 + }, + { + "action": "", + "action_params": "", + "id": 25, + "move_mode": "walk", + "type": "path", + "x": 4402.75146484375, + "y": 4932.09375 + }, + { + "action": "combat_script", + "action_params": "keypress(f),wait(0.2),keypress(f),d(0.3),keypress(f),wait(0.2),keypress(x);万叶 attack(0.08),keydown(E),wait(0.51),keyup(E),attack(0.2),wait(0.5);琴 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, + "move_mode": "climb", + "type": "target", + "x": 4398.71875, + "y": 4920.1873672015245 + }, + { + "action": "", + "action_params": "", + "id": 27, + "move_mode": "dash", + "type": "path", + "x": 4397.646484375, + "y": 4933.8046875 + }, + { + "action": "", + "action_params": "", + "id": 28, + "move_mode": "dash", + "type": "path", + "x": 4410.732421875, + "y": 4922.47216796875 + }, + { + "action": "", + "action_params": "", + "id": 29, + "move_mode": "dash", + "type": "path", + "x": 4425.1796875, + "y": 4919.65185546875 + }, + { + "action": "", + "action_params": "", + "id": 30, + "move_mode": "run", + "type": "path", + "x": 4437.28515625, + "y": 4936.17431640625 + }, + { + "action": "", + "action_params": "", + "id": 31, + "move_mode": "dash", + "type": "path", + "x": 4493.9091796875, + "y": 4978.88232421875 + }, + { + "action": "stop_flying", + "action_params": "", + "id": 32, + "move_mode": "fly", + "type": "path", + "x": 4503.7236328125, + "y": 4990.9091796875 + }, + { + "action": "combat_script", + "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "id": 33, + "move_mode": "dash", + "type": "target", + "x": 4498.919921875, + "y": 4993.87890625 + }, + { + "action": "", + "action_params": "", + "id": 34, + "move_mode": "walk", + "type": "path", + "x": 4493.6455078125, + "y": 4989.66748046875 + }, + { + "action": "combat_script", + "action_params": "w(0.3),dash,w(0.7),dash,wait(0.8)", + "id": 35, + "move_mode": "walk", + "type": "orientation", + "x": 4463.6845703125, + "y": 4980.9755859375 + }, + { + "action": "", + "action_params": "", + "id": 36, + "move_mode": "dash", + "type": "path", + "x": 4463.6845703125, + "y": 4980.9755859375 + }, + { + "action": "combat_script", + "action_params": "keypress(f),wait(0.2),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": 37, + "move_mode": "dash", + "type": "target", + "x": 4440.625, + "y": 4990.062599598858 + }, + { + "action": "", + "action_params": "", + "id": 38, + "move_mode": "dash", + "type": "path", + "x": 4422.212890625, + "y": 4987.791015625 } ] } \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/510第一层下电梯.json b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔②-6.json similarity index 87% rename from repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/510第一层下电梯.json rename to repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔②-6.json index 0396664b4..df17e2fcb 100644 --- a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/510第一层下电梯.json +++ b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔②-6.json @@ -1,13 +1,18 @@ { "info": { - "authors": [], + "authors": [ + { + "links": "", + "name": "汐" + } + ], "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1755882101786, + "last_modified_time": 1756062492975, "map_match_method": "", "map_name": "Teyvat", - "name": "第一层下电梯", + "name": "509【收尾】枫丹-科学院工坊高塔②-6", "tags": [], "type": "collect", "version": "1.0" @@ -33,7 +38,7 @@ }, { "action": "stop_flying", - "action_params": "1000", + "action_params": "1800", "id": 3, "move_mode": "fly", "type": "path", @@ -51,12 +56,12 @@ }, { "action": "combat_script", - "action_params": "keypress(f),wait(0.2),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);", + "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),a(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": 5, "move_mode": "dash", - "type": "path", - "x": 4452.69140625, - "y": 4997.04638671875 + "type": "target", + "x": 4452.48828125, + "y": 4997.45654296875 }, { "action": "", @@ -109,8 +114,8 @@ "id": 11, "move_mode": "climb", "type": "target", - "x": 4511.564453125, - "y": 4999.583984375 + "x": 4511.083984375, + "y": 4999.388671875 }, { "action": "", @@ -139,10 +144,19 @@ "x": 4523.490234375, "y": 4992.517578125 }, + { + "action": "", + "action_params": "", + "id": 15, + "move_mode": "run", + "type": "path", + "x": 4522.541015625, + "y": 4983.119140625 + }, { "action": "combat_script", "action_params": "attack(0.3),keypress(f),keypress(x),wait(0.2),keypress(f),keypress(x),", - "id": 15, + "id": 16, "move_mode": "climb", "type": "path", "x": 4516.900390625, @@ -151,7 +165,7 @@ { "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),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": 16, + "id": 17, "move_mode": "climb", "type": "target", "x": 4515.47265625, @@ -160,7 +174,7 @@ { "action": "", "action_params": "", - "id": 17, + "id": 18, "move_mode": "climb", "type": "path", "x": 4516.2412109375, @@ -169,34 +183,34 @@ { "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),s(0.2);万叶 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": 18, + "id": 19, "move_mode": "climb", "type": "target", - "x": 4509.6015625, - "y": 5002.26904296875 + "x": 4509.15625, + "y": 5002.562599598858 }, { "action": "", "action_params": "", - "id": 19, + "id": 20, "move_mode": "climb", - "type": "path", + "type": "target", "x": 4512.501953125, "y": 4999.88818359375 }, { "action": "combat_script", "action_params": "keypress(f),wait(0.2),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": 20, + "id": 21, "move_mode": "dash", "type": "target", - "x": 4499.458984375, - "y": 4993.421875 + "x": 4499.208984375, + "y": 4993.0830078125 }, { "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", - "id": 21, + "id": 22, "move_mode": "climb", "type": "target", "x": 4501.87890625, @@ -205,7 +219,7 @@ { "action": "combat_script", "action_params": "a(0.15),wait(0.1),keypress(t),wait(0.2),keypress(t),wait(0.3),keypress(f)", - "id": 22, + "id": 23, "move_mode": "climb", "type": "path", "x": 4504.87109375, @@ -213,8 +227,8 @@ }, { "action": "combat_script", - "action_params": "wait(0.2),j,wait(0.12),j,wait(1),j,wait(0.12),j,wait(4)", - "id": 23, + "action_params": "wait(0.3),j,wait(0.12),j,wait(1),j,wait(0.12),j,wait(1.5)", + "id": 24, "move_mode": "run", "type": "path", "x": 4511.029296875, @@ -223,7 +237,7 @@ { "action": "", "action_params": "", - "id": 24, + "id": 25, "move_mode": "fly", "type": "path", "x": 4510.8740234375, @@ -232,7 +246,7 @@ { "action": "", "action_params": "", - "id": 25, + "id": 26, "move_mode": "dash", "type": "path", "x": 4512.4521484375, @@ -241,7 +255,7 @@ { "action": "", "action_params": "", - "id": 26, + "id": 27, "move_mode": "dash", "type": "path", "x": 4456.51171875, diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/511.json b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔③-7.json similarity index 91% rename from repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/511.json rename to repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔③-7.json index 9c1e84346..e7896db6b 100644 --- a/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/511.json +++ b/repo/js/AAA-Artifacts-Group-Purchasing/assets/ArtifactsPath/枫丹高塔/执行/509【收尾】枫丹-科学院工坊高塔③-7.json @@ -1,13 +1,18 @@ { "info": { - "authors": [], + "authors": [ + { + "links": "", + "name": "汐" + } + ], "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1755881501000, + "last_modified_time": 1756063230824, "map_match_method": "", "map_name": "Teyvat", - "name": "未命名路径2", + "name": "509【收尾】枫丹-科学院工坊高塔③-7", "tags": [], "type": "collect", "version": "1.0" @@ -64,8 +69,8 @@ "id": 6, "move_mode": "climb", "type": "target", - "x": 4399.7734375, - "y": 4944.998046875 + "x": 4399.6875, + "y": 4944.781172534222 }, { "action": "", @@ -127,8 +132,8 @@ "id": 13, "move_mode": "walk", "type": "orientation", - "x": 4390.125, - "y": 4933.218440136889 + "x": 4392.718795425953, + "y": 4933.437462105092 }, { "action": "", @@ -141,12 +146,12 @@ }, { "action": "combat_script", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "action_params": "w(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", "id": 15, "move_mode": "climb", "type": "target", - "x": 4392.95703125, - "y": 4931.0341796875 + "x": 4392.984375, + "y": 4930.49755859375 }, { "action": "combat_script", @@ -213,17 +218,26 @@ }, { "action": "combat_script", - "action_params": "wait(0.3),j,wait(2.5),attack(0.3)", + "action_params": "wait(0.4),j,wait(2.5),attack(0.3)", "id": 23, "move_mode": "fly", "type": "path", - "x": 4422.499883472554, - "y": 4877.374492208224 + "x": 4419.6259765625, + "y": 4873.58740234375 }, { "action": "", "action_params": "", "id": 24, + "move_mode": "climb", + "type": "path", + "x": 4422.53125, + "y": 4878.094004530412 + }, + { + "action": "", + "action_params": "", + "id": 25, "move_mode": "dash", "type": "target", "x": 4426.263671875, @@ -232,7 +246,7 @@ { "action": "combat_script", "action_params": "keydown(w),wait(0.3),dash,wait(0.4),dash,wait(1),dash,wait(0.4),keyup(w)", - "id": 25, + "id": 26, "move_mode": "walk", "type": "orientation", "x": 4484.767578125, @@ -241,7 +255,7 @@ { "action": "", "action_params": "", - "id": 26, + "id": 27, "move_mode": "dash", "type": "path", "x": 4487.2822265625, @@ -250,16 +264,16 @@ { "action": "", "action_params": "", - "id": 27, + "id": 28, "move_mode": "dash", "type": "path", - "x": 4477.916015625, - "y": 4848.384765625 + "x": 4476.81640625, + "y": 4846.8623046875 }, { "action": "combat_script", "action_params": "w(0.3),j,wait(0.5),d(1),keypress(ESCAPE),wait(0.5),attack(0.3)", - "id": 28, + "id": 29, "move_mode": "climb", "type": "target", "x": 4471.169921875, @@ -268,7 +282,7 @@ { "action": "", "action_params": "", - "id": 29, + "id": 30, "move_mode": "dash", "type": "path", "x": 4472.376953125, @@ -277,7 +291,7 @@ { "action": "combat_script", "action_params": "keypress(f),wait(0.2),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": 30, + "id": 31, "move_mode": "climb", "type": "target", "x": 4471.1064453125, diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/manifest.json b/repo/js/AAA-Artifacts-Group-Purchasing/manifest.json index 5d92638e8..6409ed061 100644 --- a/repo/js/AAA-Artifacts-Group-Purchasing/manifest.json +++ b/repo/js/AAA-Artifacts-Group-Purchasing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮联机团购", - "version": "0.0.3", + "version": "0.0.4", "tags": [ "狗粮" ], diff --git a/repo/js/AutoHoeingOneDragon/README.md b/repo/js/AutoHoeingOneDragon/README.md index fba934ad2..8adad2f10 100644 --- a/repo/js/AutoHoeingOneDragon/README.md +++ b/repo/js/AutoHoeingOneDragon/README.md @@ -37,15 +37,15 @@ - - 选项 **强制刷新所有运行记录** ，用于清除js记录的运行历史 - **选择执行第几个路径组：** 本js支持分组运行地图追踪，分组方式详见后续选项，需要分组运行时请确保精英目标数量，小怪目标数量，各个路径组的标签等信息【完全相同】，复制配置组时未知原因无法正确复制配置，请不要使用 - **本路径组使用配队名称：** 填写该路径组使用的配队名称，js会自动切换 - - **拾取模式：** + - **拾取模式：** 需要注意，沙暴路线只在模板匹配或ocr模式下可用 - - ocr拾取：使用ocr识别掉落物进行拾取，自定义拾取名单【仅在此模式下生效】 - - - 模板匹配拾取：测试中，速度最快，性能消耗最低，只拾取四种锄地会掉落的狗粮 - - - bgi原版拾取 - - - 不拾取 + - - 模板匹配拾取：推荐使用，速度最快，性能消耗最低，只拾取四种锄地会掉落的狗粮 + - - bgi原版拾取：使用bgi自带的拾取 + - - 不拾取：不拾取任何物品 - **拾取时间参数：** 建议先不要调节，观察到拾取异常时再根据自定义配置提示调节 - **效率降序运行：**当你时间不足以刷完所有怪物且不确定时，建议通过开启该项和配置下一项来实现在指定时间前尽可能多刷效率高的路线并按时终止 - **输入不运行的时间或时间段的小时数** 当你需要让js在特定的时间终止运行时，按描述填写，js会在距离目标时间小于五分钟时终止运行并等待到目标时间 - - **泥头车模式（实验性功能）：** 接近战斗地点（距离5-30）时，提前让指定序号的角色开e，建议以下角色开启：芙宁娜，爱可菲，雷电将军。警告，可能会增加性能开销和降低稳定性。 + - **泥头车模式：** 接近战斗地点（距离5-30）时，提前让指定序号的角色开e，建议以下角色开启：芙宁娜，爱可菲，雷电将军，不建议各种盾位或纳塔角色开启。 - **账户名称：** 本js支持多用户，不同账户的记录分开存储，当你需要使用多用户时，请在这里填写不同的文本来区分不同账号的记录，如果你只使用一个账号，请不要修改该选项 - **路径组x标签：** 本js使用不同的标签来禁用或分组路线，多个标签之间使用中文逗号分隔，目前支持的标签如下 - - 水免：表明路线含有水元素伤害免疫的怪物，使用以水元素伤害为主的队伍处理该路线时可能较为麻烦 @@ -78,7 +78,9 @@ --- ### 更新日志 -### 1.4.12（2025.08.24） +### 1.4.14（2025.08.25） +1.更改处理沙暴路线的逻辑 +### 1.4.13（2025.08.24） 1.更正部分路线的怪物信息 ### 1.4.12（2025.08.23） 1.优化精英246,428,504;小怪6405,6806 diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js index 47aa04c77..09ea614fb 100644 --- a/repo/js/AutoHoeingOneDragon/main.js +++ b/repo/js/AutoHoeingOneDragon/main.js @@ -48,10 +48,15 @@ const timeMove = (+settings.timeMove || 1000); const priorityTags = (settings.priorityTags || "").split("，").map(tag => tag.trim()).filter(tag => tag.length > 0); const excludeTags = (settings.excludeTags || "").split("，").map(tag => tag.trim()).filter(tag => tag.length > 0); + if (pickupMode != "模板匹配拾取，默认只拾取狗粮" && pickupMode != "ocr拾取，默认只拾取狗粮和晶蝶") { + excludeTags.push("沙暴"); + log.warn("拾取模式不是模板匹配或ocr，无法处理沙暴路线，自动排除所有沙暴路线"); + } const accountName = settings.accountName || "默认账户"; // 拾取黑白名单处理 const ocrPickupContent = await file.readText("assets/拾取名单.json"); const ocrPickupJson = JSON.parse(ocrPickupContent); + ocrPickupJson["白名单"].push("镇压"); const whitelistKeywords = ocrPickupJson["白名单"]; const blacklistKeywords = ocrPickupJson["黑名单"]; diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json index 1cdc8e79c..7377679ec 100644 --- a/repo/js/AutoHoeingOneDragon/manifest.json +++ b/repo/js/AutoHoeingOneDragon/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "锄地一条龙", - "version": "1.4.13", + "version": "1.4.14", "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用", "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/settings.json b/repo/js/AutoHoeingOneDragon/settings.json index f4ab19575..3eb18978b 100644 --- a/repo/js/AutoHoeingOneDragon/settings.json +++ b/repo/js/AutoHoeingOneDragon/settings.json @@ -66,7 +66,7 @@ { "name": "activeDumperMode", "type": "input-text", - "label": "泥头车模式,将在接近战斗点前提前释放部分角色e技能\n需要启用时填写这些角色在队伍中的编号\n有多个角色需要释放时用中文逗号分隔" + "label": "泥头车模式,将在接近战斗点前提前释放部分角色e技能\n需要启用时填写这些角色在队伍中的编号\n有多个角色需要释放时用【中文逗号】分隔" }, { "name": "runByEfficiency",