修改

Scripts/gandart/gandartComposite.js

@@ -228,6 +228,24 @@ function isExecFinalComposite() {
     return false;
 }
 
+function checkIsCompositeTaskExec(taskInfo) {
+    if (taskInfo) {
+        if (taskInfo.endTime && taskInfo.startTime) {
+            let nowDate = new Date();
+            let endDate = new Date(taskInfo.endTime);
+            if (nowDate.getTime() >= endDate.getTime()) {
+                return true;
+            }
+            let startDate = new Date(taskInfo.startTime);
+            if (nowDate.getTime() > startDate.getTime() - 1000) {
+                return true;
+            }
+            return false;
+        }
+    }
+    return true;
+}
+
 function getWillCompositeTaskId() {
     let val = lk.getVal(GandartConstKey.CompositeTaskId);
     if (lk.isEmpty(val)) {
@@ -323,8 +341,10 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
             lk.log(`最终选择可执行合成数：${finalGroups.length}`);
             let tmpJsonStr = JSON.stringify(finalGroups, null, 2);
             lk.log(`详情如下：\n${tmpJsonStr}`);
-            if (isExecFinalComposite()) {
+            if (isExecFinalComposite() && checkIsCompositeTaskExec(taskInfo)) {
                 await doExecFinalComposite(taskInfo.id, taskInfo, finalGroups);
+            } else {
+                lk.log('暂未进行最后一步合成');
             }
         }
         return;
@@ -358,7 +378,7 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
             lk.log(`最终选择可执行合成数：${finalGroups.length}`);
             let tmpJsonStr = JSON.stringify(finalGroups, null, 2);
             lk.log(`详情如下：\n${tmpJsonStr}`);
-            if (isExecFinalComposite()) {
+            if (isExecFinalComposite() && checkIsCompositeTaskExec(taskInfo)) {
                 if (finalGroups.length == 0) {
                     lk.log('暂无可行的合成组合，请检查');
                     // lk.appendNotifyInfo('⚠️暂无可行的合成组合');
@@ -366,6 +386,7 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
                 }
                 await doExecFinalComposite(taskId, taskInfo, finalGroups);
             } else {
+                lk.log('暂未进行最后一步合成');
                 setCompositeTaskFinalList(taskInfo, finalGroups);
             }
         } else {
@@ -852,7 +873,7 @@ async function getDetailByCasting(castingId, collectionName, pageSize = 50, page
                         if (ret.success) {
                             let obj = ret.obj;
                             retItemLst = obj.list;
-                            lk.log(`获取个人产品拥有详情成功，响应：${data}`);
+                            lk.log(`获取个人产品拥有详情成功`);
                         } else {
                             lk.log(`获取个人产品拥有详情失败，响应：${data}`);
                         }
@@ -959,13 +980,19 @@ async function checkCompositeResult(orderNum) {
                         let ret = JSON.parse(data);
                         if (ret.success) {
                             lk.log(`获取合成结果成功，响应：${data}`);
-                            retItemLst = ret.obj;
-                            let cName = '';
-                            for (let i = 0; i < retItemLst.length; i++) {
-                                cName += retItemLst[i].collectionName + ",";
+                            if (typeof ret.obj == 'object') {
+                                retItemLst = ret.obj;
+                                let cName = '';
+                                for (let i = 0; i < retItemLst.length; i++) {
+                                    cName += retItemLst[i].collectionName + ",";
+                                }
+                                cName = cName.substring(0, cName.length - 1);
+                                lk.appendNotifyInfo(`🎉合成产品：${cName}`);
+                            } else {
+                                if (ret.msg && ret.msg.length > 0) {
+                                    lk.appendNotifyInfo(`🎉${ret.msg}`);
+                                }
                             }
-                            cName = cName.substring(0, cName.length - 1);
-                            lk.appendNotifyInfo(`🎉合成产品：${cName}`);
                         } else {
                             lk.log(`获取合成结果失败，响应：${data}`);
                         }