2250 【1.2】队伍分线成员管理异常；（添加队伍变更跟踪流向）

hxp

2018-11-12 2a29dc5550dc92459f0a0affd5b9c4ac1fee950c

2250 【1.2】队伍分线成员管理异常；（添加队伍变更跟踪流向）

 ServerPython/CoreServerGroup/GameServer/Script/NetPackCommon.py

@@ -205,7 +205,8 @@
        

    except Exception:

        Log("python自定义封包解析失败~~~~~\r\n%s" % traceback.format_exc())

        #raise Exception("python自定义封包解析失败~~~~~\r\n%s" % traceback.format_exc())

        if GameWorld.GetGameWorld().GetDebugLevel():

            raise Exception("python自定义封包解析失败~~~~~\r\n%s" % traceback.format_exc())

        return 

    

    


 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,8 @@
        teamInfo.MemCnt = len(teamInfo.MemInfoList)

        NetPackCommon.SendPyPackToMapServer(player.GetLineNO(), player.GetRealMapID(), teamInfo)

        

    drDict.update({"MemList":memList})

    DR_Team(eventName, teamID, drDict)

    return



#---------------------------------------------------------------------

@@ -1197,7 +1209,7 @@
    #通知客户端队伍成员属性变更

    #curTeam.Sync_TeamState()

    Sync_TeamMemberInfo(curTeam)

    SyncMapServerTeamInfo(curTeam)

    SyncMapServerTeamInfo(curTeam, "ChangeMemTeamLV", {"tagPlayerID":tagPlayerID, "memberLV":memberLV})

    return

#---------------------------------------------------------------------

#===============================================================================

@@ -1337,7 +1349,7 @@
    #广播队伍刷新

    #curTeam.Sync_TeamState()

    Sync_TeamMemberInfo(curTeam)

    SyncMapServerTeamInfo(curTeam)

    SyncMapServerTeamInfo(curTeam, "Leave", {"delPlayerID":delPlayerID, "msg":msg})

    

    #无人在线

    if curTeam.GetTeamPlayerCount() <= 0:

@@ -1751,7 +1763,7 @@
            DelTeamIDFromTagMapTeamDict(curTeamID)

            DelTeamIDFromMatchingList(curTeam)

                

    SyncMapServerTeamInfo(curTeam)

    SyncMapServerTeamInfo(curTeam, "LogOff", {"playerID":playerID})

    return



def OnPlayerLoginRefreshTeam(curPlayer, tick):

@@ -1826,7 +1838,7 @@
    #通知队伍成员玩家信息

    #curTeam.Sync_TeamState()

    Sync_TeamMemberInfo(curTeam)

    SyncMapServerTeamInfo(curTeam)

    SyncMapServerTeamInfo(curTeam, "Login", {"playerID":playerID})

    

    if not PlayerControl.GetIsTJG(curPlayer):

        #通知自己队伍玩家上线

@@ -1892,7 +1904,7 @@
    curTeam = curPlayer.GetTeam()

    

    if curTeam != None:

        SyncMapServerTeamInfo(curTeam)

        SyncMapServerTeamInfo(curTeam, "ChangeMap", {"playerID":playerID, "mapID":mapID})

        #通知客户端更新

        curPlayer.Sync_TeamMemberChangeMap() # 09 13 队伍成员切换地图#tagTeamMemberChangeMap

        

@@ -1951,7 +1963,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

    

@@ -3062,3 +3074,10 @@
            break

        

    return


def DR_Team(eventName, teamID, dataDict):

    drDict = {"EventName":eventName, "TeamID":teamID}

    drDict.update(dataDict)

    DataRecordPack.SendEventPack("Team_GameServer", drDict)

    return




 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTeam.py

@@ -25,6 +25,7 @@
import ChConfig

import SkillCommon

import IPY_GameWorld

import DataRecordPack

#import PlayerTruck

import ShareDefine

import SkillShell

@@ -82,30 +83,36 @@
#  @return None or True

#  @remarks 函数详细说明.

