2399 【1.3】【bug】组队，队伍异常

hxp

2018-11-21 02e239516553e6401b531de8cd540c4cbbc6ca40

2399 【1.3】【bug】组队，队伍异常

 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py

@@ -639,6 +639,8 @@


Def_PlayerKey_PlayerFromPID = "PlayerFromPID"  #pid



Def_PDict_LoginMapID = "LoginMapID"  #登录处理时的地图ID



Def_PlayerKey_OnGotoMergeServerTick = "OnGotoMergeServerTick"  #即将跳转到跨服服务器的时间



Def_OnlineType = "onlinetype"   # 在线情况 区分脱机挂在线    C++也在用修改需通知


 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py

@@ -97,6 +97,8 @@
#  @remarks 登陆顺序, PlayerLogin->PlayerLoadMapState(PlayerLoginLoadMapOK), 此处未设置初始化状态

def __Func_PlayerLogin(curPlayer, tick):

    

    GameWorld.Log("__Func_PlayerLogin mapID=%s" % curPlayer.GetMapID(), curPlayer.GetPlayerID())

    curPlayer.SetDict(ChConfig.Def_PDict_LoginMapID, curPlayer.GetMapID())

    #玩家在线时间初始化

    InitPlayerOnLineTime(curPlayer, tick)

    #玩家响应信息初始化

@@ -767,7 +769,7 @@
    #改到mapServer登录成功通知

    #Sync_PyServerDataTimeToClient(curPlayer, tick)

    

    #PlayerTeam.OnPlayerReadMapOK(curPlayer, tick)

    PlayerTeam.OnPlayerReadMapOK(curPlayer, tick)

    

    #刷新人物日期状态

    PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)


 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py

@@ -1886,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

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

##组队玩家切换地图