From 41587993270111246f1d61e90ba43cdabca377dc Mon Sep 17 00:00:00 2001
From: mamengke01 <794347210@qq.com>
Date: Sat, 12 Dec 2020 11:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E5=B0=86=E7=BE=81=E7=BB=8A=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AE=AD=E7=BB=83=E6=88=98?=
 =?UTF-8?q?=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/playerCeService.ts | 6 +++---
 shared/db/Hero.ts                           | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/game-server/app/services/playerCeService.ts b/game-server/app/services/playerCeService.ts
index 7453e6ccc..2a3b0298b 100644
--- a/game-server/app/services/playerCeService.ts
+++ b/game-server/app/services/playerCeService.ts
@@ -118,14 +118,14 @@ export function calHeroStarIncAttr (hero: Hero, addSeidList: Array<number>, remo
 export function calHeroTrainIncAttr(hero: any) {
     let res = {};
     let attrName: string = HEROTARIN[hero.jobStage];
-    res[attrName] = {};
+    res[attrName] ={fixUp: hero.CeAttr[attrName].fixUp, base: hero.CeAttr[attrName].base, ratioUp: hero.CeAttr[attrName].ratioUp};
     let currentJob = getJobInfoById(hero.job);
     if (currentJob.grade > 1) {
         let jobGradeAndClass = getJobByGradeAndClass(currentJob.job_class, currentJob.grade - 1);
         let lastJob = getJobInfoById(jobGradeAndClass.jobid);
-        res[attrName].fixUp = (currentJob[attrName] - lastJob[attrName]) * HERO_CE_RATIO;
+        res[attrName].fixUp += (currentJob[attrName] - lastJob[attrName]) * HERO_CE_RATIO;
     } else {
-        res[attrName].fixUp = currentJob[attrName] * HERO_CE_RATIO;
+        res[attrName].fixUp += currentJob[attrName] * HERO_CE_RATIO;
     }
     return res;
 }
diff --git a/shared/db/Hero.ts b/shared/db/Hero.ts
index eac9ad606..e97cbb13e 100644
--- a/shared/db/Hero.ts
+++ b/shared/db/Hero.ts
@@ -13,9 +13,7 @@ class Connect {
     shipId: number;
     @prop({ required: true })
     level: number;
-
 }
-
 class Skin {
     @prop({ required: true })
     id: number;