装备：获得天晶石&合成装备

game-server/app/services/warRewardService.ts

@@ -6,7 +6,7 @@
 import { BattleDropModel } from '../db/BattleDrop';
 import { getRandEelmWithWeight, getRandSingleEelm, getReasonByWarType } from '../pubUtils/util';
 import { BATTLE_REWARD_TYPE, BLUEPRT_CONST } from '../consts';
-import { addItems, combineItemAndEquips } from './rewardService';
+import { addItems, combineItemAndJewels } from './rewardService';
 import { BattleBlueprtDropModel } from '../db/BattleBlueprtDrop'
 import { RoleModel } from '../db/Role';
 import { gameData } from '../pubUtils/data';
@@ -184,7 +184,7 @@ export class WarReward {
 
         let rewards = this.rewards;
         if(combine) {
-            rewards = combineItemAndEquips(rewards);
+            rewards = combineItemAndJewels(rewards);
         }
         await addItems(this.roleId, this.roleName, this.sid, rewards, getReasonByWarType(this.warInfo.warType));
         return rewards;