|
|
@@ -208,7 +208,10 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
}
|
|
|
let materialSelLst = await getCompositeMaterial(taskId, taskInfo);
|
|
|
if (materialSelLst && materialSelLst.length > 0) {
|
|
|
+ lk.log("test##########0");
|
|
|
+ lk.log(JSON.stringify(materialSelLst));
|
|
|
let ret = calcCompositeGroups(materialSelLst);
|
|
|
+ lk.log("test##########1");
|
|
|
let materialGroups = ret[0];
|
|
|
// 获取用户材料拥有详情
|
|
|
let materialDict = ret[1];
|
|
|
@@ -220,7 +223,9 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
let validCompositeGroups = findValidGroupMaterialGroups(materialGroups, gMaterialDetails);
|
|
|
lk.setVal(GandartConstKey.CompositeTaskMateList, JSON.stringify(validCompositeGroups));
|
|
|
|
|
|
+ lk.log("test##########2");
|
|
|
if (isGenFinalLisstEnable()) {
|
|
|
+ lk.log("test##########3");
|
|
|
let compositeCountDict = getCompositeCountDict();
|
|
|
let finalGroups = [];
|
|
|
for (let k in compositeCountDict) {
|
|
|
@@ -230,6 +235,7 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
finalGroups = finalGroups.concat(arr);
|
|
|
}
|
|
|
}
|
|
|
+ lk.log("test##########4");
|
|
|
if (isExecFinalComposite()) {
|
|
|
let retOrderLst = [];
|
|
|
for (let i = 0; i < finalGroups.length; i++) {
|
|
|
@@ -255,6 +261,7 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
lk.appendNotifyInfo('⚠️请设置光予合成任务ID');
|
|
|
}
|
|
|
}
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
function getCompositeCountDict() {
|