From 5aeeb7133a2e988ef8337c3e9d400e4bfe25c097 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 03 九月 2018 20:14:31 +0800
Subject: [PATCH] Fix: 1832 仙盟联赛分组出现整组未分组情况;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 e5e9691..d18af34 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)
         
     
     # 清除队伍成员伤血列表
@@ -2878,6 +2879,7 @@
     
     def __GetTeamHurtNPCPlayerIDList(self, refreshPoint, teamID, tick):
         
+        curNPC = self.__Instance
         teamHurtPlayerIDList = []
         # 如果没有在线队员在有效范围内,则进一步判断离线队员是否有伤血保护中的
         playerMgr = GameWorld.GetPlayerManager()
@@ -2898,7 +2900,8 @@
                         continue
                     
                 #if curTeamPlayer.GetHP() > 0 and self.GetIsInRefreshPoint(curTeamPlayer.GetPosX(), curTeamPlayer.GetPosY(), refreshPoint):
-                if self.GetIsInRefreshPoint(curTeamPlayer.GetPosX(), curTeamPlayer.GetPosY(), refreshPoint):
+                if self.GetIsInRefreshPoint(curTeamPlayer.GetPosX(), curTeamPlayer.GetPosY(), refreshPoint) \
+                    and AttackCommon.CheckKillNPCByCnt(curTeamPlayer, curNPC, False):
                     #GameWorld.DebugLog("有队员在boss范围内,保留队伍伤血!teamID=%s,playerID=%s" % (teamID, curTeamPlayer.GetPlayerID()))
                     teamHurtPlayerIDList.append(playerID)
             else:

--
Gitblit v1.8.0