活动：新将演绎接口

game-server/app/servers/activity/handler/newHeroGKHandler.ts

@@ -0,0 +1,68 @@
+import { Application, BackendSession } from 'pinus';
+import { resResult } from '../../../pubUtils/util';
+import { STATUS } from '../../../consts';
+import { challengeNewHeroGK, getPlayerNewHeroGKData } from '../../../services/activity/newHeroGKService';
+import { NewHeroGKItem } from '../../../domain/activityField/newHeroGKField';
+
+
+export default function (app: Application) {
+    return new NewHeroGKHandler(app);
+}
+
+export class NewHeroGKHandler {
+    constructor(private app: Application) {
+    }
+
+    /************************新将演绎 (通用每日关卡,分页，自定义每个关卡开放的时间长短);(配置N个武将，每个武将有X个关卡；活动期间，*天(时间自定义)开启每个武将对应的一个关卡，只有第一次通关会获得奖励)****************************/
+
+    /**
+    * @description 获取关卡活动数据
+    * @param {{ activityId: number}} msg
+    * @param {BackendSession} session
+    * @memberof NewHeroGKHandler
+    */
+    async getNewHeroGKActivity(msg: { activityId: number }, session: BackendSession) {
+        const { activityId } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+
+        let playerData = await getPlayerNewHeroGKData(activityId, serverId, roleId)
+
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        return resResult(STATUS.SUCCESS, playerData);
+    }
+
+    /**
+        * @description 获取今日挑战的单个奖励
+        * @param {{ activityId: number, pageIndex: number, index:number}} msg
+        * @param {BackendSession} session
+        * @memberof NewHeroGKHandler
+        */
+    async getGK(msg: { activityId: number, pageIndex: number, index: number }, session: BackendSession) {
+        const { activityId, pageIndex, index } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+        const sid = session.get('sid');
+        const roleName = session.get('roleName');
+        const funcs = session.get('funcs');
+
+        let playerData = await getPlayerNewHeroGKData(activityId, serverId, roleId)
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        let dailyItemData: NewHeroGKItem = playerData.findNewHeroGKItem(pageIndex, index);
+        if (!dailyItemData) {
+            return resResult(STATUS.ACTIVITY_DATA_ERROR);
+        }
+
+        if (dailyItemData.begin > playerData.todayIndex || dailyItemData.end < playerData.todayIndex) {
+            return resResult(STATUS.ACTIVITY_DAY_INDEX_OVER);
+        }
+        await challengeNewHeroGK(serverId, roleId, activityId, pageIndex, dailyItemData.gk)
+
+        return resResult(STATUS.SUCCESS, {
+            gkId: dailyItemData.gk
+        });
+    }
+
+}

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

@@ -23,6 +23,7 @@ import { checkTaskWithWar, checkTaskInBattleEnd, checkActivityTask } from '../..
 import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService';
 import { getSelfServiceShopActivityData } from '../../../services/activity/selfServiceShopActivityService';
 import { challengeDailyGK } from '../../../services/activity/dailyGKService';
+import { challengeNewHeroGK } from '../../../services/activity/newHeroGKService';
 
 export default function (app: Application) {
     return new NormalBattleHandler(app);
@@ -120,13 +121,15 @@ export class NormalBattleHandler {
     }
 
     // 关卡结算，记录使用的武将，获得奖励
-    async battleEnd(msg: { battleCode: string, battleId: number, isSuccess: boolean, star: number, heroes: Array<any>, activityId: number }, session: BackendSession) {
-        const { battleCode, battleId, isSuccess, heroes = [], star, activityId } = msg;
+    async battleEnd(msg: { battleCode: string, battleId: number, isSuccess: boolean, star: number, heroes: Array<any>, activityId: number, pageIndex: number }, session: BackendSession) {
+        const { battleCode, battleId, isSuccess, heroes = [], star, activityId, pageIndex } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
         let sid = session.get('sid');
         const funcs: number[] = session.get('funcs');
         let serverId = session.get('serverId');
+
+        let skipReward = false;//是否跳过奖励结算
         let warInfo = gameData.war.get(battleId);
         if (!warInfo) {
             return resResult(STATUS.BATTLE_MISS_INFO);
@@ -218,6 +221,11 @@ export class NormalBattleHandler {
             if (isSuccess) {
                 await challengeDailyGK(serverId, roleId, activityId, battleId)
             }
+        } else if (warInfo.warType == WAR_TYPE.ACT_NEW_HERO_GK) {
+            if (isSuccess) {
+                let isFirst = await challengeNewHeroGK(serverId, roleId, activityId, pageIndex, battleId)
+                skipReward = !isFirst;
+            }
         }
 
         if (isSuccess) { // 挑战胜利
@@ -237,7 +245,10 @@ export class NormalBattleHandler {
             await updateWarStar(roleId, battleId, warInfo.warType, star);
         }
 
-        let reward = await warReward.saveReward(1);
+        let reward = null;
+        if (!skipReward) {
+            reward = await warReward.saveReward(1);
+        }
 
         const updateResult = await BattleRecordModel.updateBattleRecordByCode(battleCode, {
             $set: { status: isSuccess ? 1 : 2, star, record: { heroes } }