From 1f5697bdd21cf2f8b63669101f35d4a5a62b61ae Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Mon, 18 Jan 2021 17:18:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/PetHandler.ts | 5 ++++-
 src/rooms/logic/skill/Skill.ts        | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts
index 620a53a..6d93db2 100644
--- a/src/rooms/logic/Handler/PetHandler.ts
+++ b/src/rooms/logic/Handler/PetHandler.ts
@@ -244,9 +244,11 @@ export class PetHandler {
 
         let n = -value;
 
+        let hv = 0;
         for( let [k, v] of this._effhalos){
             if(v > 0){
                 n += v;
+                hv -= v;
                 if(n >= 0){
                     this._effhalos.set(k, n);
                     break;
@@ -261,7 +263,7 @@ export class PetHandler {
             return -value;
         }
 
-        return this.addBaseAP(n, from);
+        return hv + this.addBaseAP(n, from);
     };
 
     public addBaseAP(value: number, from: PetHandler): number{
@@ -284,6 +286,7 @@ export class PetHandler {
                 this.dataChanged(from);
                 this.addHP(tmp, from);
             }else{
+                this._baseap = 0;
                 this.dataChanged(from);
                 this.die();
             }
diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts
index c3357b6..12833cb 100644
--- a/src/rooms/logic/skill/Skill.ts
+++ b/src/rooms/logic/skill/Skill.ts
@@ -322,9 +322,9 @@ export class Skill {
     };
 
     _real_trigger(param: SkillParam, cb?: any) {
-        if(!this._sts){
-            this._sts = this.getTargets(param);
-        }
+        // if(!this._sts){
+        //     this._sts = this.getTargets(param);
+        // }
 
         let res = TriggerManager.onTrigger(this, param, this._sts);
 

From c5d9e635b7472561ac494767cd90c0f6d8cf2c6c Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Mon, 18 Jan 2021 17:23:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E5=85=89=E7=8E=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/PetHandler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts
index 6d93db2..47084a2 100644
--- a/src/rooms/logic/Handler/PetHandler.ts
+++ b/src/rooms/logic/Handler/PetHandler.ts
@@ -254,7 +254,7 @@ export class PetHandler {
                     break;
                 }else{
                     this._effhalos.set(k, 0);
-                    n += v;
+                    // n += v;
                 }
             }
         }