From 7a303f2f1b93d679bee1c8f418f9d34845112c1d Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 28 十一月 2018 20:45:12 +0800
Subject: [PATCH] 2523 【BUG】【1.3】无法寻宝(符印解锁判断修改)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py |   16 +++++++++++++++-
 1 files changed, 15 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 a575402..4fcdbd0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py
@@ -90,6 +90,14 @@
 #  @remarks 函数详细说明.
 def OnNPCDie(curNPC,HurtType,HurtID):
     PassiveBuffEffMng.GetPassiveEffManager().RemovePassiveEff((curNPC.GetID(), IPY_GameWorld.gotNPC))
+    
+    # 召唤NPC死亡触发被动技能
+    owner = NPCCommon.GetSummonNPCOwner(IPY_GameWorld.gotPlayer, curNPC)
+    if owner:
+        owner.SetDict("summondie", curNPC.GetNPCID())
+        PassiveBuffEffMng.OnPassiveSkillTrigger(owner, None, None, ChConfig.TriggerType_SummonDie,
+                                                GameWorld.GetGameWorld().GetTick())
+        
     callFunc = GameWorld.GetExecFunc(NPCAI, "AIType_%d.%s"%(curNPC.GetAIType(), "OnDie"))
     if callFunc == None:
         return None
@@ -126,7 +134,13 @@
     callFunc(atkObj, curNPC, skill, tick)
     
     PlayerActivity.OnAttackNPCActivity(atkObj, curNPC)
-    
+
+def OnCheckCanDie(atkObj, curNPC, skill, tick):
+    callFunc = GameWorld.GetExecFunc(NPCAI, "AIType_%d.%s"%(curNPC.GetAIType(), "OnCheckCanDie"))
+    if callFunc == None:
+        return True
+    return callFunc(atkObj, curNPC, skill, tick)
+
 #---------------------------------------------------------------------
 ## 初始化NPC 
 #  @param tick 当前时间

--
Gitblit v1.8.0