修改

Scripts/gandart/gandartComposite.js

@@ -36,6 +36,7 @@ const GandartConstKey = {
     CompositeTaskName: 'lkGandartCompositeTaskName',
     CompositeCountArray: 'lkGandartCompositeCountArray',
     CompositeTaskMateList: 'lkGandartCompositeTaskMateList',
+    CompositeTaskFinalList: 'lkGandartCompositeTaskFinalList',
     CompositeTaskListStatus: 'lkGandartCompositeTaskListStatus',
     CompositeTaskListCache: 'lkIsCompositeTaskListCache',
     CompositeMaterialCache: 'lkIsCompositeMaterialCache',
@@ -189,7 +190,7 @@ function getWillCompositeTaskId() {
 
 async function tryToExecCompositeTask(taskId, taskInfo = {}) {
     if (getCompositeTaskMode() == 1) {
-        let jsonStr = lk.getVal(GandartConstKey.CompositeTaskMateList);
+        let jsonStr = lk.getVal(GandartConstKey.CompositeTaskFinalList);
         if (!lk.isEmpty(jsonStr)) {
             let data = JSON.parse(jsonStr);
             let taskInfo = data.taskInfo;
@@ -219,14 +220,11 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
         let materialGroups = ret[0];
         // 获取用户材料拥有详情
         let materialDict = ret[1];
-        lk.log("test##########0");
-        lk.log(JSON.stringify(materialGroups));
-        lk.log(JSON.stringify(materialDict));
+        lk.log(`排列组合组数：${materialGroups.length}`);
         for (let k in materialDict) {
             let mInfo = materialDict[k];
             gMaterialDetails[k] = await getDetailByCasting(mInfo.castingId, mInfo.collectionName);
         }
-        lk.log("test##########1");
         // 找出可行的合成搭配
         let validCompositeGroups = findValidGroupMaterialGroups(materialGroups, gMaterialDetails);
         lk.setVal(GandartConstKey.CompositeTaskMateList, JSON.stringify(validCompositeGroups, null, 2));
@@ -261,13 +259,13 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
                 for (let i = 0; i < retOrderLst.length; i++) {
                     let ret = await checkCompositeResult(retOrderLst[i]);
                 }
-                lk.setVal(GandartConstKey.CompositeTaskMateList, '{}');
+                lk.setVal(GandartConstKey.CompositeTaskFinalList, '{}');
             } else {
                 let finalCacheData = {
                     taskName: `${taskInfo.compositeLabel}#${taskInfo.compositeTaskName}`,
                     finalGroups: finalGroups,
                 };
-                lk.setVal(GandartConstKey.CompositeTaskMateList, JSON.stringify(finalCacheData, null, 2));
+                lk.setVal(GandartConstKey.CompositeTaskFinalList, JSON.stringify(finalCacheData, null, 2));
             }
         } else {
             lk.execFail();
@@ -424,6 +422,20 @@ function getCompositeTaskListByCache(status, pageSize = 10, page = 1) {
 }
 
 function cacheCompositeTaskList(status, taskLst) {
+    // 精简一下内容
+    let simpleLst = [];
+    for (let i = 0; i < taskLst.length; i++) {
+        let info = taskLst[i];
+        let item = {
+            id: info.id,
+            compositeLabel: info.compositeLabel,
+            compositeTaskName: info.compositeTaskName,
+            surplus: info.surplus,
+            startTime: info.startTime,
+            endTime: info.endTime,
+        };
+        simpleLst.push(item);
+    }
     let jsonStr = JSON.stringify(taskLst, null, 2);
     if (status == 0) {
         lk.setVal(GandartConstKey.CompositeTaskList0, jsonStr);
@@ -603,7 +615,8 @@ async function confirmCompositeV2(taskId, taskInfo, materialDetailList) {
                 headers: headers,
                 body: body
             };
-            lk.log(`请求合成任务[${taskId}]：${body}`);
+            let taskName = taskInfo.compositeTaskName || ''; //合成标题
+            lk.log(`请求合成任务[${taskName}#${taskId}]：${body}`);
             lk.post(url, async (error, _response, data) => {
                 let retOrder;
                 try {