diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/README.md b/repo/js/AAA-Artifacts-Bulk-Supply/README.md index 8dd7f57fb..7b4eb595a 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/README.md +++ b/repo/js/AAA-Artifacts-Bulk-Supply/README.md @@ -82,6 +82,10 @@ https://www.kdocs.cn/wo/sl/v13uXscL ## 更新日志 +### 1.0.6(2025.08.22) +1.修复自动分解不生效的问题 +2.优化强制黑白芙逻辑 +3.优化部分路线 ### 1.0.5(2025.08.21) 1.优化分解狗粮,提高容错 ### 1.0.4(2025.08.20) diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/优先收尾路线/执行/305【收尾】稻妻-踏鞴砂③-8.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/优先收尾路线/执行/305【收尾】稻妻-踏鞴砂③-8.json index 288c6172b..a73d20779 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/优先收尾路线/执行/305【收尾】稻妻-踏鞴砂③-8.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/优先收尾路线/执行/305【收尾】稻妻-踏鞴砂③-8.json @@ -13,7 +13,7 @@ "map_name": "Teyvat", "bgi_version": "0.45.0", "tags": [], - "last_modified_time": 1755415373852, + "last_modified_time": 1755789144989, "enable_monster_loot_split": false, "map_match_method": "" }, @@ -75,16 +75,16 @@ "y": -3745.188409477807, "action": "combat_script", "move_mode": "fly", - "action_params": "wait(0.3),j,wait(1),j", + "action_params": "wait(0.4),j,wait(1),j", "type": "path" }, { "id": 8, "x": -3122.7138671875, "y": -3735.26171875, - "action": "stop_flying", + "action": "combat_script", "move_mode": "fly", - "action_params": "", + "action_params": "wait(0.5),keypress(x),wait(0.2),keypress(x),attack(0.3),keypress(x)", "type": "path" }, { diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/622纳塔-悠悠集市栈道南7.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/622纳塔-悠悠集市栈道南7.json index 877bc92c4..a8638eaf7 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/622纳塔-悠悠集市栈道南7.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/622纳塔-悠悠集市栈道南7.json @@ -13,7 +13,7 @@ "map_name": "Teyvat", "bgi_version": "0.45.0", "tags": [], - "last_modified_time": 1755542821050, + "last_modified_time": 1755787984598, "enable_monster_loot_split": false, "map_match_method": "" }, @@ -58,10 +58,10 @@ "id": 5, "x": 13740.099609375, "y": 377.83984375, - "type": "path", - "move_mode": "dash", "action": "", - "action_params": "" + "move_mode": "dash", + "action_params": "", + "type": "path" }, { "id": 6, @@ -155,8 +155,8 @@ }, { "id": 16, - "x": 13777.3671875, - "y": 197.75927734375, + "x": 13775.10546875, + "y": 198.29052734375, "action": "", "move_mode": "dash", "action_params": "", @@ -164,36 +164,35 @@ }, { "id": 17, - "x": 13766.0478515625, - "y": 181.322265625, - "type": "path", - "move_mode": "dash", + "x": 13764.375, + "y": 177.0625442661585, "action": "", - "action_params": "" + "move_mode": "dash", + "action_params": "", + "type": "target" }, { "id": 18, - "x": 13763.343720374378, - "y": 180.5000682108357, + "x": 13763.8369140625, + "y": 180.43994140625, "action": "", - "move_mode": "climb", + "move_mode": "dash", "action_params": "", - "type": "path", - "locked": false + "type": "path" }, { "id": 19, - "x": 13763.343720374378, - "y": 180.5000682108357, + "x": 13763.9921875, + "y": 180.046875, "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),w(0.2);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2),wait(1);琴 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(1)", + "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),d(0.2);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2),wait(1);琴 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(1)", "type": "target" }, { "id": 20, - "x": 13752.5712890625, - "y": 167.7529296875, + "x": 13753.125, + "y": 168.50026559695198, "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);", @@ -201,8 +200,8 @@ }, { "id": 21, - "x": 13744.3896484375, - "y": 159.720703125, + "x": 13741.28125, + "y": 157.46795320914407, "action": "", "move_mode": "run", "action_params": "", @@ -210,38 +209,29 @@ }, { "id": 22, - "x": 13738.234375, - "y": 158.57080078125, + "x": 13738.109375, + "y": 142.064453125, "action": "", - "move_mode": "jump", + "move_mode": "run", "action_params": "", "type": "path" }, { "id": 23, - "x": 13733.3701171875, - "y": 140.03369140625, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" + "x": 13737.6953125, + "y": 140.15869140625, + "action": "combat_script", + "move_mode": "climb", + "action_params": "keydown(w),wait(0.3),j,keyup(w),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", + "type": "orientation" }, { "id": 24, - "x": 13737.8388671875, - "y": 140.2734375, - "action": "", - "move_mode": "climb", - "action_params": "", - "type": "path" - }, - { - "id": 25, - "x": 13737.8388671875, - "y": 140.2744140625, + "x": 13737.6953125, + "y": 140.15869140625, "action": "combat_script", "move_mode": "climb", - "action_params": "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);万叶 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" } ] diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/632纳塔-彩彩崖西6.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/632纳塔-彩彩崖西6.json index 198904f90..7f586c30f 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/632纳塔-彩彩崖西6.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/632纳塔-彩彩崖西6.json @@ -13,7 +13,7 @@ "map_name": "Teyvat", "bgi_version": "0.45.0", "tags": [], - "last_modified_time": 1755677263189, + "last_modified_time": 1755779704552, "enable_monster_loot_split": false, "map_match_method": "" }, @@ -159,7 +159,7 @@ "y": 762.81201171875, "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.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);wait(1.3)", + "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);wait(1.8)", "type": "target" }, { diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/640纳塔-浪浪湾北2.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/640纳塔-浪浪湾北2.json index d8a0dbf30..49a71f364 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/640纳塔-浪浪湾北2.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/640纳塔-浪浪湾北2.json @@ -13,7 +13,7 @@ "map_name": "Teyvat", "bgi_version": "0.45.0", "tags": [], - "last_modified_time": 1755627682728, + "last_modified_time": 1755784625182, "enable_monster_loot_split": false, "map_match_method": "" }, @@ -47,17 +47,17 @@ }, { "id": 4, - "x": 14628.2294921875, - "y": 1073.796875, + "x": 14627.96875, + "y": 1073.0309844030471, "action": "combat_script", "move_mode": "dash", - "action_params": "keypress(f),wait(0.2),keypress(f),a(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);", + "action_params": "keypress(f),wait(0.2),keypress(f),a(0.2),keypress(f),wait(0.2),keypress(f),w(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": 5, - "x": 14597.6015625, - "y": 1054.8291015625, + "x": 14600.5, + "y": 1056.094192661587, "action": "", "move_mode": "dash", "action_params": "", diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/替补收尾路线/执行/427【收尾】须弥-智障厅②-7.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/替补收尾路线/执行/427【收尾】须弥-智障厅②-7.json index 097b72590..64aef4536 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/替补收尾路线/执行/427【收尾】须弥-智障厅②-7.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/替补收尾路线/执行/427【收尾】须弥-智障厅②-7.json @@ -13,8 +13,9 @@ "map_name": "Teyvat", "bgi_version": "0.45.0", "tags": [], - "last_modified_time": 1753801538342, - "enable_monster_loot_split": false + "last_modified_time": 1755788650052, + "enable_monster_loot_split": false, + "map_match_method": "" }, "positions": [ { @@ -136,8 +137,8 @@ }, { "id": 14, - "x": 5078.849609375, - "y": -2316.015625, + "x": 5077.7685546875, + "y": -2316.05859375, "action": "", "move_mode": "dash", "action_params": "", diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/仅12h额外/执行/05【额外】纳塔-鸡屁股9.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/仅12h额外/执行/05【额外】纳塔-鸡屁股9.json index 8dfc9093b..050353b7f 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/仅12h额外/执行/05【额外】纳塔-鸡屁股9.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/仅12h额外/执行/05【额外】纳塔-鸡屁股9.json @@ -13,7 +13,7 @@ "map_name": "Teyvat", "bgi_version": "0.45.0", "tags": [], - "last_modified_time": 1755695155389, + "last_modified_time": 1755784052446, "enable_monster_loot_split": false, "map_match_method": "" }, @@ -37,8 +37,8 @@ }, { "id": 3, - "x": 8765.375, - "y": -1824.2496348041914, + "x": 8765.125, + "y": -1825.2190930627294, "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);", diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/05【额外】纳塔-鸡屁股9.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/05【额外】纳塔-鸡屁股9.json index 8dfc9093b..050353b7f 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/05【额外】纳塔-鸡屁股9.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/05【额外】纳塔-鸡屁股9.json @@ -13,7 +13,7 @@ "map_name": "Teyvat", "bgi_version": "0.45.0", "tags": [], - "last_modified_time": 1755695155389, + "last_modified_time": 1755784052446, "enable_monster_loot_split": false, "map_match_method": "" }, @@ -37,8 +37,8 @@ }, { "id": 3, - "x": 8765.375, - "y": -1824.2496348041914, + "x": 8765.125, + "y": -1825.2190930627294, "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);", diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/06【额外】纳塔-灵谜纹13.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/06【额外】纳塔-灵谜纹13.json index 5e6482f6c..1b37e723c 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/06【额外】纳塔-灵谜纹13.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/06【额外】纳塔-灵谜纹13.json @@ -13,7 +13,7 @@ "map_name": "Teyvat", "bgi_version": "0.45.0", "tags": [], - "last_modified_time": 1755630001128, + "last_modified_time": 1755788191640, "enable_monster_loot_split": false, "map_match_method": "" }, @@ -77,7 +77,7 @@ "y": -1560.5, "action": "combat_script", "move_mode": "walk", - "action_params": "mousedown,wait(0.5),moveby(-150,1600),wait(0.2),moveby(0,1600),wait(0.5),mouseup", + "action_params": "mousedown,wait(0.5),moveby(-150,3000),wait(0.2),moveby(0,1000),wait(0.5),mouseup", "type": "orientation" }, { diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/激活/7强制白芙.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/激活/7强制白芙.json deleted file mode 100644 index 08cc0b216..000000000 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/激活/7强制白芙.json +++ /dev/null @@ -1,58 +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": 1755534261430, - "enable_monster_loot_split": false, - "map_match_method": "" - }, - "positions": [ - { - "id": 1, - "x": -762.078125, - "y": -3798.2978515625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "teleport" - }, - { - "id": 2, - "x": -777.662109375, - "y": -3821.849609375, - "action": "combat_script", - "move_mode": "fly", - "action_params": "attack(0.5),wait(4.5)", - "type": "path" - }, - { - "id": 3, - "x": 268.5908203125, - "y": -665.69580078125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "teleport" - }, - { - "id": 4, - "x": 263.3046875, - "y": -662.833984375, - "action": "combat_script", - "move_mode": "walk", - "action_params": "keypress(f);芙宁娜 attack(0.08),charge;", - "type": "orientation" - } - ] -} \ 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 6fb3bdf40..fffcf2225 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/main.js +++ b/repo/js/AAA-Artifacts-Bulk-Supply/main.js @@ -39,6 +39,7 @@ let record = {}; let CDInfo = []; let failcount = 0; let autoSalvageCount = 0; +let furinaState = "unknown"; (async function () { setGameMetrics(1920, 1080, 1); @@ -787,6 +788,7 @@ async function writeCDInfo(accountName) { //运行普通路线 async function runNormalPath(doStop) { + furinaState = "unknown"; //关闭拾取 dispatcher.ClearAllTriggers(); if (state.cancel) return; @@ -796,21 +798,16 @@ async function runNormalPath(doStop) { const normalExecutePath = normalPath + "/执行"; if (combatPartyName) { log.info("填写了清怪队伍,执行清怪路线"); - await runPaths(normalCombatPath, combatPartyName, doStop); - } - if (settings.furina) { - await pathingScript.runFile('assets/furina/强制白芙.json'); + await runPaths(normalCombatPath, combatPartyName, doStop, "black"); } // 启用自动拾取的实时任务 dispatcher.addTimer(new RealtimeTimer("AutoPick")); - await runPaths(normalExecutePath, artifactPartyName, doStop); - //切回黑芙 - if (settings.furina) { - await pathingScript.runFile('assets/furina/强制黑芙.json'); - } + await runPaths(normalExecutePath, artifactPartyName, doStop, "white"); + } async function runActivatePath() { + //furinaState = "unknown"; //关闭拾取 dispatcher.ClearAllTriggers(); if (state.cancel) return; @@ -853,8 +850,8 @@ async function runActivatePath() { if (combatPartyName) { log.info("填写了清怪队伍,执行清怪路线"); - await runPaths(extraCombatPath, combatPartyName, false); - await runPaths(endingCombatPath, combatPartyName, false); + await runPaths(extraCombatPath, combatPartyName, false, "black"); + await runPaths(endingCombatPath, combatPartyName, false, "black"); } await runPaths(endingPreparePath, "", false); @@ -862,9 +859,7 @@ async function runActivatePath() { } async function runEndingAndExtraPath() { - if (settings.furina) { - await pathingScript.runFile('assets/furina/强制白芙.json'); - } + furinaState = "unknown"; // 启用自动拾取的实时任务 dispatcher.addTimer(new RealtimeTimer("AutoPick")); if (state.cancel) return; @@ -880,24 +875,15 @@ async function runEndingAndExtraPath() { ? "assets/ArtifactsPath/额外/所有额外" : "assets/ArtifactsPath/额外/仅12h额外"; endingPath = endingPath + "/执行"; - await runPaths(endingPath, artifactPartyName, false); + await runPaths(endingPath, artifactPartyName, false, "white"); extraPath = extraPath + "/执行"; - await runPaths(extraPath, artifactPartyName, false); + await runPaths(extraPath, artifactPartyName, false, "white"); } -async function runPaths(folderFilePath, PartyName, doStop) { - if (settings.autoSalvage && autoSalvageCount >= 4) { - autoSalvageCount = 0; - if (settings.decomposeMode === "分解(经验瓶)") { - artifactExperienceDiff += await processArtifacts(1); - } else { - await processArtifacts(1); - } - } else { - autoSalvageCount++; - } +async function runPaths(folderFilePath, PartyName, doStop, furinaRequirement = "") { if (state.cancel) return; let Paths = await readFolder(folderFilePath, true); + let furinaChecked = false; for (let i = 0; i < Paths.length; i++) { let skiprecord = false; if (state.cancel) return; @@ -917,11 +903,35 @@ async function runPaths(folderFilePath, PartyName, doStop) { log.info(`路线${Path.fullPath}今日已运行,跳过`); continue; } - if (PartyName != state.currentParty && PartyName) { //如果与当前队伍不同,尝试切换队伍,并更新队伍 await switchPartyIfNeeded(PartyName); state.currentParty = PartyName; + furinaState = "unknown"; + } + if (settings.furina && !furinaChecked) { + furinaChecked = true; + if (furinaRequirement === "white") { + log.info("勾选了芙宁娜选项,正在强制切换芙宁娜状态为白芙"); + log.warn("非必要请尽量不要勾选该选项"); + await pathingScript.runFile('assets/furina/强制白芙.json'); + furinaState = "white"; + } else if (furinaRequirement === "black") { + log.info("勾选了芙宁娜选项,正在强制切换芙宁娜状态为黑芙"); + log.warn("非必要请尽量不要勾选该选项"); + await pathingScript.runFile('assets/furina/强制黑芙.json'); + furinaState = "black"; + } + } + if (settings.autoSalvage && autoSalvageCount >= 4) { + autoSalvageCount = 0; + if (settings.decomposeMode === "分解(经验瓶)") { + artifactExperienceDiff += await processArtifacts(1); + } else { + await processArtifacts(1); + } + } else { + autoSalvageCount++; } await fakeLog(Path.fileName, false, true, 0); try { diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json index 850061a5e..7df156463 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.0.5", + "version": "1.0.6", "tags": [ "狗粮" ],