战力：修复bug

game-server/app/servers/gm/handler/gmRoleHandler.ts

@@ -94,7 +94,7 @@ export class GmRoleHandler {
             param.lv = newLv;
             param['exp'] = exp;
         }
-        await calculateCeWithHero(HERO_SYSTEM_TYPE.INIT, roleId, hero.serverId, sid, hid, param);
+        await calculateCeWithHero(HERO_SYSTEM_TYPE.INIT, roleId, hero.serverId, sid, hid, {...hero, ...param});
         // if(param.job > 0) {
         //     await calculateCe(HERO_SYSTEM_TYPE.STAGEUP, roleId, hero.serverId, sid, param, {}, { hid });
 

game-server/app/servers/role/handler/heroHandler.ts

@@ -580,7 +580,7 @@ export class HeroHandler {
             job: dicNewJob.jobid, 
             ePlace: newEplace
         }
-        let { curHero } = await calculateCeWithHero(HERO_SYSTEM_TYPE.SKIN, roleId, serverId, sid, hero.hid, update);
+        let { curHero } = await calculateCeWithHero(HERO_SYSTEM_TYPE.SKIN, roleId, serverId, sid, hero.hid, update, { hero });
         let resultHero = new HeroParam(curHero);
         return resResult(STATUS.SUCCESS, { curHero: {...pick(resultHero, ['hid', 'skins', 'skinId', 'job', 'talent', 'usedTalentPoint']), ePlace: newEplace }});
     }

game-server/app/servers/role/handler/roleHandler.ts

@@ -44,7 +44,7 @@ export class RoleHandler {
         
 
         let { roleName } = msg;
-        let role = await RoleModel.findByRoleId(roleId, 'roleName hasInit title teraphs', true);
+        let role = await RoleModel.findByRoleId(roleId, 'roleName hasInit title teraphs lv', true);
         if (role.hasInit) return resResult(STATUS.ROLE_HAS_INIT);
 
         let checkName = await RoleModel.checkName(roleName, serverId);

game-server/app/services/playerCeService.ts

@@ -59,11 +59,12 @@ export async function calculateCes(type: HERO_SYSTEM_TYPE, roleId: string, serve
     switch (type) {
         case HERO_SYSTEM_TYPE.INIT:
             {
-                for(let [hid, { skinId, lv, quality, star, starStage, colorStar, colorStarStage, job, jobStage,  }] of heroUpdates) {
+                for(let [hid, { skinId, lv, quality, star, starStage, colorStar, colorStarStage, job, jobStage, skins }] of heroUpdates) {
                     calCe.setHeroBase(hid, skinId);
                     calCe.setHeroLv(hid, lv);
                     calCe.setHeroStar(hid, job, quality, star, starStage, colorStar, colorStarStage);
                     calCe.setJob(hid, job, jobStage);
+                    calCe.setTalent(hid, skins)
                 }
                 console.log('####### roleUpdate', param.isInitRole, roleUpdate)
                 if(param.isInitRole) {

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

@@ -214,7 +214,7 @@ export class CalCe {
     // 第一次获得皮肤
     public setAddSkin(skinId: number) {
         let addSkin = gameData.fashion.get(skinId);
-        for (let { id, number: val } of addSkin.globalAttr) {
+        for (let { id, number: val } of addSkin.actorAttr) {
             let globalAttr = this.data.getGlobalAttrById(id);
             globalAttr.skin += val;
         }

gm-server/app/service/users.ts

@@ -305,8 +305,8 @@ export default class GMUsers extends Service {
         }
         let list = heroes.map(cur => {
             let roleCe = roleMap.get(cur.roleId);
-            let obj = roleCe.attributes.find(ccur => ccur.hid == cur.hid);
+            let obj = roleCe?.attributes?.find(ccur => ccur.hid == cur.hid);
-            return {...cur, calculatedAttr: obj.attrs, env: ctx.app.config.realEnv}
+            return {...cur, calculatedAttr: obj?.attrs||[], env: ctx.app.config.realEnv}
         })
 
         return ctx.service.utils.resResult(STATUS.SUCCESS, { list, total })