fix bug 远征显示下一关等

gm-server/app/service/users.ts

@@ -24,6 +24,7 @@ import Counter from '@db/Counter';
 import { STATUS } from '@consts/statusCode';
 import { getGoodById } from '@pubUtils/gamedata';
 import { ITID } from '@consts/consts';
+import Actor from '@pubUtils/actor';
 
 /**
  * Test Service
@@ -342,32 +343,15 @@ export default class GMUsers extends Service {
       let { lv } = hero;
 
       let dicHero = ctx.service.utils.getHeroById(hid);
-      let { hp, hp_up, atk, atk_up, matk, matk_up, def, def_up, mdef, mdef_up } = dicHero;
 
-      let ce = ctx.service.utils.calculateCE({hid, lv});
+      let actor = new Actor();
+      actor.initHero(hero);
+      let ce = actor.calculateCE();
+      let attribute = actor.getAttributeJson();
       let heroInfo = {
         actorId: dicHero.heroId,
         actorName: dicHero.name,
-        attribute: {
-            hp: hp + lv * hp_up, 
-            atk: atk + lv * atk_up,
-            matk: matk + lv * matk_up, 
-            def: def + lv * def_up, 
-            mdef: mdef + lv * mdef_up, 
-            agi: 0, 
-            luk: 0, 
-            speed: 0, 
-            hit: 0, 
-            cri: 0, 
-            flee: 0, 
-            antCri: 0, 
-            damageIncrease: 0, 
-            damageDecrease: 0, 
-            defIgnore: 0, 
-            bloodSuck: 0, 
-            ap: 0
-        },
-        lv,
+        attribute, lv,
         ce
       };