hxp
2018-11-13 a0948adde92689bac0f0566cc257fd848fdfa184
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)
@@ -188,6 +197,17 @@
        GameWorld.DebugLog("__AddTeamVIPBuff sameMapVIPLV=%s,isOK=%s" % (sameMapVIPLV, isOK), playerID)
    return
def RefreshTeamVIPBuff_OnNoTeam(curPlayer, tick):
    ## 刷新队伍VIPbuff,注意该函数只能无队伍时触发
    sameMapVIPLV = 0
    playerVIPLV = curPlayer.GetVIPLv()
    teamVIPBuffIpyData = PlayerVip.GetVipPrivilegeData(ChConfig.VIPPrivilege_TeamVIPBuff)
    if teamVIPBuffIpyData and hasattr(teamVIPBuffIpyData, "GetVIP%d" % playerVIPLV) \
        and getattr(teamVIPBuffIpyData, "GetVIP%d" % playerVIPLV)():
        sameMapVIPLV += 1
    __RefreshTeamVIPBuff(curPlayer, sameMapVIPLV, tick)
    return
## 刷新玩家队伍ID 
#  @param curPlayer 当前玩家
#  @param teamID 队伍ID
@@ -195,34 +215,36 @@
#  @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)
            
        sameMapVIPLV = 0
        playerVIPLV = curPlayer.GetVIPLv()
        teamVIPBuffIpyData = PlayerVip.GetVipPrivilegeData(ChConfig.VIPPrivilege_TeamVIPBuff)
        if teamVIPBuffIpyData and hasattr(teamVIPBuffIpyData, "GetVIP%d" % playerVIPLV) \
            and getattr(teamVIPBuffIpyData, "GetVIP%d" % playerVIPLV)():
            sameMapVIPLV += 1
        __RefreshTeamVIPBuff(curPlayer, sameMapVIPLV, tick)
        RefreshTeamVIPBuff_OnNoTeam(curPlayer, tick)
        return
    
    #--------------世界服务器组队表中有队伍
    
    # !!!队伍管理器在分线内的  需要获取分线的队伍管理器,不然队伍都是在1线创建
    curGameWorld = IPY_GameWorld.IPY_GameWorld(curPlayer.GetCopyMapID())
    curGameWorld = IPY_GameWorld.IPY_GameWorld(playerCopyMapID)
    curMapTeam = curGameWorld.GetTeamManager().FindTeam(teamID)
    
    if curMapTeam == None:
@@ -231,11 +253,15 @@
        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:
        dataDict["MemberCount"] = 0 if not curMapTeam else curMapTeam.GetMemberCount()
        DR_Team("RefreshPlayerTeamID_Update", teamID, dataDict)
        
    return
@@ -277,11 +303,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自己的副本状态
@@ -291,6 +318,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:
@@ -343,6 +372,7 @@
        #无队伍玩家,不处理
        return
    
    GameWorld.DebugLog("队伍成员离开地图: temaID=%s,isDisconnect=%s,copyMapID=%s" % (curTeam.GetTeamID(), isDisconnect, curPlayer.GetCopyMapID()), curPlayer.GetPlayerID())
    __CleanTeamEffect(curPlayer, tick)
    #设定当前玩家队伍为None, 否则在玩家状态刷新的时候, 可能取到乱指针
    curPlayer.SetTeam(None)
@@ -351,13 +381,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)
@@ -417,4 +452,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