diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts index baf9f7225..388af76dc 100644 --- a/shared/pubUtils/data.ts +++ b/shared/pubUtils/data.ts @@ -868,21 +868,22 @@ function treatTaskGroup() { // console.log('params: ', obj.id, obj.type, obj.taskType, obj.taskParam, obj.condition, params); if(!taskByGroup.has(taskType)) { - taskByGroup.set(taskType, [{ params, ids: [`${obj.type}${obj.id}`]}]); + taskByGroup.set(taskType, [{ params, ids: [`${obj.type}_${obj.id}`]}]); } else { let arr = taskByGroup.get(taskType)||[]; let hasGroup = arr.find(cur => { return _.isEqual(cur.params, params); }); if(hasGroup) { - hasGroup.ids.push(`${obj.type}${obj.id}`); + hasGroup.ids.push(`${obj.type}_${obj.id}`); } else { - arr.push({ params, ids: [`${obj.type}${obj.id}`] }); + arr.push({ params, ids: [`${obj.type}_${obj.id}`] }); } taskByGroup.set(taskType, arr); } } } + console.log('****** taskByGroup', JSON.stringify([...taskByGroup])) for(let [taskType, arr] of taskByGroup) { let tasks = gameData.taskType.get(taskType); @@ -890,10 +891,12 @@ function treatTaskGroup() { let group = i + 1; let { ids } = arr[i]; for(let id of ids) { - let task = tasks.find(cur => `${cur.type}${cur.id}` == id); - if(task) task.group = group; + let task = tasks.find(cur => `${cur.type}_${cur.id}` == id); + task.group = group; + gameData.tasks.get(task.type).get(task.id).group = group; } } + gameData.taskType.set(taskType, tasks); } }