js：狗粮团购和采集cd管理 (#2498)

* js：联机狗粮团购

增加强迫症模式，队友不齐或未到位时不执行路线

* js：采集cd管理2.6.1

优化换队逻辑

repo/js/ArtifactsGroupPurchasing/main.js

@@ -20,6 +20,7 @@ let gameRegion;
 let TMthreshold = +settings.TMthreshold || 0.9;
 let doRunExtra = false;
 let expGain;
+let skipRunning = false;
 
 (async function () {
     setGameMetrics(1920, 1080, 1);
@@ -329,6 +330,9 @@ async function runGroupPurchasing(runExtra) {
         }
 
         log.warn("等待队友就绪超时");
+        if (settings.onlyRunPerfectly === "确认启用强迫症模式") {
+            skipRunning = true;
+        }
         return false;
     }
 
@@ -512,6 +516,12 @@ async function runGroupPurchasing(runExtra) {
             log.warn(`文件夹 ${folderPath} 下未找到任何 JSON 路线文件`);
             return;
         }
+        if (skipRunning) {
+            log.info(`强迫症模式启用中，队友不齐或未及时到位，跳过所有路线`);
+            notification.send(`强迫症模式启用中，队友不齐或未及时到位，跳过所有路线`);
+            await sleep(10000);
+            return;
+        }
         if (!settings.runDebug) {
             for (const { fullPath } of files) {
                 await runPath(fullPath, 1);
@@ -536,6 +546,13 @@ async function runGroupPurchasing(runExtra) {
             return;
         }
 
+        if (skipRunning) {
+            log.info(`强迫症模式启用中，队友不齐或未及时到位，跳过所有路线`);
+            notification.send(`强迫症模式启用中，队友不齐或未及时到位，跳过所有路线`);
+            await sleep(10000);
+            return;
+        }
+
         if (!settings.runDebug) {
             for (const { fullPath } of files) {
                 await runPath(fullPath, 1);
@@ -744,6 +761,9 @@ async function autoEnter(autoEnterSettings) {
     if (new Date() - start >= timeout * 60 * 1000) {
         log.warn("超时未达到预定人数");
         notification.error(`超时未达到预定人数`);
+        if (settings.onlyRunPerfectly === "确认启用强迫症模式") {
+            skipRunning = true;
+        }
     }
 
     async function confirmSearchResult() {

repo/js/ArtifactsGroupPurchasing/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "AAA狗粮联机团购",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "tags": [
     "狗粮"
   ],

repo/js/ArtifactsGroupPurchasing/settings.json

@@ -14,6 +14,11 @@
     "type": "input-text",
     "label": "填写后将在js运行结束后分解狗粮\n并输出分解获得的经验值\n格式为 名字：联机狗粮分解获得经验xxx"
   },
+  {
+    "name": "onlyRunPerfectly",
+    "type": "input-text",
+    "label": "输入:\n确认启用强迫症模式\n以启用\n人不齐或队友未正常到位时不执行任何路线"
+  },
   {
     "name": "groupMode",
     "type": "select",

repo/js/采集cd管理/main.js

@@ -15,6 +15,7 @@ const mainUITemplate = file.ReadImageMatSync("assets/MainUI.png");
 const itemFullTemplate = file.ReadImageMatSync("assets/itemFull.png");
 const fIcontemplate = file.ReadImageMatSync("assets/F_Dialogue.png");
 const accountName = settings.infoFileName || "默认账户";
+let currentParty = '';
 
 // 定义目标文件夹路径和记录文件路径
 const recordFolder = "record"; // 存储记录文件的文件夹路径
@@ -613,10 +614,6 @@ let underWater = false;
                 "烬芯花": "1次0点刷新"
             };
 
-
-
-            let changedParty = false;
-
             /* ---------- 3. 主循环 ---------- */
             while (priorityList.length > 0) {
 
@@ -720,10 +717,26 @@ let underWater = false;
                 const targetObj = cdMap.get(fullName);
                 const startTime = new Date();
 
-                if (!changedParty && settings.priorityItemsPartyName) {
-                    await switchPartyIfNeeded(settings.priorityItemsPartyName);
-                    changedParty = true;
+                /* ---------- 智能选队：按路线所在文件夹反查路径组 ---------- */
+                {
+                    const fullPath = bestRoute.fullPath;                            // 例：pathing/须弥/xxx.json
+                    const folderName = fullPath.split(/\\|\//).slice(-2, -1)[0];    // 倒数第二层文件夹名
+                    let targetParty = '';                                           // 最终要用的队伍名
+
+                    const groupCount = Math.min(99, Math.max(1, parseInt(settings.groupCount || '3')));
+                    for (let g = 1; g <= groupCount; g++) {                         // 遍历路径组
+                        if (settings[`pathGroup${g}FolderName`] === folderName) {   // 找到归属组
+                            targetParty = settings[`pathGroup${g}PartyName`] || '';
+                            break;                                                  // 命中即停
+                        }
+                    }
+                    if (!targetParty) targetParty = settings.priorityItemsPartyName || ''; // 回退
+                    if (targetParty) {
+                        await switchPartyIfNeeded(targetParty);
+                        log.info(`优先采集阶段选用配队：${targetParty}（文件夹：${folderName}）`);
+                    }
                 }
+
                 let timeNow = new Date();
                 if (Foods.length != 0 && (((timeNow - lastCookTime) > cookInterval) || firstCook)) {
                     firstCook = false;
@@ -886,7 +899,6 @@ let underWater = false;
 
                     try {
                         const filePaths = groupFiles.map(f => f.fullPath);
-                        let changedParty = false;
 
                         /* ================== 提前计算分均效率（所有模式通用） ================== */
                         // 0) 解析优先关键词
@@ -1041,10 +1053,8 @@ let underWater = false;
                                 lastsettimeTime = new Date();
                             }
 
-                            if (!changedParty) {
-                                await switchPartyIfNeeded(partyNames[groupNumber - 1]);
-                                changedParty = true;
-                            }
+                            await switchPartyIfNeeded(partyNames[groupNumber - 1]);
+
                             await fakeLog(fileName, false, true, 0);
 
                             /* ========== 历史拾取物前置排序 ========== */
@@ -1592,22 +1602,41 @@ async function readFolder(folderPath, onlyJson) {
     return files;
 }
 
-//切换队伍
+/**
+ * 带缓存的配队切换函数
+ * 如果目标配队与 currentParty 一致则跳过；否则真正切换并更新 currentParty。
+ * @param {string} partyName 期望切换到的配队名称
+ */
 async function switchPartyIfNeeded(partyName) {
-    if (!partyName) {
+    if (!partyName) {                       // 空名直接回主界面
         await genshin.returnMainUi();
         return;
     }
+
+    if (partyName === currentParty) {       // 缓存命中，跳过切换
+        await genshin.returnMainUi();
+        return;
+    }
+
+    /* 真正切换 */
     try {
-        log.info("正在尝试切换至" + partyName);
-        if (!await genshin.switchParty(partyName)) {
-            log.info("切换队伍失败，前往七天神像重试");
+        log.info(`正在尝试切换至配队「${partyName}」`);
+        let success = await genshin.switchParty(partyName);
+        if (!success) {                     // 第一次失败，去神像再试一次
+            log.info('切换失败，前往七天神像重试');
             await genshin.tpToStatueOfTheSeven();
-            await genshin.switchParty(partyName);
+            success = await genshin.switchParty(partyName);
         }
-    } catch {
-        log.error("队伍切换失败，可能处于联机模式或其他不可切换状态");
-        notification.error(`队伍切换失败，可能处于联机模式或其他不可切换状态`);
+
+        if (success) {                      // 切换成功，更新缓存
+            currentParty = partyName;
+            log.info(`已切换至配队「${partyName}」并更新缓存`);
+        } else {
+            throw new Error('两次切换均失败');
+        }
+    } catch (e) {
+        log.error('队伍切换失败，可能处于联机模式或其他不可切换状态');
+        notification.error('队伍切换失败，可能处于联机模式或其他不可切换状态');
         await genshin.returnMainUi();
     }
 }

repo/js/采集cd管理/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "采集cd管理",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "bgi_version": "0.44.8",
   "description": "仅面对会操作文件和读readme的用户，基于文件夹操作自动管理采集路线的cd，会按照路径组的顺序依次运行，直到指定的时间，并会按照给定的cd类型，自动跳过未刷新的路线",
   "saved_files": [