From 06bede8421bd171e940308538d389f81f1632c50 Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Wed, 23 Dec 2020 11:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B3=95=E5=BC=BA=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/PetHandler.ts    | 12 ++++++------
 src/rooms/logic/Handler/PlayerHandler.ts |  4 ++--
 src/rooms/logic/skill/Skill.ts           |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts
index 54e5806..9b377f7 100644
--- a/src/rooms/logic/Handler/PetHandler.ts
+++ b/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(){
-        this._baseap = Math.ceil(this._baseap);
+    private _I(v: number): number{
+        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.extAp = this.getEffHaloV(),
+        obj.ap = this._I(this._baseap),
+        obj.extAp = this._I(this.getEffHaloV()),
         obj.pos = this._idx,
         obj.player = this._owner.getId(),
         obj.harmReduce = this._exredhurt,
diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index f0c9346..dc5d605 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -267,8 +267,8 @@ export class PlayerHandler {
         return this._self.addEM(value);
     };
 
-    public getEMRatio(): number{
-        return this._totalem/100;
+    public getEM(): number{
+        return this._totalem;
     };
 
     public onEMChanged(value: number){
diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts
index 459b1c6..f9cf98e 100644
--- a/src/rooms/logic/skill/Skill.ts
+++ b/src/rooms/logic/skill/Skill.ts
@@ -501,8 +501,7 @@ export class Skill {
         if(this._type != SkillType.MAGIC){
             return effvalue;
         }
-        let ev = effvalue;
-        ev *= this._owner.getEMRatio();
+        let ev = this._owner.getEM();
         return effvalue + ev;
     };