修改

Scripts/gandart/gandartComposite.js

@@ -139,9 +139,10 @@ async function all() {
 async function checkToCompositeConformingTasks(taskLst) {
     let taskIds = getWillCompositeTaskIds();
     let isFoundOnce = false;
+    let found = false;
     for (let i = 0; i < taskIds.length; i++) {
         let taskId = taskIds[i];
-        let found = false;
+        found = false;
         if (taskId > 0) {
             for (let j = 0; j < taskLst.length; j++) {
                 let taskInfo = taskLst[j];
@@ -153,17 +154,26 @@ async function checkToCompositeConformingTasks(taskLst) {
                 }
             }
             if (!found) {
-                lk.log(`当前任务列表找不到指定任务[${taskId}]`);
+                lk.log(`[${i}]当前任务列表找不到指定任务[${taskId}]`);
                 found = await checkTrySearchToCompositeTask(taskLst, i);
             }
         } else {
-            lk.log('没有设置指定任务ID，检查是否需进行检索合成');
+            lk.log(`[${i}]没有设置指定任务ID，检查是否需进行检索合成`);
             found = await checkTrySearchToCompositeTask(taskLst, i);
         }
         if (found) {
             isFoundOnce = found;
         }
     }
+    found = false;
+    let keyNames = getWillCompositeTaskSearchKeys();
+    for (let i = taskIds.length; i < keyNames.length; i++) {
+        lk.log(`[${i}]没有设置指定任务ID，检查是否需进行检索合成`);
+        found = await checkTrySearchToCompositeTask(taskLst, i);
+        if (found) {
+            isFoundOnce = found;
+        }
+    }
     return isFoundOnce;
 }
 
@@ -517,7 +527,7 @@ async function doExecFinalComposite(taskId, taskInfo, finalGroups) {
         let usedGroups = [];
         for (let i = retWillDelLst.length - 1; i >= 0; i--) {
             let idx = retWillDelLst[i];
-            lk.log(`编号[${idx}]一组的材料合成合成销毁删除`);
+            lk.log(`编号[${idx}]一组的材料合成销毁删除`);
             usedGroups.push(finalGroups[idx]);
             finalGroups.splice(idx, 1);
         }

Scripts/gandart/gandartExchange.js

@@ -140,9 +140,10 @@ async function all() {
 async function checkToExchangeConformingTasks(taskLst) {
     let taskIds = getWillExchangeTaskIds();
     let isFoundOnce = false;
+    let found = false;
     for (let i = 0; i < taskIds.length; i++) {
         let taskId = taskIds[i];
-        let found = false;
+        found = false;
         if (taskId > 0) {
             for (let j = 0; j < taskLst.length; j++) {
                 let taskInfo = taskLst[j];
@@ -154,17 +155,27 @@ async function checkToExchangeConformingTasks(taskLst) {
                 }
             }
             if (!found) {
-                lk.log(`当前任务列表找不到指定任务[${taskId}]`);
-                await checkTrySearchToExchangeTask(taskLst, i);
+                lk.log(`[${i}]当前任务列表找不到指定任务[${taskId}]`);
+                found = await checkTrySearchToExchangeTask(taskLst, i);
             }
         } else {
-            lk.log('没有设置指定任务ID，检查是否需进行检索合成');
+            lk.log(`[${i}]没有设置指定任务ID，检查是否需进行检索合成`);
             await checkTrySearchToExchangeTask(taskLst, i);
         }
         if (found) {
             isFoundOnce = found;
         }
     }
+
+    found = false;
+    let keyNames = getWillExchangeTaskSearchKeys();
+    for (let i = taskIds.length; i < keyNames.length; i++) {
+        lk.log(`[${i}]没有设置指定任务ID，检查是否需进行检索合成`);
+        found = await checkTrySearchToExchangeTask(taskLst, i);
+        if (found) {
+            isFoundOnce = found;
+        }
+    }
     return isFoundOnce;
 }
 
@@ -332,7 +343,7 @@ async function checkGetMaterialDetails(gUsedMaterialDetails, materialDict) {
     } else {
         useCache = false;
     }
-    lk.log(`合成材料列表本地缓存:${useCache}`);
+    lk.log(`置换分解材料列表本地缓存:${useCache}`);
     let isReqServerData = false;
     if (useCache) {
         let jsonStr = lk.getVal(GandartConstKey.PrivCollectionDetail);
@@ -512,14 +523,14 @@ async function doExecFinalExchange(taskId, taskInfo, finalGroups) {
                 await checkCompositeResult(orderNum);
             }
         }
-        lk.log(`合成成功单数：${successCnt}`);
+        lk.log(`分解成功单数：${successCnt}`);
         lk.log(`库存不足单数：${noStockCnt}`);
 
         // 从高的序号删除
         let usedGroups = [];
         for (let i = retWillDelLst.length - 1; i >= 0; i--) {
             let idx = retWillDelLst[i];
-            lk.log(`编号[${idx}]一组的材料合成合成销毁删除`);
+            lk.log(`编号[${idx}]一组的材料分解销毁删除`);
             usedGroups.push(finalGroups[idx]);
             finalGroups.splice(idx, 1);
         }
@@ -529,7 +540,7 @@ async function doExecFinalExchange(taskId, taskInfo, finalGroups) {
         setExchangeTaskFinalList(taskInfo, finalGroups);
         refreshMaterialAfterComposite(usedGroups);
     } else {
-        lk.log('合成成功单数：0');
+        lk.log('置换分解成功单数：0');
     }
 }
 
@@ -820,7 +831,7 @@ async function getExchangeTaskListByServer(status, pageSize = 10, page = 1) {
             };
             let tagNames = [
                 '待开始',
-                '合成中',
+                '进行中',
                 '已结束',
             ];
             lk.log(`获取置换分解任务[${tagNames[status]}]列表：${body}`);
@@ -864,26 +875,26 @@ async function getCompositeMaterial(taskId, taskInfo) {
                 body: body
             };
             let taskName = taskInfo.compositeTaskName || ''; //合成标题
-            lk.log(`获取合成任务[${taskName}#${taskId}]材料详情：${body}`);
+            lk.log(`获取置换分解任务[${taskName}#${taskId}]材料详情：${body}`);
             lk.post(url, async (error, _response, data) => {
                 let retItemLst = [];
                 try {
                     if (error) {
-                        lk.log(`获取合成任务材料详情发生错误`);
+                        lk.log(`获取置换分解任务材料详情发生错误`);
                         lk.execFail();
-                        lk.appendNotifyInfo(`❌获取合成任务材料详情失败，请稍后再试`);
+                        lk.appendNotifyInfo(`❌获取置换分解任务材料详情失败，请稍后再试`);
                     } else {
                         let ret = JSON.parse(data);
                         if (ret.success) {
                             let obj = ret.obj;
                             retItemLst = obj;
-                            lk.log(`获取合成任务材料详情成功`);
+                            lk.log(`获取置换分解任务材料详情成功`);
                         } else {
-                            lk.log(`获取合成任务材料详情失败，响应：${data}`);
+                            lk.log(`获取置换分解任务材料详情失败，响应：${data}`);
                         }
                     }
                 } catch (e) {
-                    lk.log(`获取合成任务材料详情发生错误`);
+                    lk.log(`获取置换分解任务材料详情发生错误`);
                     lk.logErr(e);
                     lk.execFail();
                 } finally {
@@ -891,7 +902,7 @@ async function getCompositeMaterial(taskId, taskInfo) {
                 }
             });
         } catch (e) {
-            lk.log(`获取合成任务材料详情发生错误`);
+            lk.log(`获取置换分解任务材料详情发生错误`);
             lk.logErr(e);
             resolve();
         }
@@ -969,23 +980,23 @@ async function confirmCompositeV2(taskId, taskInfo, compositeList) {
                 body: body
             };
             let taskName = taskInfo.compositeTaskName || ''; //合成标题
-            lk.log(`请求合成任务[${taskName}#${taskId}]：\n${body}`);
+            lk.log(`请求置换分解任务[${taskName}#${taskId}]：\n${body}`);
             lk.post(url, async (error, _response, data) => {
                 let retOrder;
                 try {
                     if (error) {
-                        lk.log(`合成发生错误`);
+                        lk.log(`置换分解发生错误`);
                         lk.execFail();
-                        lk.appendNotifyInfo(`❌合成失败，请稍后再试`);
+                        lk.appendNotifyInfo(`❌置换分解失败，请稍后再试`);
                     } else {
                         let ret = JSON.parse(data);
                         if (ret.success) {
                             retOrder = ret.obj;
-                            let dismsg = `合成任务[${taskId}]成功，订单号：${retOrder}`;
+                            let dismsg = `置换分解任务[${taskId}]成功，订单号：${retOrder}`;
                             lk.log(dismsg);
                             lk.appendNotifyInfo(`🎉${dismsg}`);
                         } else {
-                            lk.log(`合成失败，响应：${data}`);
+                            lk.log(`合置换分解失败，响应：${data}`);
                             let respMsg = ret.msg;
                             if (respMsg) {
                                 if (respMsg.indexOf('合成中') > -1 || respMsg.indexOf('已合成') > -1) {
@@ -999,7 +1010,7 @@ async function confirmCompositeV2(taskId, taskInfo, compositeList) {
                         }
                     }
                 } catch (e) {
-                    lk.log(`合成发生错误`);
+                    lk.log(`置换分解发生错误`);
                     lk.logErr(e);
                     lk.execFail();
                 } finally {
@@ -1007,7 +1018,7 @@ async function confirmCompositeV2(taskId, taskInfo, compositeList) {
                 }
             });
         } catch (e) {
-            lk.log(`合成发生错误`);
+            lk.log(`合置换分解发生错误`);
             lk.logErr(e);
             resolve();
         }