From 8f59f6b184a719653c4e8ee4ba2f3c8f69b88a72 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 28 Dec 2020 14:46:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20role=E8=A1=A8=E7=9A=84globalCeAt?=
 =?UTF-8?q?tr=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/pubUtils/playerCe.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared/pubUtils/playerCe.ts b/shared/pubUtils/playerCe.ts
index c71edb17d..01721b377 100644
--- a/shared/pubUtils/playerCe.ts
+++ b/shared/pubUtils/playerCe.ts
@@ -86,7 +86,7 @@ export async function calPlayerCeAndSave(roleId: string, heros: Array<HeroType>,
     let incPlayerCe = 0;
     let pushHeros = new Array<{hid: number, ce: number, incHeroCe: number}>();
     let role = await RoleModel.findByRoleId(roleId);
-    if(!role.globalCeAttr) role.globalCeAttr = new CeAttr();
+    if(!role.globalCeAttr) role.globalCeAttr = new CeAttrRole();
     let originalAttr = role.globalCeAttr;
 
     let reIncAttr: CeAttrRole = {}; // role表属性增量
@@ -666,7 +666,7 @@ function calHeroCeWhenJewelOff(hero: HeroType, args: Array<number>) {
 export async function reCalAllHeroCe(roleId: string, type: number, args:Array<number>) {
     let reIncAttr: CeAttrRole = {}; 
     let role = await RoleModel.findByRoleId(roleId);
-    if(!role.globalCeAttr) role.globalCeAttr = new CeAttr();
+    if(!role.globalCeAttr) role.globalCeAttr = new CeAttrRole();
     let pushHeros:Array<{hid:number, ce:number, incHeroCe:number}> = []
     if (type == 1) {//获得皮肤
         reIncAttr = calHeroAddSkin(args, role.globalCeAttr);
@@ -684,7 +684,7 @@ export async function reCalAllHeroCe(roleId: string, type: number, args:Array<nu
             if (attrName == '_id')
                 continue;
             let heroAttrData: CeAttrData = hero.ceAttr[attrName]||new CeAttrData();
-            let globalAttrData: CeAttrData = role.globalCeAttr[attrName];
+            let globalAttrData: CeAttrDataRole = role.globalCeAttr[attrName];
             let attrNumber = (heroAttrData.fixUp + (heroAttrData.equipUp||0) + globalAttrData.fixUp) * HERO_CE_RATIO + heroAttrData.base *(HERO_CE_RATIO + heroAttrData.ratioUp + globalAttrData.ratioUp) ;
             heroCe += attrNumber * getAttrCeRatio(attrName);
         }