活动：添加新任务类型

game-server/app/services/comBattleService.ts

@@ -20,7 +20,7 @@ import { getRoleIds } from '../pubUtils/friendUtil';
 import { getTeamSearchByQuality, rmRoleFromQueue } from './redisService';
 import { addUserToChannel } from './roleService';
 import { ChannelUser } from '../domain/ChannelUser';
-import { checkTaskInComBattleEnd } from './taskService';
+import { checkActivityTask, checkTaskInComBattleEnd } from './taskService';
 import { getRewardByBlueprtId, gameData, comBtlRangeByLv, getBossHpByBlueprtId } from '../pubUtils/data';
 import { getFriendPointObject } from '../pubUtils/itemUtils';
 import { DicWar } from '../pubUtils/dictionary/DicWar';
@@ -273,6 +273,7 @@ export async function handleComBtlProgress(teamStatus: MemComBtlTeam, robotHurtT
         // 任务
         await checkTaskInComBattleEnd(teamStatus.roleStatus, capId, quality);
 
+
         teamMap.delete(teamCode);
     }
 }

game-server/app/services/taskService.ts

@@ -1,5 +1,5 @@
 import * as taskUtil from '../pubUtils/taskUtil';
-import { RoleType } from '../db/Role';
+import { RoleModel, RoleType } from '../db/Role';
 import { pinus, FrontendOrBackendSession } from 'pinus';
 import { resResult, shouldRefresh } from '../pubUtils/util';
 import { STATUS, TASK_TYPE, TASK_FUN_TYPE, SHOP_REFRESH_TYPE } from '../consts';
@@ -120,13 +120,20 @@ export async function checkTaskInComBattleEnd(roleStatus: RoleStatus[], capId: s
     console.log('********', JSON.stringify(roleStatus), capId, quality)
     for (let { roleId, isRobot } of roleStatus) {
         if (!isRobot) {
+
+            let { serverId } = await RoleModel.findByRoleId(roleId);
+
             if (roleId == capId && roleStatus.length > 1) {  // 招募队友
                 await checkTask(roleId, null, null, TASK_TYPE.COM_BATTLE_CREATE_TEAM, 1, true, {});
             } else if (roleId !== capId) { // 协助寻宝
                 await checkTask(roleId, null, null, TASK_TYPE.COM_BATTLE_ASSIST_TEAM, 1, true, {});
+                //活动任务
+                await checkActivityTask(serverId, null, null, roleId, TASK_TYPE.COM_BATTLE_ASSIST_TEAM, 1);
             }
             await checkTask(roleId, null, null, TASK_TYPE.COM_BATTLE, 1, true, {});
             await checkTask(roleId, null, null, TASK_TYPE.COM_BATTLE_QUALITY, 1, true, { quality });
+            //活动任务
+            await checkActivityTask(serverId, null, null, roleId, TASK_TYPE.COM_BATTLE, 1);
         }
     }
 }

shared/pubUtils/taskUtil.ts

@@ -1080,6 +1080,17 @@ export function isComplete(roleId: string, taskType: TASK_TYPE, taskParam: strin
                 addCount = equips.length;
                 break;
             }
+        case TASK_TYPE.COM_BATTLE:
+            {
+                addCount = count;
+                break;
+            }
+
+        case TASK_TYPE.COM_BATTLE_ASSIST_TEAM:
+            {
+                addCount = count;
+                break;
+            }
         default:
             addCount = 0;
             break;