fix:3477【后端】【1.0.15】【1.1.0】娲皇遗迹新增Vip特权：副本购买次数

xdh

2018-09-11 d9f13c5e9a02f31cad2f58357acd3140809e88c1

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

@@ -31,6 +31,7 @@


import copy

import time

import random



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

TeamFBAskType_Match = 0 # 组队副本进入询问类型 - 匹配

@@ -2486,7 +2487,7 @@
        return

    

    # 覆盖添加

    PyGameData.g_teamFBEnterAskDict[teamID] = [askVer, askType, askMapID, askMapEx, askPlayerRetDict]

    PyGameData.g_teamFBEnterAskDict[teamID] = [askVer, askType, askMapID, askMapEx, askPlayerRetDict, tick]

    

    sendCMD = str([teamID, askVer, askType, askMapID, askMapEx])

    for memPlayerID, mapInfo in askPlayerMapDict.items():

@@ -2519,7 +2520,7 @@
        if retTeamID not in PyGameData.g_teamFBEnterAskDict:

            GameWorld.DebugLog("    该队伍的请求信息记录已不存在，不处理!retTeamID=%s" % retTeamID, playerID)

            return

        askVer, askType, askMapID, askMapEx, askPlayerRetDict = PyGameData.g_teamFBEnterAskDict[retTeamID]

        askVer, askType, askMapID, askMapEx, askPlayerRetDict = PyGameData.g_teamFBEnterAskDict[retTeamID][:5]

        if askVer != retAskVer or askType != retAskType or askMapID != retAskMapID or askMapEx != retAskMapEx:

            GameWorld.DebugLog("    非本队伍请求版本，不处理！askVer=%s, askType=%s, askMapID=%s, askMapEx=%s" 

                               % (askVer, askType, askMapID, askMapEx), playerID)

@@ -2896,6 +2897,17 @@
    '''准备队伍异常处理

    后端延长15秒，防范前端异常情况导致卡队伍准备界面，超时时强制取消准备队伍

    '''

    if PyGameData.g_teamFBEnterAskDict:

        for teamID, askInfo in PyGameData.g_teamFBEnterAskDict.items():

            if askInfo:

                askVer, askType, askMapID, askMapEx, askPlayerRetDict, askTick = askInfo

                # 询问的做个10s预防，超时的话移除

                if tick - askTick <= 10000:

                    continue

            PyGameData.g_teamFBEnterAskDict.pop(teamID)

            GameWorld.ErrLog("队伍进入副本询问超时，强制移除询问状态! teamID=%s,askVer=%s,askType=%s,askMapID=%s,askMapEx=%s,askPlayerRetDict=%s,askTick=%s,tick=%s" 
                             % (teamID, askVer, askType, askMapID, askMapEx, askPlayerRetDict, askTick, tick))

            
    if not PyGameData.g_prepareTeamDict:

        return

    

@@ -2915,3 +2927,44 @@
            SyncTeamEnterFBPrepareInfo(curTeam, askMapID, askMapEx, memStateDict, True)

    return



#// B9 0A 按条件邀请玩家加入队伍 #tagCGInvitePlayerJoinTeamByLV

#

#struct    tagCGInvitePlayerJoinTeamByLV

#{

#    tagHead        Head;

#    WORD        LVLimit;        // 目标玩家大于等于此等级

#    BYTE        InviteCnt;    // 邀请玩家个数

#};

def OnInvitePlayerJoinTeamByLV(index, clientData, tick):

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

    lvlimit = clientData.LVLimit

    inviteCnt = clientData.InviteCnt

    
    curPlayerTeam = curPlayer.GetTeam()

    if not curPlayerTeam:

        return

    curInviteCnt = 0 #当前邀请数量

    playerManager = GameWorld.GetPlayerManager()

    playerCount = playerManager.GetActivePlayerCount()

    if playerCount < 2:

        return

    indexList = range(playerCount)

    random.shuffle(indexList)

    for i in indexList:

        tagPlayer = playerManager.GetActivePlayerAt(i)

        if tagPlayer == None or not tagPlayer.GetInitOK():

            continue

        if PlayerControl.GetIsTJG(tagPlayer):

            continue

        if tagPlayer.GetPlayerID() == curPlayer.GetPlayerID():

            continue

        if tagPlayer.GetLV() < lvlimit:

            continue

        if tagPlayer.GetTeam():

            continue

        if InvitePlayerJoinTeamReq(curPlayer, tagPlayer, curPlayerTeam, tick):

            curInviteCnt +=1

        if curInviteCnt >= inviteCnt:

            break

        
    return