From a932672055391a25fcaa22e25e7209b2f4500506 Mon Sep 17 00:00:00 2001
From: mno <718135749@qq.com>
Date: Thu, 21 Aug 2025 01:21:03 +0800
Subject: [PATCH] =?UTF-8?q?js=EF=BC=9AAAA=E7=8B=97=E7=B2=AE=E6=89=B9?=
 =?UTF-8?q?=E5=8F=911.0.4=20(#1657)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repo/js/AAA-Artifacts-Bulk-Supply/README.md     |  2 ++
 repo/js/AAA-Artifacts-Bulk-Supply/main.js       | 17 ++++++++++-------
 repo/js/AAA-Artifacts-Bulk-Supply/manifest.json |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/README.md b/repo/js/AAA-Artifacts-Bulk-Supply/README.md
index d77910705..db454810d 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.0.4（2025.08.20）
+1.修改黑白芙切换逻辑
 ### 1.0.3（2025.08.20）
 1.优化度假村路线
 ### 1.0.2（2025.08.20）
diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/main.js b/repo/js/AAA-Artifacts-Bulk-Supply/main.js
index 31184573e..d06890a22 100644
--- a/repo/js/AAA-Artifacts-Bulk-Supply/main.js
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/main.js
@@ -766,9 +766,16 @@ async function runNormalPath(doStop) {
         log.info("填写了清怪队伍，执行清怪路线");
         await runPaths(normalCombatPath, combatPartyName, doStop);
     }
+    if (settings.furina) {
+        await pathingScript.runFile('assets/furina/强制白芙.json');
+    }
     // 启用自动拾取的实时任务
     dispatcher.addTimer(new RealtimeTimer("AutoPick"));
     await runPaths(normalExecutePath, artifactPartyName, doStop);
+    //切回黑芙
+    if (settings.furina) {
+        await pathingScript.runFile('assets/furina/强制黑芙.json');
+    }
 }
 
 async function runActivatePath() {
@@ -823,6 +830,9 @@ async function runActivatePath() {
 }
 
 async function runEndingAndExtraPath() {
+    if (settings.furina) {
+        await pathingScript.runFile('assets/furina/强制白芙.json');
+    }
     // 启用自动拾取的实时任务
     dispatcher.addTimer(new RealtimeTimer("AutoPick"));
     if (state.cancel) return;
@@ -880,13 +890,6 @@ 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 5b02cd61e..7e856ec36 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.3",
+  "version": "1.0.4",
   "tags": [
     "狗粮"
   ],