diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制白芙.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制白芙.json new file mode 100644 index 00000000..308711cc --- /dev/null +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制白芙.json @@ -0,0 +1,58 @@ +{ + "info": { + "name": "强制白芙", + "type": "collect", + "authors": [ + { + "name": "汐", + "links": "" + } + ], + "version": "1.0", + "description": "", + "map_name": "Teyvat", + "bgi_version": "0.45.0", + "tags": [], + "last_modified_time": 1754828996713, + "enable_monster_loot_split": false, + "map_match_method": "" + }, + "positions": [ + { + "id": 1, + "action": "", + "move_mode": "walk", + "type": "teleport", + "x": -762.078125, + "y": -3798.2978515625, + "action_params": "" + }, + { + "id": 2, + "x": -777.662109375, + "y": -3821.849609375, + "type": "path", + "move_mode": "fly", + "action": "combat_script", + "action_params": "attack(0.5),wait(6)" + }, + { + "id": 3, + "x": 268.5908203125, + "y": -665.69580078125, + "type": "teleport", + "move_mode": "walk", + "action": "", + "action_params": "" + }, + { + "id": 4, + "x": 263.3046875, + "y": -662.833984375, + "type": "path", + "move_mode": "walk", + "action": "combat_script", + "action_params": "keypress(f);芙宁娜 attack(0.08),charge;" + } + ] +} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制黑芙.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制黑芙.json new file mode 100644 index 00000000..599daae2 --- /dev/null +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/furina/强制黑芙.json @@ -0,0 +1,30 @@ +{ + "info": { + "name": "强制黑芙", + "type": "collect", + "authors": [ + { + "name": "汐", + "links": "" + } + ], + "version": "1.0", + "description": "", + "map_name": "Enkanomiya", + "bgi_version": "0.45.0", + "tags": [], + "last_modified_time": 1753190175272, + "enable_monster_loot_split": false + }, + "positions": [ + { + "id": 1, + "action": "", + "move_mode": "walk", + "type": "teleport", + "x": 97.65771484375, + "y": 255.2640380859375, + "action_params": "" + } + ] +} \ 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 30825920..217635ff 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/main.js +++ b/repo/js/AAA-Artifacts-Bulk-Supply/main.js @@ -43,13 +43,7 @@ let failcount = 0; } } } - { - //校验自定义配置,从未打开过自定义配置时进行警告 - for (let i = 0; i < 5; i++) { - log.warn("测试版本，可能存在各种bug，出现问题请联系作者，详见readme"); - await sleep(1000); - } - } + //预处理 await readRecord(accountName);//读取记录文件 const epochTime = new Date('1970-01-01T20:00:00.000Z'); @@ -174,7 +168,7 @@ async function readRecord(accountName) { log.warn(`无记录文件，将使用默认数据`); return; } - + const content = await file.readText(recordFilePath); const lines = content.split("\n"); @@ -291,7 +285,7 @@ async function writeRecord(accountName) { async function processArtifacts(times = 1) { await genshin.returnMainUi(); - await sleep(100); + await sleep(500); let result = 0; try { if (settings.decomposeMode === "销毁（摩拉）") { @@ -752,7 +746,6 @@ async function runNormalPath(doStop) { log.info("填写了清怪队伍，执行清怪路线"); await runPaths(normalCombatPath, combatPartyName, doStop); } - // 启用自动拾取的实时任务 dispatcher.addTimer(new RealtimeTimer("AutoPick")); await runPaths(normalExecutePath, artifactPartyName, doStop); @@ -794,8 +787,9 @@ async function runActivatePath() { const extraActivatePath = extraPath + "/激活"; const extraCombatPath = extraPath + "/清怪"; const extraPreparePath = extraPath + "/准备"; - - await runPaths(endingActivatePath, artifactPartyName, false); + if (!forceAlternate && state.runningEndingAndExtraRoute === "收尾额外A") { + await runPaths(endingActivatePath, artifactPartyName, false); + } await runPaths(extraActivatePath, combatPartyName, false); if (combatPartyName) { @@ -804,8 +798,6 @@ async function runActivatePath() { await runPaths(endingCombatPath, combatPartyName, false); } - // 启用自动拾取的实时任务 - dispatcher.addTimer(new RealtimeTimer("AutoPick")); await runPaths(endingPreparePath, artifactPartyName, false); await runPaths(extraPreparePath, combatPartyName, false); } @@ -858,6 +850,13 @@ async function runPaths(folderFilePath, PartyName, doStop) { //如果与当前队伍不同，尝试切换队伍，并更新队伍 await switchPartyIfNeeded(PartyName); state.currentParty = PartyName; + if (settings.furina) { + if (state.currentParty === artifactPartyName) { + await pathingScript.runFile('assets/furina/强制白芙.json'); + } else { + await pathingScript.runFile('assets/furina/强制黑芙.json'); + } + } } 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 db77c105..1fda7e92 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": "0.0.3", + "version": "0.0.4", "tags": [ "狗粮" ], diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/settings.json b/repo/js/AAA-Artifacts-Bulk-Supply/settings.json index fb09d629..1268dc21 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/settings.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/settings.json @@ -13,13 +13,13 @@ { "name": "minIntervalTime", "type": "input-text", - "label": "####################################################################\n卡时间与收尾配置\n\n最短间隔时间（分钟）\n默认值为1分钟，过短可能导致丢失收尾和额外收益", + "label": "####################################################################\n卡时间与收尾配置\n\n最短间隔时间（分钟）\n默认为1分钟，过短可能导致丢失收尾和额外收益", "default": "1" }, { "name": "maxWaitingTime", "type": "input-text", - "label": "最大额外等待时间（分钟）\n默认值为0分钟\n普通路线结束后额外尝试等待以卡时间执行更多次主要收尾路线", + "label": "最大额外等待时间（分钟）\n默认值为0分钟\n普通路线结束后额外尝试等待\n以卡时间执行更多次优先收尾路线", "default": "0" }, { @@ -63,5 +63,10 @@ "type": "input-text", "label": "账户名称\n用于多账户运行时区分不同账户\n单账户无需修改", "default": "默认账户" + }, + { + "name": "furina", + "type": "checkbox", + "label": "如果你的【狗粮队伍】中有芙宁娜，请勾选" } ] \ No newline at end of file