From a189a7e63c1daacfaf7568016017c61c8bab67f0 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 19 Nov 2021 15:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E4=BF=AE=E5=A4=8Dgr?=
 =?UTF-8?q?oup=E7=BC=BA=E5=B0=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/pubUtils/data.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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);
     }
 }