def __Func_GameServer_OnTeam(index, tick):

    recvPack = IPY_GameWorld.IPY_MTeamRefresh()

    packPlayerID = recvPack.GetPlayerID()

    teamID = recvPack.GetTeamID()

    teamLV = recvPack.GetTeamLV()

    dataDict = {"packPlayerID":packPlayerID, "teamLV":teamLV, "index":index}

    
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    if curPlayer == None:

        GameWorld.Log("地图服务器寻找组队玩家失败index = "+str(index))

        DR_Team("OnTeamError", teamID, dataDict, "curPlayer is None")

        return

    

    if curPlayer.IsEmpty():

        GameWorld.Log("地图服务器寻找组队玩家失败index = %d, 玩家为空"%index)

        DR_Team("OnTeamError", teamID, dataDict, "curPlayer IsEmpty")

        return

    

    recvPack = IPY_GameWorld.IPY_MTeamRefresh()

    
    if recvPack.GetPlayerID() != curPlayer.GetID():

    if packPlayerID != curPlayer.GetID():

        #不是给自己的封包

        GameWorld.DebugLog("不是给自己的封包! packPlayerID=%s" % recvPack.GetPlayerID(), curPlayer.GetPlayerID())

        GameWorld.DebugLog("不是给自己的封包! packPlayerID=%s" % packPlayerID, curPlayer.GetPlayerID())

        DR_Team("OnTeam", teamID, dataDict, "packPlayerID != curPlayerID(%s)" % curPlayer.GetID())

        return

    

    teamID = recvPack.GetTeamID()

    # 这个封包只处理teamID为0的情况， teamID不为0的情况在py包 GameServer_TeamInfo 处理

    if teamID:

        #GameWorld.DebugLog("OnTeam teamID=%s, 大于0不处理！" % teamID, curPlayer.GetPlayerID())

        return

    

    GameWorld.DebugLog("OnTeam teamID=%s, 玩家无队伍更新！" % teamID, curPlayer.GetPlayerID())

    RefreshPlayerTeamID(curPlayer, teamID, recvPack.GetTeamLV(), tick)

    RefreshPlayerTeamID(curPlayer, teamID, teamLV, tick)

    return True



#// 05 02 队伍信息刷新 #tagGMTeamInfo

@@ -130,10 +137,12 @@
    playerID = curPackData.PlayerID

    teamID = curPackData.TeamID

    teamLV = curPackData.TeamLV

    dataDict = {"playerID":playerID, "teamLV":teamLV}

    

    GameWorld.DebugLog("GameServer_TeamInfo playerID=%s,teamID=%s,teamLV=%s" % (playerID, teamID, teamLV), playerID)

    curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)

    if not curPlayer or curPlayer.IsEmpty():

        DR_Team("TeamInfo", teamID, dataDict, "curPlayer is None or empty")

        return

    

    RefreshPlayerTeamID(curPlayer, teamID, teamLV, tick)

@@ -206,19 +215,27 @@
#  @return None

#  @remarks 函数详细说明.

def RefreshPlayerTeamID(curPlayer, teamID, teamLV, tick):

    #playerID = curPlayer.GetPlayerID()

    playerID = curPlayer.GetPlayerID()

    playerTeamID = curPlayer.GetTeamID()

    #GameWorld.DebugLog("刷新玩家队伍信息: teamID=%s,playerTeamID=%s,teamLV=%s" % (teamID, playerTeamID, teamLV), playerID)

    playerCopyMapID = curPlayer.GetCopyMapID()

    playerTeamLV = curPlayer.GetTeamLV()

    GameWorld.DebugLog("刷新玩家队伍信息: playerTeamID=%s,playerCopyMapID=%s,teamID=%s,teamLV=%s" 
                       % (playerTeamID, playerCopyMapID, teamID, teamLV), playerID)

    curTeam = curPlayer.GetTeam()

    curPlayer.SetTeamID(teamID)

    curPlayer.SetTeamLV(teamLV)

    
    dataDict = {"playerID":playerID, "playerTeamID":playerTeamID, "playerCopyMapID":playerCopyMapID, 
                "playerTeamLV":playerTeamLV, "teamLV":teamLV}

    #--------------世界服务器组队表中无队伍

    if not teamID:

        if not playerTeamID and not curTeam:

            DR_Team("RefreshPlayerTeamID_Leave", teamID, dataDict, "not playerTeamID and not curTeam")

            #GameWorld.DebugLog("    玩家无队伍,无需处理！", playerID)

            pass

        else:

            #GameWorld.DebugLog("    玩家有队伍,处理玩家离队！", playerID)

            DR_Team("RefreshPlayerTeamID_Leave", teamID, dataDict)

            __OnLeaveTeam(curPlayer, tick)

            

        RefreshTeamVIPBuff_OnNoTeam(curPlayer, tick)

@@ -227,7 +244,7 @@
    #--------------世界服务器组队表中有队伍

    

    # ！！！队伍管理器在分线内的  需要获取分线的队伍管理器，不然队伍都是在1线创建

    curGameWorld = IPY_GameWorld.IPY_GameWorld(curPlayer.GetCopyMapID())

    curGameWorld = IPY_GameWorld.IPY_GameWorld(playerCopyMapID)

    curMapTeam = curGameWorld.GetTeamManager().FindTeam(teamID)

    

    if curMapTeam == None:

