SnxxServerCode.git

			@@ -15,6 +15,7 @@
			#"""Version = 2015-07-17 13:50"""
			#---------------------------------------------------------------------

			import PlayerAssist
			#import PlayerRequest
			import GameWorldBoss
			import IpyGameDataPY
			@@ -463,7 +464,6 @@
			invitePack.NameLen = len(invitePack.Name)
			invitePack.LV = curPlayer.GetLV()
			invitePack.Job = curPlayer.GetJob()
			invitePack.JobLevel = PlayerControl.GetJobRank(curPlayer)
			invitePack.RealmLV = curPlayer.GetOfficialRank()
			invitePack.TagMapID = tagMapID
			invitePack.TagMapEx = tagMapEx
			@@ -524,7 +524,6 @@
			requestPack.NameLen = len(requestPack.Name)
			requestPack.LV = curPlayer.GetLV()
			requestPack.Job = curPlayer.GetJob()
			requestPack.JobLevel = PlayerControl.GetJobRank(curPlayer)
			requestPack.RealmLV = curPlayer.GetOfficialRank()
			NetPackCommon.SendFakePack(tagPlayer, requestPack)

			@@ -592,6 +591,11 @@
			PlayerControl.NotifyCode(curPlayer, "TeamEnterForbid")
			return False

			if PlayerControl.GetAssistTagPlayerID(curPlayer):
			#协助中无法执行此操作
			PlayerControl.NotifyCode(curPlayer, "InAssistForbid")
			return False

			if tagPlayer:
			tagPlayerID = tagPlayer.GetPlayerID()
			#检查ID
			@@ -614,6 +618,11 @@
			return False
			if IsInEnterFBTeamPrepare(tagTeamID):
			PlayerControl.NotifyCode(curPlayer, "TeamEnterForbid")
			return False

			if PlayerControl.GetAssistTagPlayerID(tagPlayer):
			#对方协助中，无法执行此操作
			PlayerControl.NotifyCode(curPlayer, "TagInAssistForbid")
			return False

			return True
			@@ -1392,6 +1401,7 @@
			'''
			#GameWorld.DebugLog("玩家队伍变更通用处理,curTeamID=%s" % curPlayer.GetTeamID())
			GameWorldBoss.OnPlayerTeamChange(curPlayer)
			PlayerAssist.OnPlayerTeamChange(curPlayer)
			return

			#---------------------------------------------------------------------
			@@ -1596,7 +1606,6 @@
			nearbyPlayer.NameLen = len(nearbyPlayer.Name)
			nearbyPlayer.LV = player.GetLV()
			nearbyPlayer.Job = player.GetJob()
			nearbyPlayer.JobLevel = PlayerControl.GetJobRank(player)
			nearbyPlayer.RealmLV = player.GetOfficialRank()
			nearbyPlayerInfo.PlayerList.append(nearbyPlayer)

			@@ -1685,7 +1694,6 @@
			sceneTeam.NameLen = len(sceneTeam.PlayerName)
			sceneTeam.LV = leader.GetLV()
			sceneTeam.Job = leader.GetJob()
			sceneTeam.JobLevel = PlayerControl.GetJobRank(leader)
			sceneTeam.RealmLV = leader.GetOfficialRank()
			sceneTeam.MemberCount = team.GetTeamPlayerCount()
			sceneTeam.TagMapID = team.GetTagMapID()
			@@ -2058,7 +2066,6 @@
			tagMapTeam.NameLen = len(tagMapTeam.PlayerName)
			tagMapTeam.LV = leader.GetLV()
			tagMapTeam.Job = leader.GetJob()
			tagMapTeam.JobLevel = PlayerControl.GetJobRank(leader)
			tagMapTeam.RealmLV = leader.GetOfficialRank()
			tagMapTeam.MemberCount = team.GetTeamPlayerCount()
			tagMapTeam.ReqMinLV = team.GetReqMinLV()
			@@ -2319,7 +2326,8 @@
			return

			playerLV = curPlayer.GetLV()
			matchMapIDList = [ChConfig.Def_FBMapID_DuJie, ChConfig.Def_FBMapID_MunekadoTrial, ChConfig.Def_FBMapID_QueenRelics, ChConfig.Def_FBMapID_ChaosDemon]
			matchMapIDList = [ChConfig.Def_FBMapID_DuJie, ChConfig.Def_FBMapID_MunekadoTrial, ChConfig.Def_FBMapID_QueenRelics, ChConfig.Def_FBMapID_ChaosDemon,
			ChConfig.Def_FBMapID_KillDevil]

			teamMgr = GameWorld.GetTeamManager()
			for matchMapID in matchMapIDList:
			@@ -2777,8 +2785,6 @@
			["TeamEnterCDMe", "TeamEnterCDAll"], "SingleEnterCD"],
			ShareDefine.EntFBAskRet_LVLimit:[["TeamMatchingLVMe", "TeamMatchingLVAll"],
			["TeamEnterLVMe", "TeamEnterLVAll"], "FbLV"],
			ShareDefine.EntFBAskRet_JobRankLimit:[["TeamMatchingJobMe", "TeamMatchingJobAll"],
			["TeamEnterJobMe", "TeamEnterJobAll"], "SingleEnterJob"],
			ShareDefine.EntFBAskRet_NoTicket:[["TeamMatchingTicketMe", "TeamMatchingTicketAll"],
			["TeamEnterTicketMe", "TeamEnterTicketAll"], "GeRen_chenxin_157069"],
			ShareDefine.EntFBAskRet_Dead:[["TeamMatchingDeadMe", "TeamMatchingDeadAll"],
			@@ -2795,6 +2801,10 @@
			["TeamEnterDefaultMe", "TeamEnterDefaultAll"], "SingleEnterDefaul"],
			ShareDefine.EntFBAskRet_Sit:[["TeamMatchingSITMe", "TeamMatchingSITAll"],
			["TeamEnterSITMe", "TeamEnterSITAll"], "Carry_lhs_697674"],
			ShareDefine.EntFBAskRet_CrossPKMatching:[["CrossMatching9", "CrossMatching10"],
			["CrossMatching11", "CrossMatching12"], "CrossMatching8"],
			ShareDefine.EntFBAskRet_InCrossMap:[["CrossMap6", "CrossMap7"],
			["CrossMap8", "CrossMap9"], "CrossMap5"],
			ShareDefine.EntFBAskRet_Other:[["TeamMatchingDefaultMe", "TeamMatchingDefaultAll"],
			["TeamEnterDefaultMe", "TeamEnterDefaultAll"], "SingleEnterDefaul"],
			}