From 94e121a9741cad75f825c1b8a2f112c9fc563828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B7=E4=B8=AA=E5=90=8D=E5=AD=97=E5=A5=BD=E9=9A=BE?= =?UTF-8?q?=E7=9A=84=E5=96=B5?= <25520958+MisakaAldrich@users.noreply.github.com> Date: Sat, 17 May 2025 12:18:17 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E5=85=BD=E8=82=89=E5=A5=BD=E6=84=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20(#854)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main.js | 28 +++++++++---------- .../manifest.json | 6 +++- .../settings.json | 1 + 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js index d66c1610..d3e5735b 100644 --- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js @@ -113,18 +113,18 @@ })); //原版逻辑 await AutoPath(`好感-张牙舞爪的恶党-循环${getMeatMode ? '(二净甸刷肉版)' : '(二净甸)'}`); - //多种拾取模式 - if (getMeatMode == "通用拾取") { - await AutoPath(`好感-张牙舞爪的恶党-循环(二净甸刷肉版)`); - } - else if (getMeatMode == "万叶拾取") { - await AutoPath(`万叶版前往`); - await keyMouseScript.runFile(`assets/万叶拾取.json`); - await AutoPath(`万叶版返回`); - } - else { - await AutoPath(`好感-张牙舞爪的恶党-循环(二净甸)`); - } + //多种拾取模式 + if (getMeatMode == "算了我不捡了") { + await AutoPath(`好感-张牙舞爪的恶党-循环(二净甸)`); + } else if (getMeatMode == "通用拾取") { + await AutoPath(`好感-张牙舞爪的恶党-循环(二净甸刷肉版)`); + } else if (getMeatMode == "万叶拾取") { + await AutoPath(`万叶版前往`); + await keyMouseScript.runFile(`assets/万叶拾取.json`); + await AutoPath(`万叶版返回`); + } else { + await AutoPath(`好感-张牙舞爪的恶党-循环(二净甸)`); + } // 关闭急速拾取 dispatcher.addTimer(new RealtimeTimer("AutoPick", { @@ -208,7 +208,7 @@ if (!!settings.partyName) { try { log.info("正在尝试切换至" + settings.partyName); - if(!await genshin.switchParty(settings.partyName)){ + if (!await genshin.switchParty(settings.partyName)) { log.info("切换队伍失败,前往七天神像重试"); await genshin.tpToStatueOfTheSeven(); await genshin.switchParty(settings.partyName); @@ -225,4 +225,4 @@ const startTime = Date.now(); await AutoFriendship(runTimes, statueTimes, getMeatMode, delayTime, startTime, ocrTimeout); -})(); +})(); \ No newline at end of file diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json index bf348cb9..e70dd83e 100644 --- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "兽肉好感:自动好感度&刷两只鳄鱼兽肉&卡时间", - "version": "1.3.7", + "version": "1.4.0", "bgi_version": "0.44.6", "tags": ["好感", "兽肉", "突发事件"], "description": "通过突发事件:张牙舞爪的恶党刷兽肉,并顺带获取好感度(好感度超过10次后不再获取),请使用满员好感度队伍,并为全体队伍角色配置相应的战斗策略", @@ -9,6 +9,10 @@ { "name": "起个名字好难的喵", "links":"https://github.com/MisakaAldrich" + }, + { + "name": "柒叶子", + "links":"https://github.com/5117600049" } ], "settings_ui": "settings.json", diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/settings.json b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/settings.json index 228ef4f2..37b259fd 100644 --- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/settings.json +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/settings.json @@ -9,6 +9,7 @@ "type": "select", "label": "开启刷兽肉模式【勾选才拾取兽肉】", "options": [ + "算了我不捡了", "通用拾取", "万叶拾取" ]