Merge branch 'second' of git.kingsome.cn:node/card_svr into second

src/rooms/logic/Handler/PetHandler.ts

@@ -85,7 +85,7 @@ export class PetHandler {
                 param.edd_cnt, this._baseap);
         }
         
-        this._ceilBaseAP();
+        // this._ceilBaseAP();
 
         this._skills.length = 0;
 
@@ -102,8 +102,8 @@ export class PetHandler {
         this.born(param);
     };
 
-    private _ceilBaseAP(){
+    private _I(v: number): number{
-        this._baseap = Math.ceil(this._baseap);
+        return Math.ceil(v);
     };
 
     private _isEnhancePower(enid: number){
@@ -251,7 +251,7 @@ export class PetHandler {
                 this.die();
             }
         }else{
-            this._ceilBaseAP();
+            // this._ceilBaseAP();
             this.dataChanged();
         }
 
@@ -484,8 +484,8 @@ export class PetHandler {
         let obj = new PetInfo();
         obj.id = this._id,
         obj.isHero =  this._isHero,
-        obj.ap = this._baseap,
+        obj.ap = this._I(this._baseap),
-        obj.extAp = this.getEffHaloV(),
+        obj.extAp = this._I(this.getEffHaloV()),
         obj.pos = this._idx,
         obj.player = this._owner.getId(),
         obj.harmReduce = this._exredhurt,

src/rooms/logic/Handler/PlayerHandler.ts

@@ -267,8 +267,8 @@ export class PlayerHandler {
         return this._self.addEM(value);
     };
 
-    public getEMRatio(): number{
+    public getEM(): number{
-        return this._totalem/100;
+        return this._totalem;
     };
 
     public onEMChanged(value: number){

src/rooms/logic/skill/Skill.ts

@@ -501,8 +501,7 @@ export class Skill {
         if(this._type != SkillType.MAGIC){
             return effvalue;
         }
-        let ev = effvalue;
+        let ev = this._owner.getEM();
-        ev *= this._owner.getEMRatio();
         return effvalue + ev;
     };