@@ -236,11 +253,14 @@
        if GameWorld.GetMap().GetMapFBType() == IPY_GameWorld.fbtTeam:

            curPlayer.SetCurrentFBProperty(teamID)

        #curMapTeam.SetTeamType(recvPack.GetTeamType())

        DR_Team("RefreshPlayerTeamID_Create", teamID, dataDict)

            

    if playerTeamID != teamID or not curTeam:

        isNewTeam = playerTeamID != teamID # 切地图/上线时teamID可能不变，但是team为None

        #GameWorld.DebugLog("    玩家当前无队伍,处理玩家进队！isNewTeam=%s" % isNewTeam, playerID)

        __OnEnterTeam(curPlayer, curMapTeam, isNewTeam, tick)

        __OnEnterTeam(curPlayer, curMapTeam, isNewTeam, tick, dataDict)

    else:

        DR_Team("RefreshPlayerTeamID_Update", teamID, dataDict)

        

    return



@@ -282,11 +302,12 @@
#  @param tick 当前时间

#  @return None

#  @remarks 函数详细说明.

def __OnEnterTeam(curPlayer, curMapTeam, isNewTeam, tick):

def __OnEnterTeam(curPlayer, curMapTeam, isNewTeam, tick, dataDict):

    teamID = curMapTeam.GetTeamID()

    memCount = curMapTeam.GetMemberCount()

    if memCount >= ShareDefine.Def_Team_MaxPlayerCount:

        GameWorld.ErrLog("队伍人数已满，玩家入队失败!teamID=%s,memCount=%s" % (teamID, memCount), curPlayer.GetPlayerID())

        DR_Team("RefreshPlayerTeamID_EnterError", teamID, dataDict, "memCount(%s) >= %s" % (memCount, ShareDefine.Def_Team_MaxPlayerCount))

        return

    

    #告诉GameServer自己的副本状态

@@ -296,6 +317,8 @@
    curPlayer.SetTeam(curMapTeam)

    curPlayer.SetTeamID(teamID)

    curMapTeam.AddMember(curPlayer)

    dataDict["MemberCount"] = curMapTeam.GetMemberCount()

    DR_Team("RefreshPlayerTeamID_Enter", teamID, dataDict)

    playerID = curPlayer.GetPlayerID()

    teamPlayerIDList = PyGameData.g_teamPlayerDict.get(teamID, [])

    if playerID not in teamPlayerIDList:

@@ -348,6 +371,7 @@
        #无队伍玩家,不处理

        return

    

    GameWorld.DebugLog("队伍成员离开地图: temaID=%s,isDisconnect=%s,copyMapID=%s" % (curTeam.GetTeamID(), isDisconnect, curPlayer.GetCopyMapID()), curPlayer.GetPlayerID())

    __CleanTeamEffect(curPlayer, tick)

    #设定当前玩家队伍为None, 否则在玩家状态刷新的时候, 可能取到乱指针

    curPlayer.SetTeam(None)

@@ -356,13 +380,18 @@
    

    teamID = curTeam.GetTeamID()

    playerID = curPlayer.GetPlayerID()

    dataDict = {"playerID":playerID, "isDisconnect":isDisconnect, "playerCopyMapID":curPlayer.GetCopyMapID()}

    #如果队伍无人,MapServer中删除队伍

    if curTeam.GetMemberCount() <= 1:

        GameWorld.GetTeamManager().DeleteTeam(teamID)

        dataDict["MemberCount"] = 0

        dataDict["DeleteTeam"] = 1

    else:

        #如果队伍还有其他人,离开队伍

        curTeam.DeleteMember(playerID)

        dataDict["MemberCount"] = curTeam.GetMemberCount()

        #GameWorld.Log("玩家下线 %d, 从队伍 %d 中删除玩家"%(curPlayer.GetPlayerID(), curTeam.GetTeamID()))

    DR_Team("PlayerLeaveMap", teamID, dataDict)

        

    if not isDisconnect:

        __DelPlayerIDFromTeamPlayer(playerID, True)

@@ -422,4 +451,9 @@
    FBLogic.GameServer_LeaveFB(curPlayer, tick)

    return



def DR_Team(eventName, teamID, dataDict, info=""):

    drDict = {"EventName":eventName, "TeamID":teamID, "Info":info}

    drDict.update(dataDict)

    DataRecordPack.SendEventPack("Team_%s" % GameWorld.GetMap().GetMapID(), drDict)

    return