修改

BoxJsSub/Release.json

@@ -378,7 +378,7 @@
             },
             {
               "key": "1",
-              "label": "合成中"
+              "label": "进行中"
             },
             {
               "key": "2",
@@ -386,7 +386,7 @@
             },
             {
               "key": "3",
-              "label": "待开始与合成中"
+              "label": "待开始与进行中"
             }
           ]
         },
@@ -582,20 +582,8 @@
           "desc": "",
           "items": [
             {
-              "key": "0",
-              "label": "待开始"
-            },
-            {
               "key": "1",
-              "label": "置换中"
-            },
-            {
-              "key": "2",
-              "label": "已结束"
-            },
-            {
-              "key": "3",
-              "label": "待开始与置换中"
+              "label": "进行中"
             }
           ]
         },
@@ -624,7 +612,7 @@
           "desc": "默认关闭"
         },
         {
-          "id": "lkIsCompositeMaterialCache",
+          "id": "lkIsExchangeMaterialCache",
           "name": "启用/弃用材料详情本地缓存",
           "val": false,
           "type": "boolean",

Scripts/gandart/gandartComposite.js

@@ -696,7 +696,19 @@ async function checkGetCompositeTaskList(status) {
     if (useCache) {
         taskLst = getCompositeTaskListByCache(status);
     } else {
-        taskLst = await getCompositeTaskListByServer(status);
+        taskLst = [];
+        let taskDetail = await getCompositeTaskListByServer(status, 10, 1);
+        if (taskDetail && taskDetail.rows) {
+            taskLst = taskLst.concat(taskDetail.rows);
+            let totalPage = taskDetail.totalPage;
+            for (let i = 2; i < totalPage + 1; i++) {
+                taskDetail = await getCompositeTaskListByServer(status, 10, i);
+                if (taskDetail && taskDetail.rows) {
+                    taskLst = taskLst.concat(taskDetail.rows);
+                }
+            }
+        }
+
         cacheCompositeTaskList(status, taskLst);
     }
     return taskLst;
@@ -764,17 +776,14 @@ async function getCompositeTaskListByServer(status, pageSize = 10, page = 1) {
             ];
             lk.log(`获取合成任务[${tagNames[status]}]列表：${body}`);
             lk.post(url, async (error, _response, data) => {
-                let retTaskLst = [];
+                let ret = {};
                 try {
                     if (error) {
                         lk.log(`获取合成任务列表发生错误`);
                         lk.execFail();
                         lk.appendNotifyInfo(`❌获取合成任务列表失败，请稍后再试`);
                     } else {
-                        let ret = JSON.parse(data);
-                        if (ret.rows && ret.rows.length > 0) {
-                            retTaskLst = ret.rows;
-                        }
+                        ret = JSON.parse(data);
                         lk.log(`获取合成任务列表成功`);
                     }
                 } catch (e) {
@@ -782,7 +791,7 @@ async function getCompositeTaskListByServer(status, pageSize = 10, page = 1) {
                     lk.logErr(e);
                     lk.execFail();
                 } finally {
-                    resolve(retTaskLst);
+                    resolve(ret);
                 }
             });
         } catch (e) {

Scripts/gandart/gandartExchange.js

@@ -93,29 +93,29 @@ async function all() {
         let tmpLst = [];
         switch (status) {
             case 0:
-                tmpLst = await checkGetCompositeTaskList(status);
+                tmpLst = await checkGetExchangeTaskList(status);
                 if (tmpLst) {
                     taskLst = taskLst.concat(tmpLst);
                 }
                 break;
             case 1:
-                tmpLst = await checkGetCompositeTaskList(status);
+                tmpLst = await checkGetExchangeTaskList(status);
                 if (tmpLst) {
                     taskLst = taskLst.concat(tmpLst);
                 }
                 break;
             case 2:
-                tmpLst = await checkGetCompositeTaskList(status);
+                tmpLst = await checkGetExchangeTaskList(status);
                 if (tmpLst) {
                     taskLst = taskLst.concat(tmpLst);
                 }
                 break;
             case 3:
-                tmpLst = await checkGetCompositeTaskList(1);
+                tmpLst = await checkGetExchangeTaskList(1);
                 if (tmpLst) {
                     taskLst = taskLst.concat(tmpLst);
                 }
-                tmpLst = await checkGetCompositeTaskList(0);
+                tmpLst = await checkGetExchangeTaskList(0);
                 if (tmpLst) {
                     taskLst = taskLst.concat(tmpLst);
                 }
@@ -125,7 +125,7 @@ async function all() {
         }
     }
     if (taskLst.length == 0) {
-        lk.log('合成任务列表为空');
+        lk.log('置换分解任务列表为空');
     }
     if (isCaclMateListEnable()) {
         let taskId = getWillExchangeTaskId();
@@ -136,24 +136,24 @@ async function all() {
                 if (taskInfo.id == taskId) {
                     found = true;
                     lk.setVal(GandartConstKey.ExchangeTaskNameDisplay, taskInfo.compositeTaskName);
-                    await tryToExecCompositeTask(taskInfo.id, taskInfo);
+                    await tryToExecExchangeTask(taskInfo.id, taskInfo);
                     break;
                 }
             }
             if (!found) {
                 lk.log(`当前任务列表找不到指定任务[${taskId}]`);
-                await checkTrySearchToCompositeTask(taskLst);
+                await checkTrySearchToExchangeTask(taskLst);
             }
         } else {
             lk.log('没有设置指定任务ID，检查是否需进行检索合成');
-            await checkTrySearchToCompositeTask(taskLst);
+            await checkTrySearchToExchangeTask(taskLst);
         }
     }
     lk.msg('');
     lk.done();
 }
 
-async function checkTrySearchToCompositeTask(taskLst) {
+async function checkTrySearchToExchangeTask(taskLst) {
     if (!isTaskNameSearchMode()) {
         return;
     }
@@ -171,7 +171,7 @@ async function checkTrySearchToCompositeTask(taskLst) {
             found = true;
             lk.log(`检索到相符的任务[${taskName}#${taskInfo.id}]`);
             lk.setVal(GandartConstKey.ExchangeTaskNameDisplay, taskName);
-            await tryToExecCompositeTask(taskInfo.id, taskInfo);
+            await tryToExecExchangeTask(taskInfo.id, taskInfo);
         }
     }
 
@@ -290,7 +290,7 @@ function printMaterialGroupsInfo(materialGroups) {
 }
 
 async function checkGetMaterialDetails(gUsedMaterialDetails, materialDict) {
-    let useCache = lk.getVal(GandartConstKey.CompositeMaterialCache);
+    let useCache = lk.getVal(GandartConstKey.ExchangeMaterialCache);
     if (!lk.isEmpty(useCache)) {
         useCache = JSON.parse(useCache);
     } else {
@@ -326,30 +326,30 @@ async function checkGetMaterialDetails(gUsedMaterialDetails, materialDict) {
     return gUsedMaterialDetails;
 }
 
-async function tryToExecCompositeTask(taskId, taskInfo = {}) {
+async function tryToExecExchangeTask(taskId, taskInfo = {}) {
     if (getExchangeTaskMode() == 1) {
-        lk.log('开始极速模式执行合成任务');
+        lk.log('开始极速模式执行置换分解任务');
         let data = getExchangeTaskFinalList();
         if (data) {
             let taskInfo = data.taskInfo;
             let finalGroups = data.finalGroups;
             if (finalGroups.length == 0) {
-                lk.log('暂无可行的合成组合，请检查');
-                lk.appendNotifyInfo('⚠️暂无可行的合成组合');
+                lk.log('暂无可行的置换分解组合，请检查');
+                lk.appendNotifyInfo('⚠️暂无可行的置换分解组合');
                 return;
             }
-            lk.log(`最终选择可执行合成数：${finalGroups.length}`);
+            lk.log(`最终选择可执行置换分解数：${finalGroups.length}`);
             let tmpJsonStr = JSON.stringify(finalGroups, null, 2);
             lk.log(`详情如下：\n${tmpJsonStr}`);
             if (isExecFinalExchange() && checkIsExchangeTaskExec(taskInfo)) {
                 await doExecFinalExchange(taskInfo.id, taskInfo, finalGroups);
             } else {
-                lk.log('暂未进行最后一步合成');
+                lk.log('暂未进行最后一步置换分解');
             }
         }
         return;
     }
-    lk.log('开始普通模式执行合成任务');
+    lk.log('开始普通模式执行置换分解任务');
     let materialSelLst = await getCompositeMaterial(taskId, taskInfo);
     if (materialSelLst && materialSelLst.length > 0) {
         let ret = calcCompositeGroups(materialSelLst);
@@ -366,32 +366,32 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
         // printMaterialGroupsInfo(validCompositeGroups, '预估可行组合数');
 
         if (isGenFinalLisstEnable()) {
-            let compositeCountDict = getCompositeCountDict();
+            let exchangeCountDict = getExchangeCountDict();
             let finalGroups = [];
-            for (let k in compositeCountDict) {
+            for (let k in exchangeCountDict) {
                 let mGroup = validCompositeGroups[k];
                 if (mGroup) {
-                    let arr = checkPickMaterialForComposite(mGroup, gUsedMaterialDetails, compositeCountDict[k]);
+                    let arr = checkPickMaterialForExchange(mGroup, gUsedMaterialDetails, exchangeCountDict[k]);
                     finalGroups = finalGroups.concat(arr);
                 }
             }
-            lk.log(`最终选择可执行合成数：${finalGroups.length}`);
+            lk.log(`最终选择可执行置换分解数：${finalGroups.length}`);
             let tmpJsonStr = JSON.stringify(finalGroups, null, 2);
             lk.log(`详情如下：\n${tmpJsonStr}`);
             if (isExecFinalExchange() && checkIsExchangeTaskExec(taskInfo)) {
                 if (finalGroups.length == 0) {
-                    lk.log('暂无可行的合成组合，请检查');
+                    lk.log('暂无可行的置换分解组合，请检查');
                     // lk.appendNotifyInfo('⚠️暂无可行的合成组合');
                     return;
                 }
                 await doExecFinalExchange(taskId, taskInfo, finalGroups);
             } else {
-                lk.log('暂未进行最后一步合成');
+                lk.log('暂未进行最后一步置换分解');
                 setExchangeTaskFinalList(taskInfo, finalGroups);
             }
         } else {
             lk.execFail();
-            lk.appendNotifyInfo('⚠️请设置光予合成任务ID');
+            lk.appendNotifyInfo('⚠️请设置光予置换分解任务ID');
         }
     }
     return;
@@ -557,7 +557,7 @@ function getExchangeTaskFinalList() {
     return data;
 }
 
-function getCompositeCountDict() {
+function getExchangeCountDict() {
     let str = lk.getVal(GandartConstKey.ExchangeCountArray, '0#1');
     let arr1 = str.split(',');
     let ret = {};
@@ -606,7 +606,7 @@ function checkMaterialEnough(materialGroup, materialDetails) {
     return minCount
 }
 
-function checkPickMaterialForComposite(materialGroup, materialDetails, wantCount) {
+function checkPickMaterialForExchange(materialGroup, materialDetails, wantCount) {
     let needNumDict = {};
     for (let i = 0; i < materialGroup.length; i++) {
         const materialObj = materialGroup[i];
@@ -684,7 +684,7 @@ function calcCompositeGroups(materialSelLst) {
     return [materialGroups, materialDict];
 }
 
-async function checkGetCompositeTaskList(status) {
+async function checkGetExchangeTaskList(status) {
     let taskLst;
     let useCache = lk.getVal(GandartConstKey.ExchangeTaskListCache);
     if (!lk.isEmpty(useCache)) {
@@ -692,17 +692,28 @@ async function checkGetCompositeTaskList(status) {
     } else {
         useCache = false;
     }
-    lk.log(`合成任务列表本地缓存:${useCache}`);
+    lk.log(`置换分解任务列表本地缓存:${useCache}`);
     if (useCache) {
-        taskLst = getCompositeTaskListByCache(status);
+        taskLst = getExchangeTaskListByCache(status);
     } else {
-        taskLst = await getCompositeTaskListByServer(status);
-        cacheCompositeTaskList(status, taskLst);
+        taskLst = [];
+        let taskDetail = await getExchangeTaskListByServer(status, 10, 1);
+        if (taskDetail && taskDetail.rows) {
+            taskLst = taskLst.concat(taskDetail.rows);
+            let totalPage = taskDetail.totalPage;
+            for (let i = 2; i < totalPage + 1; i++) {
+                taskDetail = await getExchangeTaskListByServer(status, 10, i);
+                if (taskDetail && taskDetail.rows) {
+                    taskLst = taskLst.concat(taskDetail.rows);
+                }
+            }
+        }
+        cacheExchangeTaskList(status, taskLst);
     }
     return taskLst;
 }
 
-function getCompositeTaskListByCache(status, pageSize = 10, page = 1) {
+function getExchangeTaskListByCache(status, pageSize = 10, page = 1) {
     try {
         let jsonStr = '';
         if (status == 0) {
@@ -720,7 +731,7 @@ function getCompositeTaskListByCache(status, pageSize = 10, page = 1) {
     }
 }
 
-function cacheCompositeTaskList(status, taskLst) {
+function cacheExchangeTaskList(status, taskLst) {
     // 精简一下内容
     let simpleLst = [];
     for (let i = 0; i < taskLst.length; i++) {
@@ -745,7 +756,7 @@ function cacheCompositeTaskList(status, taskLst) {
     }
 }
 
-async function getCompositeTaskListByServer(status, pageSize = 10, page = 1) {
+async function getExchangeTaskListByServer(status, pageSize = 10, page = 1) {
     return new Promise((resolve, _reject) => {
         try {
             const headers = GCommonGandartHeads;
@@ -753,7 +764,7 @@ async function getCompositeTaskListByServer(status, pageSize = 10, page = 1) {
             headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
             let body = `page=${page}&pageSize=${pageSize}&total=0&status=${status}&labelName=`;
             let url = {
-                url: `${config.WALLET_API}/v2/composite/v3/list/v2`,
+                url: `${config.WALLET_API}/v2/composite/v3/list/v3`,
                 headers: headers,
                 body: body
             };
@@ -762,31 +773,28 @@ async function getCompositeTaskListByServer(status, pageSize = 10, page = 1) {
                 '合成中',
                 '已结束',
             ];
-            lk.log(`获取合成任务[${tagNames[status]}]列表：${body}`);
+            lk.log(`获取置换分解任务[${tagNames[status]}]列表：${body}`);
             lk.post(url, async (error, _response, data) => {
-                let retTaskLst = [];
+                let ret = {};
                 try {
                     if (error) {
-                        lk.log(`获取合成任务列表发生错误`);
+                        lk.log(`获取置换分解任务列表发生错误`);
                         lk.execFail();
-                        lk.appendNotifyInfo(`❌获取合成任务列表失败，请稍后再试`);
+                        lk.appendNotifyInfo(`❌获取置换分解任务列表失败，请稍后再试`);
                     } else {
-                        let ret = JSON.parse(data);
-                        if (ret.rows && ret.rows.length > 0) {
-                            retTaskLst = ret.rows;
-                        }
-                        lk.log(`获取合成任务列表成功`);
+                        ret = JSON.parse(data);
+                        lk.log(`获取置换分解任务列表成功`);
                     }
                 } catch (e) {
-                    lk.log(`获取合成任务列表发生错误`);
+                    lk.log(`获取置换分解任务列表发生错误`);
                     lk.logErr(e);
                     lk.execFail();
                 } finally {
-                    resolve(retTaskLst);
+                    resolve(ret);
                 }
             });
         } catch (e) {
-            lk.log(`获取合成任务列表发生错误`);
+            lk.log(`获取置换分解任务列表发生错误`);
             lk.logErr(e);
             resolve();
         }