From 93591a53c1cdabb4e595fa4d5c36eb89998a6e6f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 25 五月 2019 18:50:56 +0800
Subject: [PATCH] 6805 【后端】【2.0】副本前端化(召唤木桩由玩家召唤兽改为普通NPC)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py
index e60831f..f47b37a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py
@@ -110,9 +110,12 @@
         #执行击杀NPC逻辑
         curPlayer = PetControl.GetPetOwner(curPet)  # 宠物主人
         
+        if not ChNPC.OnCheckCanDie(curPlayer, curTagNPC, skill, tick):
+            return
+        
         if curPlayer != None:
-            FBLogic.DoFB_Player_KillNPC(curPlayer, curTagNPC, tick)
             NPCCommon.OnPlayerAttackNPCDie(curTagNPC, curPlayer, skill)
+            FBLogic.DoFB_Player_KillNPC(curPlayer, curTagNPC, tick)
             
         curTagNormalNPCControl = NPCCommon.NPCControl(curTagNPC)
         curTagNormalNPCControl.SetKilled()

--
Gitblit v1.8.0