From 19542a6633574dd2e625d648cec0ebcdaea89c56 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 八月 2018 17:18:46 +0800
Subject: [PATCH] Fix: 修复活动结束后归属不消失的bug;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py        |    1 +
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.py |    5 ++++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py            |    7 +++++++
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py
index 3d2fdf0..138d27e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py
@@ -97,6 +97,13 @@
     callFunc(curNPC,HurtType,HurtID)
     return
 
+def OnNPCSetDead(curNPC):
+    callFunc = GameWorld.GetExecFunc(NPCAI, "AIType_%d.%s"%(curNPC.GetAIType(), "OnNPCSetDead"))
+    if callFunc == None:
+        return None
+    callFunc(curNPC)
+    return
+
 def OnNPCReborn(curNPC):
     FBLogic.OnNPCRebornInFB(curNPC)
     callFunc = GameWorld.GetExecFunc(NPCAI, "AIType_%d.%s"%(curNPC.GetAIType(), "OnNPCReborn"))
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.py
index 271e488..2c5e032 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.py
@@ -362,9 +362,12 @@
 #  @return None
 def OnDie(curNPC, HurtType, HurtID):
     AICommon.DoNPCUseSkillOnDie(curNPC)
+    return
+
+def OnNPCSetDead(curNPC):
     __DelayBossDropOwnerBuff(curNPC)
     return
-    
+
 ## npc攻击逻辑
 #  @param curNPC 当前npc
 #  @param tagID curNPCAngryID
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index e5e9691..6591c07 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -1991,6 +1991,7 @@
         
             if GetDropOwnerType(curNPC) == ChConfig.DropOwnerType_Family:
                 FamilyRobBoss.ClearFamilyOwnerBossHurt(curNPC)
+        ChNPC.OnNPCSetDead(curNPC)
         
     
     # 清除队伍成员伤血列表

--
Gitblit v1.8.0