From d5e9bbcf96cf98d767ba073774b1ee287569659d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 18:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py | 128 ++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 37 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
index 50b3640..2ce78a2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
@@ -22,6 +22,7 @@
import IPY_GameServer
import ChGameToMapPyPack
import ChPyNetSendPack
+import DataRecordPack
import PlayerControl
import ShareDefine
import PyGameData
@@ -301,13 +302,14 @@
#设置当前玩家为队长
curNewTeamMenber = curNewTeam.GetMemberByID(curPlayerID)
if curNewTeamMenber == None:
- GameWorld.ErrLog("设置当前创建队伍玩家为队长, 找不到玩家!", curPlayerID)
+ GameWorld.ErrLog("设置当前创建队伍玩家为队长, 找不到玩家!teamID=%s" % teamID, curPlayerID)
+ DR_Team("CreateError", teamID, {"Leader":curPlayerID, "tagMapID":tagMapID, "tagMapEx":tagMapEx, "reqMinLV":reqMinLV, "reqMaxLV":reqMaxLV})
return
__SetTeamLV(curNewTeamMenber, IPY_GameServer.tmlLeader, False)
if isSync:
Sync_TeamMemberInfo(curNewTeam)
- SyncMapServerTeamInfo(curNewTeam)
+ SyncMapServerTeamInfo(curNewTeam, "Create", {"Leader":curPlayerID, "tagMapID":tagMapID, "tagMapEx":tagMapEx, "reqMinLV":reqMinLV, "reqMaxLV":reqMaxLV})
DelPlayerIDFromMatchingList(curPlayer)
return curNewTeam
@@ -828,7 +830,7 @@
#通知MapServerd队伍变更
#teamPlayer.MapServer_Sync_Team(__GetPlayerTeamLV(teamPlayer))
#joinPlayer.MapServer_Sync_Team(__GetPlayerTeamLV(joinPlayer))
- SyncMapServerTeamInfo(tagTeam)
+ SyncMapServerTeamInfo(tagTeam, "Join", {"teamPlayer":teamPlayer.GetPlayerID(), "joinPlayer":joinPlayer.GetPlayerID()})
#通知
#EnterProcession <%S%>加入了队伍！ 改为 GeRen_chenxin_543685
@@ -866,22 +868,29 @@
teamMember = curTeam.GetMemberByID(curPlayer.GetPlayerID())
return teamMember.GetTeamLV()
-def SyncMapServerTeamInfo(curTeam):
+def SyncMapServerTeamInfo(curTeam, eventName="", drDict={}):
'''同步队伍信息到 MapServer 给所有在线队员
@note: 需要全队同步的情况：创建队伍、队员加入、退出、上线、下线、切换地图、VIP等级变更、VIP到期时间更新
'''
if not curTeam:
+ DR_Team("%s_Error" % eventName, 0, drDict)
return
teamID = curTeam.GetTeamID()
syncPlayerList = []
memInfoList = []
+ memList = []
for index in xrange(curTeam.GetMemberCount()):
memPlayer = curTeam.GetMemberPlayer(index)
memberInfo = curTeam.GetMemberInfo(index)
- if not memPlayer or not memberInfo:
+ if not memberInfo:
+ memList.append(["not memberInfo"])
+ continue
+ if not memPlayer:
+ memList.append(["not memPlayer"])
continue
memPlayerID = memPlayer.GetPlayerID()
if not memPlayerID:
+ memList.append(["not memPlayerID"])
continue
memInfo = ChGameToMapPyPack.tagGMTeamMemInfo()
memInfo.PlayerID = memPlayerID
@@ -889,6 +898,7 @@
memInfo.VIPLV = PlayerControl.GetValidVIPLV(memPlayer)
memInfoList.append(memInfo)
syncPlayerList.append([memPlayer, memberInfo.GetTeamLV()])
+ memList.append([memPlayerID, memPlayer.GetTeamID(), memberInfo.GetTeamLV(), memPlayer.GetMapID(), memPlayer.GetFBID()])
for player, teamLV in syncPlayerList:
teamInfo = ChGameToMapPyPack.tagGMTeamInfo()
@@ -899,6 +909,28 @@
teamInfo.MemCnt = len(teamInfo.MemInfoList)
NetPackCommon.SendPyPackToMapServer(player.GetLineNO(), player.GetRealMapID(), teamInfo)
+ drDict.update({"MemList":memList})
+ DR_Team(eventName, teamID, drDict)
+ return
+
+def SyncMapServerPlayerNoTeam(curPlayer):
+ ## 同步地图玩家没有队伍，切图时调用
+ teamInfo = ChGameToMapPyPack.tagGMTeamInfo()
+ teamInfo.PlayerID = curPlayer.GetPlayerID()
+ teamInfo.TeamID = 0
+ teamInfo.TeamLV = 0
+ teamInfo.MemInfoList = []
+ teamInfo.MemCnt = len(teamInfo.MemInfoList)
+ NetPackCommon.SendPyPackToMapServer(curPlayer.GetLineNO(), curPlayer.GetRealMapID(), teamInfo)
+ return
+
+def SyncMapServerPlayerLeaveTeam(curPlayer, teamID):
+ ## 同步地图玩家离开队伍
+ leavePack = ChGameToMapPyPack.tagGMPlayerLeaveTeam()
+ leavePack.PlayerID = curPlayer.GetPlayerID()
+ leavePack.CopyMapID = curPlayer.GetFBID()
+ leavePack.TeamID = teamID
+ NetPackCommon.SendPyPackToMapServer(curPlayer.GetLineNO(), curPlayer.GetRealMapID(), leavePack)
return
#---------------------------------------------------------------------
@@ -1197,7 +1229,7 @@
#通知客户端队伍成员属性变更
#curTeam.Sync_TeamState()
Sync_TeamMemberInfo(curTeam)
- SyncMapServerTeamInfo(curTeam)
+ SyncMapServerTeamInfo(curTeam, "ChangeMemTeamLV", {"tagPlayerID":tagPlayerID, "memberLV":memberLV})
return
#---------------------------------------------------------------------
#===============================================================================
@@ -1327,7 +1359,8 @@
#GameServer清除玩家队伍ID为空
delPlayer.SetTeam(None)
#通知MapServerd队伍变更, 在mapserver构建目前队伍
- delPlayer.MapServer_Sync_Team(0)
+ #delPlayer.MapServer_Sync_Team(0)
+ SyncMapServerPlayerLeaveTeam(delPlayer, curTeam.GetTeamID())
#玩家离开副本
delPlayer.MapServer_LeaveFB()
if IsTeamMatchingPlayer(curTeam.GetTeamID()):
@@ -1337,7 +1370,7 @@
#广播队伍刷新
#curTeam.Sync_TeamState()
Sync_TeamMemberInfo(curTeam)
- SyncMapServerTeamInfo(curTeam)
+ SyncMapServerTeamInfo(curTeam, "Leave", {"delPlayerID":delPlayerID, "msg":msg})
#无人在线
if curTeam.GetTeamPlayerCount() <= 0:
@@ -1381,7 +1414,8 @@
#GameServer玩家队伍为空
curPlayer.SetTeam(None)
#通知MapServerd队伍变更
- curPlayer.MapServer_Sync_Team(0)
+ #curPlayer.MapServer_Sync_Team(0)
+ SyncMapServerPlayerLeaveTeam(curPlayer, curTeam.GetTeamID())
__DoLogic_PlayerTeamChange(curPlayer)
if curMember.GetTeamLV() != IPY_GameServer.tmlLeader:
@@ -1751,7 +1785,7 @@
DelTeamIDFromTagMapTeamDict(curTeamID)
DelTeamIDFromMatchingList(curTeam)
- SyncMapServerTeamInfo(curTeam)
+ SyncMapServerTeamInfo(curTeam, "LogOff", {"playerID":playerID})
return
def OnPlayerLoginRefreshTeam(curPlayer, tick):
@@ -1781,11 +1815,12 @@
if curTeam == None:
return
- if curTeam.GetTeamPlayerCount() <= 1:
- #补救完毕, 队伍中只有一个人, 删除这个队伍
- GameWorld.Log('玩家(%s)仍然有队伍(%s), 补救完毕, 队伍中只有一个人, 删除这个队伍' % (playerID, curTeamID))
- DeleteTeam(curTeam, tick)
- return
+ #允许存在单人队伍，暂屏蔽该逻辑
+# if curTeam.GetTeamPlayerCount() <= 1:
+# #补救完毕, 队伍中只有一个人, 删除这个队伍
+# GameWorld.Log('玩家(%s)仍然有队伍(%s), 补救完毕, 队伍中只有一个人, 删除这个队伍' % (playerID, curTeamID))
+# DeleteTeam(curTeam, tick)
+# return
GameWorld.Log('玩家(%s)仍然有队伍(%s), 补救' % (playerID, curTeamID))
curPlayer.SetTeamID(curTeamID)
@@ -1796,7 +1831,8 @@
curPlayer.SetTeam(None)
curPlayer.Sync_LeaveTeam(1)
#通知MapServer, 玩家已经队伍了, 刷新玩家的TeamID
- curPlayer.MapServer_Sync_Team(0)
+ #curPlayer.MapServer_Sync_Team(0)
+ SyncMapServerPlayerLeaveTeam(curPlayer, curTeamID)
gameMap = GameWorld.GetMap(curPlayer.GetMapID())
if gameMap and gameMap.GetMapFBType() == ChConfig.fbtTeam:
curPlayer.MapServer_LeaveFB()
@@ -1826,7 +1862,7 @@
#通知队伍成员玩家信息
#curTeam.Sync_TeamState()
Sync_TeamMemberInfo(curTeam)
- SyncMapServerTeamInfo(curTeam)
+ SyncMapServerTeamInfo(curTeam, "Login", {"playerID":playerID})
if not PlayerControl.GetIsTJG(curPlayer):
#通知自己队伍玩家上线
@@ -1850,22 +1886,26 @@
GameWorld.DebugLog("Team.OnPlayerReadMapOK", curPlayer.GetPlayerID())
- # 登录逻辑已处理，这里不重复处理
- #===============================================================================================
- # if curPlayer.GetTeamID() == 0:
- # return
- #
- # curTeam = GameWorld.GetTeamManager().FindTeam(curPlayer.GetTeamID())
- # if curTeam == None:
- # #通知MapServer, 玩家已经队伍了, 刷新玩家的TeamID
- # curPlayer.MapServer_Sync_Team(0)
- # return
- #
- # SyncMapServerTeamInfo(curTeam)
- # #curTeamMember = curTeam.GetMemberByID(curPlayer.GetPlayerID())
- # ##通知MapServerd队伍变更
- # #curPlayer.MapServer_Sync_Team(curTeamMember.GetTeamLV())
- #===============================================================================================
+ if curPlayer.GetTeamID() == 0:
+ return
+
+ curTeam = GameWorld.GetTeamManager().FindTeam(curPlayer.GetTeamID())
+ if curTeam == None:
+ #通知MapServer, 玩家已经队伍了, 刷新玩家的TeamID
+ #curPlayer.MapServer_Sync_Team(0)
+ return
+
+ mapID = curPlayer.GetMapID()
+ loginMapID = curPlayer.GetDictByKey(ChConfig.Def_PDict_LoginMapID)
+ if loginMapID and mapID != loginMapID:
+ GameWorld.Log("Team.OnPlayerReadMapOK 地图与登录时地图不一致，重新同步一次!loginMapID=%s,mapID=%s"
+ % (loginMapID, mapID), curPlayer.GetPlayerID())
+ Sync_TeamMemberInfo(curTeam)
+ SyncMapServerTeamInfo(curTeam, "ReadMapOK", {"playerID":curPlayer.GetPlayerID()})
+
+ #curTeamMember = curTeam.GetMemberByID(curPlayer.GetPlayerID())
+ ##通知MapServerd队伍变更
+ #curPlayer.MapServer_Sync_Team(curTeamMember.GetTeamLV())
return True
#---------------------------------------------------------------------
##组队玩家切换地图
@@ -1892,7 +1932,7 @@
curTeam = curPlayer.GetTeam()
if curTeam != None:
- SyncMapServerTeamInfo(curTeam)
+ SyncMapServerTeamInfo(curTeam, "ChangeMap", {"playerID":playerID, "mapID":mapID})
#通知客户端更新
curPlayer.Sync_TeamMemberChangeMap() # 09 13 队伍成员切换地图#tagTeamMemberChangeMap
@@ -1917,7 +1957,8 @@
# 玩家进入组队副本，则停止匹配
if gameMap.GetMapFBType() == ChConfig.fbtTeam:
DelPlayerIDFromMatchingList(curPlayer)
-
+ SyncMapServerPlayerNoTeam(curPlayer) # 没有队伍的时候切图也通知地图
+
return
def PlayerTeamMemberRefresh(curPlayer, refreshType, value, tick):
@@ -1951,7 +1992,7 @@
elif refreshType == IPY_GameServer.CDBPlayerRefresh_OfficialRank:
teamMember.SetPlayerRealmLV(value)
elif refreshType in [IPY_GameServer.CDBPlayerRefresh_VIPLv, IPY_GameServer.CDBPlayerRefresh_ExAttr9]:
- SyncMapServerTeamInfo(curTeam)
+ SyncMapServerTeamInfo(curTeam, "Refresh", {"refreshType":refreshType, "value":value})
else:
return
@@ -2781,6 +2822,12 @@
if memPlayerID in causePlayerDict:
PlayerControl.NotifyCode(memPlayer, notifyList[0], [askMapID])
+ if notifyRet in [ShareDefine.EntFBAskRet_NoEnterCnt, ShareDefine.EntFBAskRet_EnterCD, ShareDefine.EntFBAskRet_NoTicket]:
+ failPack = ChPyNetSendPack.tagGCEnterTeamFBFailReason()
+ failPack.MapID = askMapID
+ failPack.AskType = retAskType
+ failPack.Reason = notifyRet
+ NetPackCommon.SendFakePack(memPlayer, failPack)
else:
PlayerControl.NotifyCode(memPlayer, notifyList[1], [askMapID, causePlayerName])
return
@@ -3055,4 +3102,11 @@
if curInviteCnt >= inviteCnt:
break
- return
\ No newline at end of file
+ return
+
+def DR_Team(eventName, teamID, dataDict):
+ drDict = {"EventName":eventName, "TeamID":teamID}
+ drDict.update(dataDict)
+ DataRecordPack.SendEventPack("Team_GameServer", drDict)
+ return
+
--
Gitblit v1.8.0