From 4716c4d6d3ad2ea1d7fa13359429132264f22da4 Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Fri, 8 Jan 2021 19:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E8=83=BD=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/BattleHandler.ts | 1 +
 src/rooms/logic/Handler/PetHandler.ts    | 4 ++++
 src/rooms/logic/Handler/PlayerHandler.ts | 4 ++++
 src/rooms/logic/skill/Skill.ts           | 4 +++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index 312b324..36838e8 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -467,6 +467,7 @@ export class BattleHandler {
                         this.checkPets(this._cachePets);
                         this._cachePets.length = 0;
                     }, nt);
+                    nt += 100;
                 }else{
                     this.onUpdatePets(this._cachePets, null);
                     this.checkPets(this._cachePets);
diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts
index 82cd94e..7a4ade6 100644
--- a/src/rooms/logic/Handler/PetHandler.ts
+++ b/src/rooms/logic/Handler/PetHandler.ts
@@ -403,6 +403,10 @@ export class PetHandler {
         this._owner.onPetDied(this);
     };
 
+    public canAttack(){
+        return this._bakTotalap? true: this.totalAP() > 0;
+    };
+
     public attack(sk: Skill, apet: PetHandler, param: SkillParam, ev: number = 0, isAtkBack: boolean = false){
         !isAtkBack && this._owner.onAttackBefore(this, param);
 
diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index aa478ae..ce39b22 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -389,6 +389,10 @@ export class PlayerHandler {
         this._self && this._self.taunt();
     };
 
+    public canAttack(){
+        return this._self? this._self.canAttack(): false;
+    };
+
     public canBeKill(subhp: number): boolean{
         if(subhp >= 0){
             return false;
diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts
index ab73af6..18d1e5d 100644
--- a/src/rooms/logic/skill/Skill.ts
+++ b/src/rooms/logic/skill/Skill.ts
@@ -348,7 +348,8 @@ export class Skill {
         let ncount = this.getFinalValue(EnhanceCustomType.RELEASE_TIMES, this._data.release_times, 
             this._data.release_timesmax, param.edd_cnt, true);
         let sp;
-        if(param.srcpet != this._petowner){
+        // if(param.srcpet != this._petowner){
+        if(false){
             sp = param.clone();
             sp.srcpet = this._petowner;
             sp.srcplayer = sp.srcpet._owner;
@@ -690,6 +691,7 @@ export class Skill {
             let v = effvalue;
             let oldhp = tgt.dst.getHP();
             let dst = tgt.dsttype == GameUnitType.PLAYER? (tgt.dst as PlayerHandler)._self: (tgt.dst as PetHandler);
+            // let n =  obj.canAttack()? obj.attack(this, dst, param, v, isAtkBack): 1;
             let n = obj.attack(this, dst, param, v, isAtkBack);
             if(n <= 0){
                 tgt.success(SkillEffectType.HURT_POWER, n);