addItem goodType修改

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

@@ -191,7 +191,7 @@ export class NormalBattleHandler {
 
         let channelService = this.app.get('channelService');
 
-        let warReward = new WarReward(roleId, roleName, battleId, isSuccess);
+        let warReward = new WarReward(roleId, roleName, sid, battleId, isSuccess);
 
         let dailyNum = {};
         let towerStatus = null;
@@ -254,7 +254,7 @@ export class NormalBattleHandler {
         // towerStatus: false-本层未通过, true-本层已通过
         return resResult(STATUS.SUCCESS, {
             battleCode, battleId, status,
-            ...reward,
+            goods: reward,
             apJson,
             towerStatus, dailyNum, dungeonNum,
             ...actordata
@@ -266,6 +266,7 @@ export class NormalBattleHandler {
         const { battleId, count } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
+        let sid = session.get('sid');
         let warInfo = getWarById(battleId);
         if(!warInfo) {
             return resResult(STATUS.BATTLE_MISS_INFO);
@@ -305,7 +306,7 @@ export class NormalBattleHandler {
         }
 
         // 发奖励
-        let warReward = new WarReward(roleId, roleName, battleId, true);
+        let warReward = new WarReward(roleId, roleName, sid, battleId, true);
         let result = await warReward.saveReward(count);
 
         let actordata = await roleLevelup(roleId, warInfo.kingExp * count, this.app, session)// 主公升级经验
@@ -322,7 +323,7 @@ export class NormalBattleHandler {
 
         return resResult(STATUS.SUCCESS, {
                 battleId, count,
-                ...result,
+                goods: result,
                 apJson,
                 dailyNum, dungeonNum,
                 ...actordata