初步加入天梯接口

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

@@ -7,7 +7,7 @@ import { getAp, setAp, WarReward } from './battleUtils';
 import { WAR_TYPE, EVENT_START_BATTLE } from '../../../consts/consts';
 import { checkDaily, checkDailyAndIncrease } from './dailyBattleHandler';
 import { setBattleStatus, startEvent } from './eventBattleHandler';
-import { queryMethod } from '@typegoose/typegoose';
+import { checkTowerWar, towerBattleEnd } from '../../../services/battleService';
 
 export default function(app: Application) {
     return new NormalBattleHandler(app);
@@ -44,12 +44,19 @@ export class NormalBattleHandler {
         }
 
         let dailyNum = {};
+        let towerData = {};
         if(warInfo.warType == WAR_TYPE.DAILY) {
             let checkResult = await checkDaily(roleId, battleId, 1);
             if(checkResult.status == -1) {
                 return {code: 202, data: checkResult.msg}
             }
             dailyNum = { type: checkResult.type, count: checkResult.count, sum: checkResult.sum };
+        } else if (warInfo.warType == WAR_TYPE.TOWER) {
+            let checkResult = await checkTowerWar(roleId, battleId);
+            if(checkResult.status) {
+                return {code: 202, data: checkResult.msg}
+            }
+            towerData = Object.assign(towerData, checkResult.data);
         }
         const battleCode = genCode(8);
         const BattleRecord = await BattleRecordModel.updateBattleRecordByCode(battleCode, {
@@ -68,7 +75,7 @@ export class NormalBattleHandler {
         return {
             code: 200,
             data: {
-                battleId, battleCode, status, apJson, dailyNum
+                battleId, battleCode, status, apJson, dailyNum, towerData
             }
         }
     }
@@ -96,6 +103,7 @@ export class NormalBattleHandler {
         const { battleCode, battleId, isSuccess, heroes, star } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
+        let sid = session.get('sid');
         let warInfo = getWarById(battleId);
         if(!warInfo) {
             return { code: 202, data: "缺少关卡信息" }
@@ -124,7 +132,12 @@ export class NormalBattleHandler {
             return { code: 202, data: '体力不足' }
         }
 
+        let channelService = this.app.get('channelService');
+
         let dailyNum = {};
+        let towerRec = null;
+        let towerBonus = null;
+        let towerStatus = null;
         if(warInfo.warType == WAR_TYPE.DAILY) {
             let checkResult = await checkDailyAndIncrease(roleId, battleId, 1, false);
             if(checkResult.status == -1) {
@@ -133,7 +146,15 @@ export class NormalBattleHandler {
             dailyNum = { type: checkResult.type, count: checkResult.count, sum: checkResult.sum };
         } else if (warInfo.warType == WAR_TYPE.EVENT) { 
             // 记录事件状态
-            await setBattleStatus(this.app, session, roleId, battleId, isSuccess, battleCode);
+            await setBattleStatus(roleId, battleId, isSuccess, battleCode, session.get('eventStatus'));
+        } else if (warInfo.warType == WAR_TYPE.TOWER) {
+            let towerEndResult = await towerBattleEnd(channelService, sid, roleId, battleCode, battleId, isSuccess, heroes);
+            if(towerEndResult.status == -1) {
+                return {code: 202, data: towerEndResult.msg};
+            }
+            towerRec = towerEndResult.data.newRec;
+            towerBonus = towerEndResult.data.bonusReward;
+            towerStatus = towerEndResult.data.towerStatus;
         }
 
         let warReward = new WarReward(roleId, roleName, battleId, isSuccess);
@@ -176,11 +197,14 @@ export class NormalBattleHandler {
             // console.log('*******startEvent')
             await startEvent(this.app, session);
         }
+        // 返回值：
+        // towerStatus: false-本层未通过, true-本层已通过
+        // towerBonus: 天梯每隔几层的额外宝箱
         return {
             code: 200,
             data: {
-                battleCode, battleId, status,
-                goods: reward,
+                battleCode, battleId, status, towerStatus,
+                goods: reward, towerBonus,
                 apJson,
                 dailyNum
             }