道具使用：添加返回

game-server/app/services/warRewardService.ts

@@ -12,7 +12,7 @@ import { gameData } from '../pubUtils/data';
 import { DicWar } from '../pubUtils/dictionary/DicWar';
 import { RewardInter } from '../pubUtils/interface';
 import { getZeroPointD } from '../pubUtils/timeUtil';
-import { combineItemAndJewels } from './role/util';
+import { combineItems } from './role/util';
 
 export class WarReward {
     private roleId: string;
@@ -154,7 +154,7 @@ export class WarReward {
 
         let rewards = this.rewards;
         if(combine) {
-            rewards = combineItemAndJewels(rewards);
+            rewards = combineItems(rewards);
         }
         await addItems(this.roleId, this.roleName, this.sid, rewards, getReasonByWarType(this.warInfo.warType));
         return rewards;