shawenguan 2 лет назад
Родитель
Сommit
3d11d50f7f
1 измененных файлов с 15 добавлено и 12 удалено
  1. 15 12
      Scripts/gandart/gandartComposite.js

+ 15 - 12
Scripts/gandart/gandartComposite.js

@@ -221,20 +221,23 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
                 lk.appendNotifyInfo('⚠️暂无可行的合成组合');
                 return;
             }
-            let retOrderLst = [];
-            for (let i = 0; i < finalGroups.length; i++) {
-                let ret = await confirmCompositeV2(taskInfo.id, taskInfo, finalGroups[i]);
-                if (ret) {
-                    retOrderLst.push(retOrderLst);
+            if (isExecFinalComposite()) {
+                let retOrderLst = [];
+                for (let i = 0; i < finalGroups.length; i++) {
+                    let ret = await confirmCompositeV2(taskInfo.id, taskInfo, finalGroups[i]);
+                    if (ret) {
+                        retOrderLst.push(retOrderLst);
+                    }
                 }
-            }
-            if (retOrderLst.length > 0) {
-                lk.log(`合成成功${retOrderLst.length},订单为${retOrderLst.join(",")}`);
-                for (let i = 0; i < retOrderLst.length; i++) {
-                    let ret = await checkCompositeResult(retOrderLst[i]);
+                if (retOrderLst.length > 0) {
+                    lk.log(`合成成功${retOrderLst.length},订单为${retOrderLst.join(",")}`);
+                    for (let i = 0; i < retOrderLst.length; i++) {
+                        let ret = await checkCompositeResult(retOrderLst[i]);
+                    }
+                    lk.setVal(GandartConstKey.CompositeTaskFinalList, '{}');
+                } else {
+                    lk.log('合成成功0');
                 }
-            } else {
-                lk.log('合成成功0');
             }
         }
         return;