镇念塔调整

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

@@ -178,7 +178,6 @@ export class NormalBattleHandler {
 
         let dailyNum = {};
         let towerRec = null;
-        let towerBonus = null;
         let towerStatus = null;
         let towerReward = null;
         if(warInfo.warType == WAR_TYPE.DAILY) {
@@ -192,13 +191,14 @@ export class NormalBattleHandler {
             await setBattleStatus(this.app, session, roleId, battleId, isSuccess, battleCode);
         } else if (warInfo.warType == WAR_TYPE.TOWER) {
             let towerEndResult = await towerBattleEnd(channelService, sid, roleId, battleCode, battleId, isSuccess, heroes);
-            if(towerEndResult.status == -1) {
-                return towerEndResult.resResult;
+            if(towerEndResult) {
+                if(towerEndResult.status == -1) {
+                    return towerEndResult.resResult;
+                }
+                towerRec = towerEndResult.data.newRec;
+                towerStatus = towerEndResult.data.towerStatus;
+                towerReward = towerEndResult.data.towerReward;
             }
-            towerRec = towerEndResult.data.newRec;
-            towerBonus = towerEndResult.data.bonusReward;
-            towerStatus = towerEndResult.data.towerStatus;
-            towerReward = towerEndResult.data.towerReward;
         }
 
         let warReward = new WarReward(roleId, roleName, battleId, isSuccess);
@@ -233,10 +233,9 @@ export class NormalBattleHandler {
 
         // 返回值：
         // towerStatus: false-本层未通过, true-本层已通过
-        // towerBonus: 天梯每隔几层的额外宝箱
         return resResult(STATUS.SUCCESS, {
             battleCode, battleId, status, towerStatus,
-            ...reward, towerBonus, towerReward,
+            ...reward, towerReward,
             apJson,
             dailyNum,
             heroes: curHeroes,