|
@@ -211,9 +211,8 @@ function printMaterialGroupsInfo(materialGroups) {
|
|
|
async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
if (getCompositeTaskMode() == 1) {
|
|
if (getCompositeTaskMode() == 1) {
|
|
|
lk.log('开始极速模式执行合成任务');
|
|
lk.log('开始极速模式执行合成任务');
|
|
|
- let jsonStr = lk.getVal(GandartConstKey.CompositeTaskFinalList);
|
|
|
|
|
- if (!lk.isEmpty(jsonStr)) {
|
|
|
|
|
- let data = JSON.parse(jsonStr);
|
|
|
|
|
|
|
+ let data = getCompositeTaskFinalList();
|
|
|
|
|
+ if (data) {
|
|
|
let taskInfo = data.taskInfo;
|
|
let taskInfo = data.taskInfo;
|
|
|
let finalGroups = data.finalGroups;
|
|
let finalGroups = data.finalGroups;
|
|
|
if (finalGroups.length == 0) {
|
|
if (finalGroups.length == 0) {
|
|
@@ -327,6 +326,15 @@ function setCompositeTaskFinalList(taskInfo, finalGroups) {
|
|
|
lk.setVal(GandartConstKey.CompositeTaskFinalList, JSON.stringify(finalCacheData, null, 2));
|
|
lk.setVal(GandartConstKey.CompositeTaskFinalList, JSON.stringify(finalCacheData, null, 2));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+function getCompositeTaskFinalList() {
|
|
|
|
|
+ let data;
|
|
|
|
|
+ let jsonStr = lk.getVal(GandartConstKey.CompositeTaskFinalList);
|
|
|
|
|
+ if (!lk.isEmpty(jsonStr)) {
|
|
|
|
|
+ data = JSON.parse(jsonStr);
|
|
|
|
|
+ }
|
|
|
|
|
+ return data;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
function getCompositeCountDict() {
|
|
function getCompositeCountDict() {
|
|
|
let str = lk.getVal(GandartConstKey.CompositeCountArray, '0#1');
|
|
let str = lk.getVal(GandartConstKey.CompositeCountArray, '0#1');
|
|
|
let arr1 = str.split(',');
|
|
let arr1 = str.split(',');
|