From 3de704ba567bde61f459566ebe1e025206b5535f Mon Sep 17 00:00:00 2001
From: mno <718135749@qq.com>
Date: Wed, 3 Sep 2025 20:18:52 +0800
Subject: [PATCH] =?UTF-8?q?js=EF=BC=9A=E4=B8=A4=E4=B8=AA=E7=8B=97=E7=B2=AE?=
 =?UTF-8?q?js=E6=9B=B4=E6=96=B0=20(#1805)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* js：狗粮联机团购

* js：AAA狗粮批发1.2.6
---
 repo/js/AAA-Artifacts-Bulk-Supply/README.md     | 2 ++
 repo/js/AAA-Artifacts-Bulk-Supply/main.js       | 6 +++---
 repo/js/AAA-Artifacts-Bulk-Supply/manifest.json | 2 +-
 repo/js/ArtifactsGroupPurchasing/main.js        | 2 +-
 repo/js/ArtifactsGroupPurchasing/manifest.json  | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/README.md b/repo/js/AAA-Artifacts-Bulk-Supply/README.md
index f3b9251e7..6b60b2dc1 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.2.6（2025.09.03）
+1.调整清怪和准备的位置
 ### 1.2.5（2025.09.02）
 1.修几条路线428,642,度假村激活
 ### 1.2.3（2025.09.01）
diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/main.js b/repo/js/AAA-Artifacts-Bulk-Supply/main.js
index 511771781..21f30c255 100644
--- a/repo/js/AAA-Artifacts-Bulk-Supply/main.js
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/main.js
@@ -920,14 +920,14 @@ async function runActivatePath() {
     }
     await runPaths(extraActivatePath, "", false);
 
+    await runPaths(endingPreparePath, "", false);
+    await runPaths(extraPreparePath, "", false);
+
     if (combatPartyName) {
         log.info("填写了清怪队伍，执行清怪路线");
         await runPaths(extraCombatPath, combatPartyName, false, "black");
         await runPaths(endingCombatPath, combatPartyName, false, "black");
     }
-
-    await runPaths(endingPreparePath, "", false);
-    await runPaths(extraPreparePath, "", false);
 }
 
 async function runEndingAndExtraPath() {
diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json
index 0aaa98ecd..41e014118 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.2.5",
+  "version": "1.2.6",
   "tags": [
     "狗粮"
   ],
diff --git a/repo/js/ArtifactsGroupPurchasing/main.js b/repo/js/ArtifactsGroupPurchasing/main.js
index cc5367b4d..19d9e4173 100644
--- a/repo/js/ArtifactsGroupPurchasing/main.js
+++ b/repo/js/ArtifactsGroupPurchasing/main.js
@@ -81,7 +81,6 @@
         }
         //如果勾选了额外，在结束后再执行一次额外路线
         if (settings.runExtra) {
-            await switchPartyIfNeeded(settings.partyName)
             await runGroupPurchasing();
         }
     }
@@ -137,6 +136,7 @@ async function runGroupPurchasing() {
 
     // ===== 4. 主流程 =====
     setGameMetrics(1920, 1080, 1);
+    await genshin.clearPartyCache();
     let groupNumBer = await getPlayerSign();
     if (groupNumBer !== 0) log.info(`在队伍中编号为${groupNumBer}`);
     else log.info(`不处于联机模式或识别异常`);
diff --git a/repo/js/ArtifactsGroupPurchasing/manifest.json b/repo/js/ArtifactsGroupPurchasing/manifest.json
index 8f6ee3ee9..0c8fb292b 100644
--- a/repo/js/ArtifactsGroupPurchasing/manifest.json
+++ b/repo/js/ArtifactsGroupPurchasing/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "AAA狗粮联机团购",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "tags": [
     "狗粮"
   ],