修改

Scripts/gandart/gandartComposite.js

@@ -195,9 +195,7 @@ function getWillCompositeTaskId() {
     return val;
 }
 
-function printMaterialGroupsInfo(materialGroups, titleName) {
-    titleName = titleName || '排列组合组数';
-    lk.log(`${titleName}：${materialGroups.length}`);
+function printMaterialGroupsInfo(materialGroups) {
     let detailStr = '组合详情如下：\n';
     for (let i = 0; i < materialGroups.length; i++) {
         let group = materialGroups[i];
@@ -212,6 +210,7 @@ function printMaterialGroupsInfo(materialGroups, titleName) {
 
 async function tryToExecCompositeTask(taskId, taskInfo = {}) {
     if (getCompositeTaskMode() == 1) {
+        lk.log('开始执行预设合成任务');
         let jsonStr = lk.getVal(GandartConstKey.CompositeTaskFinalList);
         if (!lk.isEmpty(jsonStr)) {
             let data = JSON.parse(jsonStr);
@@ -241,7 +240,8 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
         let ret = calcCompositeGroups(materialSelLst);
         // 材料排列组合
         let materialGroups = ret[0];
-        printMaterialGroupsInfo(materialGroups);
+        lk.log(`排列组合组数：${materialGroups.length}`);
+        // printMaterialGroupsInfo(materialGroups);
         // 获取用户材料拥有详情
         let materialDict = ret[1];
         for (let k in materialDict) {
@@ -251,6 +251,8 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
         // 找出可行的合成搭配
         let validCompositeGroups = findValidGroupMaterialGroups(materialGroups, gMaterialDetails);
         lk.setVal(GandartConstKey.CompositeTaskMateList, JSON.stringify(validCompositeGroups, null, 2));
+
+        lk.log(`预估可行组合数：${validCompositeGroups.length}`);
         printMaterialGroupsInfo(validCompositeGroups, '预估可行组合数');
 
         if (isGenFinalLisstEnable()) {
@@ -279,20 +281,24 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
                         retOrderLst.push(retOrderLst);
                     }
                 }
-                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`);
                 }
-                lk.setVal(GandartConstKey.CompositeTaskFinalList, '{}');
             } else {
-                let simpleTaskInfo = {
+                let simpleInfo = {
                     id: taskInfo.id,
                     compositeLabel: taskInfo.compositeLabel,
                     compositeTaskName: taskInfo.compositeTaskName,
-                    surplus: info.surplus,
+                    surplus: taskInfo.surplus,
                 }
                 let finalCacheData = {
-                    taskInfo: simpleTaskInfo,
+                    taskInfo: simpleInfo,
                     finalGroups: finalGroups,
                 };
                 lk.setVal(GandartConstKey.CompositeTaskFinalList, JSON.stringify(finalCacheData, null, 2));