From d2751c692ef6534e5f5690080d285d41e0080d68 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 10 九月 2018 21:17:43 +0800
Subject: [PATCH] 3224 【开发】boss技能cd重置和回血同步(技能CD及召唤兽只在boss重生或boss血量满血时才重置);

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

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 c4a5642..4154392 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -3090,10 +3090,13 @@
         curNPC = self.__Instance
         #清除状态
         self.__ClearNPCAllState(False)
-        #初始化召唤兽
-        self.__InitNPCSummon()
-        #重置技能CD
-        self.__NormalNPCInItCD()
+        #只在重生或者满血的状态下才重置以下内容
+        if isReborn or GameObj.GetHP(curNPC) >= GameObj.GetMaxHP(curNPC):
+            #初始化召唤兽
+            self.__InitNPCSummon()
+            #重置技能CD
+            self.__NormalNPCInItCD()
+            
         #重刷属性
         self.RefreshNPCState(isReborn=isReborn)
         #通知血量, 复活的情况不通知血量,由NPC出现包通知

--
Gitblit v1.8.0