活动：军团练兵场通过层数后推送

game-server/app/servers/battle/handler/guildTrainHandler.ts

@@ -19,6 +19,7 @@ import { GuildTrainReportModel } from '../../../db/GuildTrainReport';
 import { DATA_NAME } from '../../../consts/dataName';
 import { pushGuildTrainSucMsg } from '../../../services/chatService';
 import { checkActivityTask, checkTask } from '../../../services/taskService';
+import { sendPopUpActivityData } from '../../../services/guildActivityService';
 
 export default function (app: Application) {
     return new GuildTrainHandler(app);
@@ -144,7 +145,8 @@ export class GuildTrainHandler {
      * @param session 
      */
     async trainBattleEnd(msg: { battleCode: string, isSuccess: boolean }, session: BackendSession) {
-        const { battleCode, isSuccess } = msg;
+        const { battleCode, } = msg;
+        let isSuccess = true;
         const roleId: string = session.get('roleId');
         const serverId: number = parseInt(session.get('serverId'));
         const roleName: string = session.get('roleName');
@@ -251,6 +253,11 @@ export class GuildTrainHandler {
             guildTrain = await GuildTrainModel.updateGuildTrain(code, trainId, { ranks });
             res.releaseCallback();//解锁
         }
+        if (isComplete) {//解锁下一关，弹出礼包 // 1 true true 6Sjkgp(trainId, isComplete, needLockNext, code)
+            let pushMessage = await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.GUILD_TRAIN_COUNT, 1, { trainId, code })
+            await sendPopUpActivityData(code, serverId, pushMessage);
+        }
+
         await GuildTrainReportModel.pushGuildTrainReports(code, trainId, reports);//增加战报
         let { trainCount, trainRewards } = userGuild;
         let result: any = getGuildTrainInfo(guildTrain, roleId, trainCount, trainRewards);//战斗后更新练兵场信息
@@ -260,7 +267,6 @@ export class GuildTrainHandler {
         // 任务
         if (isSuccess) {
             await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_TRAIN_SUCESS, 1, true, {});
-            await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.GUILD_TRAIN_COUNT, 1, { trainId: trainId })
         }
         await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_TRAIN, 1, true, {});
         //成长任务