战力：修复创建武将bug

game-server/app/services/role/rewardService.ts

@@ -22,11 +22,9 @@ import { reportTAEvent, reportTAUserSet } from '../sdkService';
 import { saveCoinChangeLog, saveFigureInfoLog, saveGoldChangeLog, saveItemChangeLog } from '../../pubUtils/logUtil';
 import { JewelModel, JewelType, jewelUpdate, RandSe } from '../../db/Jewel';
 import { updateEplaces } from '../equipService';
-import { checkPopUpConditionInCreateHero } from '../activity/popUpShopService';
-import { CreateHeroes } from './createHero';
 import { combineItems, getCoinEventProperties, getGoldEventProperties, sortItems } from './util';
 import { nowSeconds } from '../../pubUtils/timeUtil';
-import { calculateCe } from '../playerCeService';
+import { calculateCeWithHero } from '../playerCeService';
 
 
 
@@ -71,7 +69,7 @@ export async function handleCost(roleId: string, sid: string, goods: Array<ItemI
                 heroMap.get(jewel.hid).jewels.push(jewel);
             }
         }
-        for(let [_hid, {hero, jewels} ] of heroMap) {
+        for(let [hid, {hero, jewels} ] of heroMap) {
             // 脱下天晶石
             let update = new Map<number, Partial<EPlace>>();
             for(let jewel of jewels) {
@@ -82,7 +80,7 @@ export async function handleCost(roleId: string, sid: string, goods: Array<ItemI
                 }
             }
             let { newEplace } = updateEplaces(hero.ePlace, update);
-            await calculateCe(HERO_SYSTEM_TYPE.EQUIP_STRENGTH, roleId, role.serverId, sid, { ePlace: newEplace }, {}, { ePlaceIds: [...update.keys()] });
+            await calculateCeWithHero(HERO_SYSTEM_TYPE.EQUIP_STRENGTH, roleId, role.serverId, sid, hid, { ePlace: newEplace }, { ePlaceIds: [...update.keys()] });
         }
 
 
@@ -360,7 +358,7 @@ export async function addSkin(roleId: string, roleName: string, sid: string, ski
     if(skin.hid && !hero) hero = await HeroModel.findByHidAndRole(skin.hid, roleId);
     let condition = { type: FIGURE_UNLOCK_CONDITION.GET_SKIN, paramSkinId: skinId };
     await unlockFigure(sid, roleId, [condition]); // 解锁头像
-    await calculateCe(HERO_SYSTEM_TYPE.ADD_SKIN, roleId, hero.serverId, sid, {}, {}, { skinId }); // 全局加成
+    await calculateCeWithHero(HERO_SYSTEM_TYPE.ADD_SKIN, roleId, hero.serverId, sid, skin.hid, {}, { skinId }); // 全局加成
 
     if (hero) { // 有武将的，将皮肤链接到武将上
         let curSkin = hero.skins.find(cur => cur.id == skinId);