SnxxServerCode.git

			@@ -28,6 +28,7 @@
			import NetPackCommon
			import PyDataManager
			import PlayerControl
			import GameXiangong
			import PyGameData
			import ChConfig
			import ChPlayer
			@@ -2262,6 +2263,7 @@
			scenePlayer = ChPyNetSendPack.tagGCFamilyGCZBatScenePlayer()
			scenePlayer.PlayerID = playerID
			scenePlayer.Name = joinMember.playerName
			scenePlayer.Job = joinMember.job
			scenePlayer.Face = joinMember.face
			scenePlayer.FacePic = joinMember.facePic
			clientPack.PlayerInfoList.append(scenePlayer)
			@@ -2545,6 +2547,9 @@
			return

			__clientServer_GetAward_Ret(zoneID, playerID, serverGroupID, actID, awardType, billRank, playerAwardItemList)

			serverIDList = actInfo.get(ShareDefine.ActKey_ServerIDRangeList, [])
			GameXiangong.AddXiangongPlayerByItem(playerAwardItemList, playerID, serverIDList, billRank)
			return

			def __clientServer_GetAward_Ret(zoneID, playerID, serverGroupID, actID, awardType, awardValue, awardItemList):
			@@ -2616,6 +2621,9 @@
			paramList = [billRank]
			PlayerCompensation.SendMailByKey("FamilyGCZAwardHurt", [playerID], playerAwardItemList, paramList, crossMail=True)

			serverIDList = ipyData.GetServerIDRangeList()
			GameXiangong.AddXiangongPlayerByItem(playerAwardItemList, playerID, serverIDList, billRank)

			# 仙盟积分名次奖励
			if not joinMember.awardState&pow(2, AwwardType_FamilyScore):
			joinMember.awardState = joinMember.awardState \| pow(2, AwwardType_FamilyScore)
			@@ -2628,6 +2636,9 @@
			if playerAwardItemList:
			paramList = [billRank]
			PlayerCompensation.SendMailByKey("FamilyGCZAwardScore", [playerID], playerAwardItemList, paramList, crossMail=True)

			serverIDList = ipyData.GetServerIDRangeList()
			GameXiangong.AddXiangongPlayerByItem(playerAwardItemList, playerID, serverIDList, billRank)

			# 竞猜奖励
			if not joinMember.awardState&pow(2, AwwardType_Guess):
			@@ -2917,6 +2928,7 @@
			defMem.PlayerID = playerID
			defMem.Name = joinMember.playerName
			defMem.FamilyLV = joinMember.fmLV
			defMem.Job = joinMember.job
			defMem.Face = joinMember.face
			defMem.FacePic = joinMember.facePic
			defMem.FightPower = joinMember.fightPower % ChConfig.Def_PerPointValue