SnxxServerCode.git

			@@ -50,6 +50,7 @@
			import PlayerBossReborn
			import PlayerFairyCeremony
			import PlayerNewFairyCeremony
			import GameLogic_CrossDemonKing
			import PlayerWeekParty
			import PlayerActLogin
			import FamilyRobBoss
			@@ -2020,6 +2021,9 @@
			if not zoneIpyData:
			return
			zoneID = zoneIpyData.GetZoneID()
			GameWorld.GetGameWorld().SetGameWorldDict(ShareDefine.Def_Notify_WorldKey_GameWorldBossRebornCross % (zoneID, bossID), 0)
			elif dataMapID == ChConfig.Def_FBMapID_CrossDemonKing:
			zoneID = GameLogic_CrossDemonKing.GetCurFBLineZoneID()
			GameWorld.GetGameWorld().SetGameWorldDict(ShareDefine.Def_Notify_WorldKey_GameWorldBossRebornCross % (zoneID, bossID), 0)
			else:
			GameWorld.GetGameWorld().SetGameWorldDict(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID, 0)
			@@ -4101,10 +4105,10 @@
			mapID = GameWorld.GetMap().GetMapID()
			mapID = FBCommon.GetRecordMapID(mapID)
			isGameBoss = ChConfig.IsGameBoss(curNPC)
			if mapID in [ChConfig.Def_FBMapID_MunekadoTrial, ChConfig.Def_FBMapID_DemonKing]:
			return
			if isGameBoss:
			GameWorld.Log("NPC开始掉落: npcID=%s,dropPlayerID=%s" % (npcID, dropPlayer.GetPlayerID()), dropPlayer.GetPlayerID())
			if mapID == ChConfig.Def_FBMapID_MunekadoTrial:
			return
			ipyDrop = GetNPCDropIpyData(npcID)
			if not ipyDrop:
			if isGameBoss:
			@@ -5109,7 +5113,7 @@
			tagObj = GameWorld.GetObj(ownerID, IPY_GameWorld.gotPlayer)

			elif dropOwnerType == ChConfig.DropOwnerType_Family:
			ownerInfo = FamilyRobBoss.RefreshFamilyOwnerNPCHurt(curNPC, tick, refreshInterval)
			ownerInfo = FamilyRobBoss.RefreshFamilyOwnerNPCHurt(self, curNPC, tick, refreshInterval)
			if ownerInfo:
			tagObj, ownerFamilyID = ownerInfo
			ownerType, ownerID = ChConfig.Def_NPCHurtTypeFamily, ownerFamilyID
			@@ -5174,7 +5178,7 @@
			GameWorld.DebugLog("竞争归属玩家不在boss范围里，移除归属!playerID=%s" % ownerID)
			return

			GameWorld.DebugLog("竞争归属玩家归属正常！playerID=%s" % ownerID)
			#GameWorld.DebugLog("竞争归属玩家归属正常！playerID=%s" % ownerID)
			return owner

			def __GetMaxHurtTeamPlayer(self, teamID, isDead):