SnxxServerCode.git

			@@ -41,6 +41,7 @@
			import PlayerViewCache
			import GameWorldBoss
			import AuctionHouse
			import PlayerAssist
			import PlayerTalk
			import PlayerTeam

			@@ -135,6 +136,22 @@
			#GameWorld.DebugLog(' 随机假仙盟异常已存在的随机数大于还需要的随机个数lackFakeCnt=%s,fakeIDList=%s'%(lackFakeCnt, fakeIDList))
			return []
			return fakeIDList

			def GetFamilyNameFakeIndex(familyName):
			## 获取仙盟名是否是系统随机出来的假仙盟名
			# @return: 0-不是, >0 对应的 fakeIndex
			fakeFamilyNameList = IpyGameDataPY.GetFuncEvalCfg('FakeFamilyName')
			randomCnt = IpyGameDataPY.GetFuncCfg('FakeFamilyName', 2)
			for i in xrange(randomCnt):
			fakeID = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_FakeFamilyIndex % i)
			if not fakeID:
			continue
			nameIndex = fakeID - 1
			if nameIndex >=0 and nameIndex < len(fakeFamilyNameList):
			fakeName = GameWorld.GbkToCode(fakeFamilyNameList[nameIndex])
			if familyName == fakeName:
			return fakeID
			return 0

			def SyncFakeFamilyInfo(curPlayer=None):
			'''通知假仙盟信息'''
			@@ -268,6 +285,10 @@
			#-设置家族成员属性
			DoPlayerJionFamily(curFamily, curPlayer, IPY_GameServer.fmlLeader)
			creatFamilyTimes = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerCreatFamilyTimes)
			# 如果是手动指定仙盟名创建的，判断是否在系统随机的假仙盟里，如果是的话就当做创建系统分配的假仙盟处理
			if familyName and not fakeIndex:
			fakeIndex = GetFamilyNameFakeIndex(familyName)
			GameWorld.DebugLog(" 玩家手动输入创建仙盟名与系统随机的假仙盟名相同，默认当做创建假仙盟!fakeIndexID=%s" % (fakeIndex))
			#扣道具(前N个战盟并且假编号在随机编号里不要钱)
			if fakeIndex and fakeIndex in fakeIndexList:
			PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_FakeFamilyIndex % fakeIndexList.index(fakeIndex), 0)
			@@ -405,6 +426,8 @@
			PlayerFamilyParty.NotifyFamilyPartyQuestion(jionPlayer)
			#通知守卫人皇信息
			PlayerFamilySWRH.NotifySWRHInfo(jionPlayer, curFamily.GetID())
			#通知仙盟协助信息
			PlayerAssist.SyncFamilyAssist(jionPlayer)
			#oss记录加入家族信息
			DataRecordPack.DR_PlayerJoinFamily(jionPlayer, curFamily.GetID(), curFamily.GetName(), curFamily.GetCount())
			return
			@@ -608,7 +631,7 @@
			#===============================================================================================
			return

			def SendFamilyFakePack(familyID, clientPack):
			def SendFamilyFakePack(familyID, clientPack, excludePlayerIDList=[]):
			## 广播家族成员PY封包
			family = GameWorld.GetFamilyManager().FindFamily(familyID)
			if not family:
			@@ -617,8 +640,11 @@
			for index in xrange(family.GetCount()):
			member = family.GetAt(index)
			memPlayer = member.GetPlayer()
			if memPlayer:
			NetPackCommon.SendFakePack(memPlayer, clientPack)
			if not memPlayer:
			continue
			if excludePlayerIDList and memPlayer.GetPlayerID() in excludePlayerIDList:
			continue
			NetPackCommon.SendFakePack(memPlayer, clientPack)
			return

			def Sync_PyAllFamilyInfo(curPlayer, allPageCnt, viewPage, startIndex, endIndex):
			@@ -1465,10 +1491,10 @@
			PlayerFamilyAction.AddFamilyActionNote(tagPlayerName, curFamily.GetID(), ShareDefine.Def_ActionType_FamilyEvent,
			[ShareDefine.Def_FamilyActionEvent_MemberChange, ShareDefine.Def_FamilyMemberChange_KickOut], tick)
			#删除玩家
			curFamily.DeleteMember(tagPlayerID)
			__DoPlayerLeaveFamilyByID(curFamily, tagPlayerID)

			curFamily.DeleteMember(tagPlayerID)
			tagPlayer = playerManager.FindPlayerByID(tagMemberID)

			__DoPlayerLeaveFamilyByID(curFamily, tagPlayerID, tagPlayer)
			#玩家在线, 设置这个玩家的属性
			PlayerForceLeaveFamily(tagPlayer, tick)

			@@ -1565,7 +1591,7 @@
			curFamily.DeleteMember(curMember.GetPlayerID())
			#玩家在线, 设置这个玩家的属性
			PlayerForceLeaveFamily(curPlayer, tick)
			__DoPlayerLeaveFamilyByID(curFamily, curPlayerID)
			__DoPlayerLeaveFamilyByID(curFamily, curPlayerID, curPlayer)

			DataRecordPack.DR_PlayerLeaveFamily(curPlayer, curFamily.GetID(), curFamily.GetName(), curFamily.GetCount(),
			familyLV, curPlayer.GetPlayerID(), curPlayer.GetName(), familyLV, updTime)
			@@ -1583,12 +1609,13 @@
			# @param curFamily 离开的家族
			# @param leavePlayerID 离开的玩家ID
			# @return None
			def __DoPlayerLeaveFamilyByID(curFamily, leavePlayerID):
			def __DoPlayerLeaveFamilyByID(curFamily, leavePlayerID, tagPlayer=None):
			PlayerFamilyAction.DelFamilyOfficerModelEquip(curFamily.GetID(), leavePlayerID)
			# 玩家战盟名变更处理
			__OnFamilyNameChange(leavePlayerID, '')
			AddFamilyIDToFightPowerChangeList(curFamily.GetID())
			PlayerViewCache.OnPlayerFamilyChange(leavePlayerID, 0, "")
			PlayerAssist.OnPlayerLeaveFamily(curFamily.GetID(), leavePlayerID, tagPlayer)
			if leavePlayerID in PyGameData.g_autoViceleaderDict.get(curFamily.GetID(),[]):
			PyGameData.g_autoViceleaderDict[curFamily.GetID()].remove(leavePlayerID)
			return
			@@ -1709,8 +1736,10 @@
			addFamilyMoney, curFamily.GetFamilyActiveValue(), addFamilyActiveValue)

			#通知客户端
			#curFamily.Broadcast_FamilyChange()
			curPlayer.Sync_FamilyInfo()
			if addFamilyHornor:
			curFamily.Broadcast_FamilyChange()
			else:
			curPlayer.Sync_FamilyInfo()

			#金钱变更时才通知
			if addFamilyMoney != 0: