8585 【主干】【gt_1.101.1】【BT3】【bt3_1.100.1】【后端】竞技场（排行榜、匹配列表，对战记录战斗力支持超20亿；对战记录挑...

hxp

2021-09-01 01d734e87f81367d8cdcca7d69b0c8e75de17905

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldArena.py

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

import PlayerDBGSEvent

import ChPyNetSendPack

import DataRecordPack

import NetPackCommon

import IpyGameDataPY

import PyGameData

@@ -102,9 +103,71 @@
def GetArenaBillLV(billData): return billData.GetValue2()

def SetArenaBillLV(billData, lv): billData.SetValue2(lv)

def GetArenaBillScore(billData): return billData.GetCmpValue()

def GetArenaBillFightPower(billData): return billData.GetCmpValue2()

def SetArenaBillFightPower(billData, fightPower): billData.SetCmpValue2(fightPower)

                
def SetArenaBillScore(billData, score): return billData.SetCmpValue(score)

def GetArenaBillFightPower(billData): return billData.GetCmpValue2() * ShareDefine.Def_PerPointValue + billData.GetCmpValue3()

def SetArenaBillFightPower(billData, fightPower):

    billData.SetCmpValue2(fightPower / ShareDefine.Def_PerPointValue)

    billData.SetCmpValue3(fightPower % ShareDefine.Def_PerPointValue)

    return



def RepairArenaBillboardFightPower():

    ## 修正竞技场榜单的战力数据，支持20亿，bt3_1.100.1 下次大版本更新后可删除

    
    repairStateKey = "RepairArenaBillboardFightPower"

    repairState = PlayerDBGSEvent.GetDBGSTrig_ByKey(repairStateKey)

    if repairState:

        GameWorld.DebugLog("=== 已经修正竞技场榜单数据  ===")

        return

    
    GameWorld.Log("=== 修正竞技场榜单数据 Start ===")

    
    worldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)

    PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ArenaWorldLV, worldLV)

    GameWorld.Log("    SetDBGSTrig_ByKey %s=%s" % (PlayerDBGSEvent.Def_ArenaWorldLV, worldLV))

    
    robotMaxCount = IpyGameDataPY.GetFuncCfg("ArenaRobot", 1)

    __RandRobotLVList(robotMaxCount)

    GameWorld.Log("    PyGameData.g_arenaRobotLVList len=%s, %s" % (len(PyGameData.g_arenaRobotLVList), PyGameData.g_arenaRobotLVList))

    
    billBoard = GameWorld.GetBillboard().FindBillboard(ShareDefine.Def_BT_Arena)

    if not billBoard:

        return

    
    for index in xrange(billBoard.GetCount()):

        
        order = index + 1

        billBoardData = billBoard.At(index)

        if not billBoardData:

            continue

        
        playerID = billBoardData.GetID()

        fightPower = billBoardData.GetCmpValue2() # 旧战力只存在比较值2

        
        if playerID <= MaxRobotID:

            curLV = GetArenaBillLV(billBoardData)

            updLV = curLV

            if index < len(PyGameData.g_arenaRobotLVList):

                updLV = PyGameData.g_arenaRobotLVList[index]

            GameWorld.Log("    修正机器人等级: order=%s,playerID=%s,curLV=%s,updLV=%s" 
                          % (order, playerID, curLV, updLV))

            SetArenaBillLV(billBoardData, updLV)

            SetArenaBillFightPower(billBoardData, 0)

            continue

        
        curCache = PlayerViewCache.FindViewCache(playerID)

        if curCache:

            cacheDict = PlayerViewCache.GetCachePropDataDict(curCache)

            fightPower = cacheDict["FightPower"]

            
        SetArenaBillFightPower(billBoardData, fightPower)

        GameWorld.Log("    修正真玩家战力: order=%s,playerID=%s,fightPower=%s,cmpValue2=%s,cmpValue3=%s" 
                      % (order, playerID, fightPower, billBoardData.GetCmpValue2(), billBoardData.GetCmpValue3()))

        
    billBoard.Sort()

    PlayerDBGSEvent.SetDBGSTrig_ByKey(repairStateKey, 1)

    GameWorld.Log("=== 修正竞技场榜单的战力数据 OK ===")

    return



def OnServerStart():

    universalRecMgr = GameWorld.GetUniversalRecMgr()

    recDataList = universalRecMgr.GetTypeList(Def_RecType_ArenaBattleRecord)

@@ -148,8 +211,11 @@
            if billBoard.GetCount() > 0:

                robotMaxCount = IpyGameDataPY.GetFuncCfg("ArenaRobot", 1)

                PlayerBillboard.UpdateBillboardMaxCount(ShareDefine.Def_BT_Arena, robotMaxCount)

                __RandRobotLVList(robotMaxCount)

            else:

                __ResetArenaRobotBillboard()

                
    RepairArenaBillboardFightPower()

    return



def OnServerClose():

@@ -270,6 +336,7 @@
    # 删除对战记录

    GameWorld.GetUniversalRecMgr().Delete(Def_RecType_ArenaBattleRecord)

    PyGameData.g_arenaPlayerBattleRecDict = {}

    PyGameData.g_arenaPlayerMatchDict = {}

    

    # 更新新赛季信息

    if openServerDay <= customMaxServerDay and OSSeasonState == 0:

@@ -293,6 +360,11 @@
    robotMaxCount = IpyGameDataPY.GetFuncCfg("ArenaRobot", 1)

    GameWorld.Log("    重置初始化竞技场机器人榜单! robotMaxCount=%s" % robotMaxCount)

    PlayerBillboard.UpdateBillboardMaxCount(ShareDefine.Def_BT_Arena, robotMaxCount)

    
    PyGameData.g_arenaRobotLVList = []

    worldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)

    PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ArenaWorldLV, worldLV)

    GameWorld.Log("    worldLV=%s" % worldLV)

    

    # 获取机器人随机等级、积分列表

    robotLVList = __RandRobotLVList(robotMaxCount)

@@ -318,8 +390,9 @@
        value1 = robotRealmLV

        value2 = robotLV

        cmpValue = robotScore

        cmpValue2 = robotFightPower

        PlayerBillboard.UpdatePlayerBillboard(robotID, robotName, opInfo, ShareDefine.Def_BT_Arena, type2, value1, value2, cmpValue, autoSort=False, cmpValue2=cmpValue2)

        cmpValue2 = robotFightPower / ShareDefine.Def_PerPointValue

        cmpValue3 = robotFightPower % ShareDefine.Def_PerPointValue

        PlayerBillboard.UpdatePlayerBillboard(robotID, robotName, opInfo, ShareDefine.Def_BT_Arena, type2, value1, value2, cmpValue, autoSort=False, cmpValue2=cmpValue2, cmpValue3=cmpValue3)

        

    billBoard.Sort()

    return

@@ -369,11 +442,13 @@
            

    lvList[0] = robotMinLV

    lvList[-1] = robotMaxLV

    PyGameData.g_arenaRobotLVList = sorted(lvList, reverse=True)

    return lvList



def __GetRobotLVRange():

    ## 获取赛季机器人等级范围

    worldLV = max(1, PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv))

    worldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ArenaWorldLV)

    worldLV = max(1, worldLV)

    ipyDataMgr = IpyGameDataPY.IPY_Data()

    maxCnt = ipyDataMgr.GetWorldLVCount()

    worldLVTime = 0

@@ -526,7 +601,7 @@
    

    # 匹配刷新

    if cmd == "MatchRefresh":

        __DoArenaMatchRefresh(curPlayer, cmdDict["isRefresh"], cmdDict["playerLV"], cmdDict["playerScore"])

        __DoArenaMatchRefresh(curPlayer, cmdDict["isRefresh"], cmdDict["playerLV"], cmdDict["playerScore"], cmdDict.get("gmMatchIDList"))

        

    # 对战结算

    elif cmd == "BattleResult":

@@ -534,7 +609,7 @@
        

    return msgList + [retDict]



def __DoArenaMatchRefresh(curPlayer, isRefresh, playerLV, playerScore):

def __DoArenaMatchRefresh(curPlayer, isRefresh, playerLV, playerScore, gmMatchIDList=None):

    ## 玩家刷新匹配对手

    

    playerID = curPlayer.GetPlayerID()

@@ -568,13 +643,13 @@
        playerOrder = maxOrder + 1

        

    GameWorld.DebugLog("    maxOrder=%s,playerOrder=%s" % (maxOrder, playerOrder), playerID)

    
    highRandOrder, lowRandOrder = IpyGameDataPY.GetFuncEvalCfg("ArenaMatch", 5) # 前X名匹配比自己高名次时直接随机

    matchOrderList = [] # 匹配到的名次

    # 非第一名的匹配比自身名次高的

    if playerOrder > 1 and higherOrderPerList:

        higherOrderCount = playerOrder - 1 # 比玩家高的名次的个数

        # 小于10个的直接纯随机

        if 0 < higherOrderCount < 10:

        if 0 < higherOrderCount < highRandOrder:

            randOrderList = range(1, playerOrder)

            random.shuffle(randOrderList)

            matchOrderList.extend(randOrderList[:len(higherOrderPerList)])

@@ -582,7 +657,7 @@
                               % (higherOrderCount, randOrderList, matchOrderList), playerID)

            

        # 按比例划分

        elif higherOrderCount >= 10:

        elif higherOrderCount >= highRandOrder:

            randMaxOrder = playerOrder - 1

            for per in higherOrderPerList:

                per = min(per, 100) # 最多到100

@@ -605,7 +680,7 @@
    if 1 <= playerOrder < maxOrder and lowerOrderPerList:

        lowerOrderCount = maxOrder - playerOrder # 比玩家低的名次的个数

        # 小于10个的直接纯随机

        if 0 < lowerOrderCount < 10:

        if 0 < lowerOrderCount < lowRandOrder:

            randOrderList = range(playerOrder + 1, maxOrder + 1)

            random.shuffle(randOrderList)

            matchOrderList.extend(randOrderList[:len(lowerOrderPerList)])

@@ -613,7 +688,7 @@
                               % (lowerOrderCount, randOrderList, matchOrderList), playerID)

            

        # 按比例划分

        elif lowerOrderCount >= 10:

        elif lowerOrderCount >= lowRandOrder:

            randMinOrder = playerOrder + 1

            for per in lowerOrderPerList:

                per = min(per, 100) # 最多到100

@@ -643,17 +718,44 @@
                                       % (higherLackCount, randOrderMin, randOrderMax, randOrder, matchOrderList), playerID)

                    

    matchOrderList.sort()

    # GM指定匹配测试

    if gmMatchIDList != None and curPlayer.GetGMLevel():

        gmMatchOrderList = []

        for gmMatchID in gmMatchIDList:

            if gmMatchID == playerID:

                GameWorld.DebugAnswer(curPlayer, "目标ID不能是自己!无法匹配!%s" % gmMatchID)

                continue

            gmMatchOrder = billBoard.IndexOfByID(gmMatchID) + 1

            if gmMatchOrder <= 0:

                GameWorld.DebugAnswer(curPlayer, "目标ID不在榜单上!无法匹配!%s" % gmMatchID)

                continue

            if gmMatchOrder in matchOrderList:

                continue

            gmMatchOrderList.append(gmMatchOrder)

            GameWorld.DebugAnswer(curPlayer, "指定匹配ID(%s),order(%s)" % (gmMatchID, gmMatchOrder))

            
        GameWorld.DebugLog("matchOrderList=%s,needMatchCount=%s" % (str(matchOrderList), needMatchCount))

        if matchOrderList:

            matchOrderList = matchOrderList[:needMatchCount - len(gmMatchOrderList)]

        matchOrderList += gmMatchOrderList

        matchOrderList.sort()

            
    matchRobotRate = IpyGameDataPY.GetFuncCfg("ArenaMatch", 4) # 每次可直接匹配一个机器人概率

    if matchRobotRate and matchOrderList and len(matchOrderList) >= needMatchCount and GameWorld.CanHappen(matchRobotRate, 100):

        popOrder = matchOrderList.pop(-1) # 去掉最后一个

        GameWorld.DebugLog("    概率匹配到一个机器人，去掉最后一个! matchRobotRate=%s,popOrder=%s" % (matchRobotRate, popOrder), playerID)

        
    GameWorld.DebugLog("    最终匹配到的名次列表: matchOrderList=%s" % matchOrderList, playerID)

    

    # 随机机器人备用信息

    openJobList = IpyGameDataPY.GetFuncEvalCfg("OpenJob", 1)

    openJobList = IpyGameDataPY.GetFuncEvalCfg("OpenJob", 1)    
    

    randRobotLVPerRange = IpyGameDataPY.GetFuncEvalCfg("ArenaMatch", 3)

    minLV, maxLV = IpyGameDataPY.GetFuncEvalCfg("ArenaRobot", 2) # 机器人最小、最大等级

    randMinLV = min(minLV, int(playerLV * randRobotLVPerRange[0] / 100.0))

    randMaxLV = min(maxLV, int(playerLV * randRobotLVPerRange[1] / 100.0))

    minLV, _ = IpyGameDataPY.GetFuncEvalCfg("ArenaRobot", 2) # 机器人最小、最大等级

    randMinLV, randMaxLV = minLV - 10, minLV

    #randMinLV = min(minLV, int(playerLV * randRobotLVPerRange[0] / 100.0))

    #randMaxLV = min(maxLV, int(playerLV * randRobotLVPerRange[1] / 100.0))

    

    randRobotScorePerRange = IpyGameDataPY.GetFuncEvalCfg("ArenaMatch", 4)

    randRobotScorePerRange = IpyGameDataPY.GetFuncEvalCfg("ArenaMatch", 3)

    randMinScore = int(playerScore * randRobotScorePerRange[0] / 100.0)

    randMaxScore = int(playerScore * randRobotScorePerRange[1] / 100.0)

    

@@ -693,6 +795,10 @@
                        SetArenaBillRealmLV(billData, cacheDict["RealmLV"])

                        SetArenaBillLV(billData, cacheDict["LV"])

                        SetArenaBillFightPower(billData, cacheDict["FightPower"])

                else:

                    if matchIndex < len(PyGameData.g_arenaRobotLVList):

                        robotLV = PyGameData.g_arenaRobotLVList[matchIndex] # 同步更新机器人榜单变化等级

                        SetArenaBillLV(billData, robotLV)

                        

                matchPlayer.tagLV = GetArenaBillLV(billData)

                matchPlayer.tagJob = GetArenaBillJob(billData)

@@ -734,10 +840,16 @@
            curCache = PlayerViewCache.FindViewCache(matchInfo.PlayerID)

            if curCache:

                cacheDict = PlayerViewCache.GetCachePropDataDict(curCache)

                fightPower = cacheDict["FightPower"]

                matchInfo.LV = cacheDict["LV"]

                matchInfo.PlayerName = cacheDict["Name"]

                matchInfo.RealmLV = cacheDict["RealmLV"]

                matchInfo.FightPower = cacheDict["FightPower"]

                
                matchInfo.FightPower = fightPower % ShareDefine.Def_PerPointValue

                matchInfo.FightPowerEx = fightPower / ShareDefine.Def_PerPointValue

        else:

            # 此处机器人的暂忽略等级变化的同步，仅在刷新、更新积分时同步，此处省略查询机器人所属榜单排名

            pass

        
        clientPack.MatchList.append(matchInfo)

    clientPack.MatchCount = len(clientPack.MatchList)

    NetPackCommon.SendFakePack(curPlayer, clientPack)

@@ -749,6 +861,7 @@
    retDict = {}

    retDict.update(cmdDict)

    

    accID = curPlayer.GetAccID()

    playerID = curPlayer.GetPlayerID()

    GameWorld.DebugLog("竞技场玩家战斗结果: %s" % str(cmdDict), playerID)

    

@@ -773,6 +886,7 @@
    curScore = playerScore

    isFindTag = False

    tagLV, tagJob, tagScore = 0, 0, 0

    tagRealmLV, tagFightPower, tagAccID = 0, 0, "" # 机器人无值

    

    # 先找匹配列表

    matchList = PyGameData.g_arenaPlayerMatchDict.get(playerID, [])

@@ -819,45 +933,67 @@
    

    opInfo = ""

    # 结算自己

    addScore = __CalcBattleAddScore(curScore, tagScore, isWin)

    addScore = __CalcBattleAddScore(playerID, curScore, tagScore, isWin)

    updScore = max(0, playerScore + addScore)

    GameWorld.DebugLog("    更新自身积分: addScore=%s,updScore=%s" % (addScore, updScore), playerID)

    

    curOrder = billBoard.IndexOfByID(playerID) + 1  # 更新前获取名次

    cmpValue2 = fightPower / ShareDefine.Def_PerPointValue

    cmpValue3 = fightPower % ShareDefine.Def_PerPointValue

    PlayerBillboard.UpdatePlayerBillboard(playerID, playerName, opInfo, ShareDefine.Def_BT_Arena, playerJob,

                                          realmLV, playerLV, updScore, autoSort=False, cmpValue2=fightPower)

                                          realmLV, playerLV, updScore, autoSort=False, cmpValue2=cmpValue2, cmpValue3=cmpValue3)

    

    awardItemList = []

    if isWin:

        randItemList = IpyGameDataPY.GetFuncEvalCfg("ArenaBattleAward", 3)

        awardItemInfo = GameWorld.GetResultByRandomList(randItemList)

        if awardItemInfo:

            awardItemList.append(awardItemInfo)

            
            awardItemList.append(awardItemInfo[:3])

            isWorldNotify = awardItemInfo[3] if len(awardItemInfo) > 3 else 0

            if isWorldNotify:

                PlayerControl.WorldNotify(0, "ArenaWinerItem", [curPlayer.GetName(), awardItemInfo[0], "", awardItemInfo[1]])

                
    tagAddScore = __CalcBattleAddScore(tagPlayerID, tagScore, curScore, not isWin)

    updTagScore = max(0, tagScore + tagAddScore)

    # 结算对手，仅玩家时结算，机器人不处理

    if tagPlayerID > MaxRobotID:

        tagAddScore = __CalcBattleAddScore(tagScore, curScore, not isWin)

        updTagScore = max(0, tagScore + tagAddScore)

        GameWorld.DebugLog("    更新对手积分: tagAddScore=%s,updTagScore=%s" % (tagAddScore, updTagScore), playerID)

        tagCache = PlayerViewCache.FindViewCache(tagPlayerID)

        if tagCache:

            cacheDict = PlayerViewCache.GetCachePropDataDict(tagCache)

            tagOpInfo = ""

            tagLV = cacheDict["LV"]

            tagPlayerName = cacheDict["Name"]

            tagRealmLV = cacheDict["RealmLV"]

            tagFightPower = cacheDict["FightPower"]

            tagAccID = cacheDict["AccID"]

            tagCmpValue2 = tagFightPower / ShareDefine.Def_PerPointValue

            tagCmpValue3 = tagFightPower % ShareDefine.Def_PerPointValue

            PlayerBillboard.UpdatePlayerBillboard(tagPlayerID, tagPlayerName, tagOpInfo, ShareDefine.Def_BT_Arena, tagJob,

                                                  tagRealmLV, tagLV, updTagScore, autoSort=False, cmpValue2=tagFightPower)

                                                  tagRealmLV, tagLV, updTagScore, autoSort=False, cmpValue2=tagCmpValue2, cmpValue3=tagCmpValue3)

    else:

        updTagScore = tagScore

        GameWorld.DebugLog("    机器人对手，积分不变！updTagScore=%s" % updTagScore, playerID)

        
        robotBillboardData = billBoard.FindByID(tagPlayerID)

        if robotBillboardData:

            SetArenaBillScore(robotBillboardData, updTagScore)

            
    # 都更新完后排序一次

    billBoard.Sort()

    updOrder = billBoard.IndexOfByID(playerID) + 1 # 取最新名次

    GameWorld.DebugLog("    更新自身积分: addScore=%s,updScore=%s,curOrder=%s,updOrder=%s" % (addScore, updScore, curOrder, updOrder), playerID)

    GameWorld.DebugLog("    更新对手积分: tagPlayerID=%s,tagAddScore=%s,updTagScore=%s" % (tagPlayerID, tagAddScore, updTagScore), playerID)

    retDict.update({"addScore":addScore, "updScore":updScore, "curOrder":curOrder, "updOrder":updOrder,

                    "awardItemList":awardItemList, "isOK":True})

    

    if tagPlayerID <= MaxRobotID:

        tagUpdOrder = billBoard.IndexOfByID(tagPlayerID) + 1 # 取最新名次

        tagOrderIndex = tagUpdOrder - 1

        if tagUpdOrder >= 1 and tagOrderIndex < len(PyGameData.g_arenaRobotLVList) and tagOrderIndex < billBoard.GetCount():

            GameWorld.DebugLog("    PyGameData.g_arenaRobotLVList=%s" % PyGameData.g_arenaRobotLVList, playerID)

            updRobotLV = PyGameData.g_arenaRobotLVList[tagOrderIndex]

            robotBillboardData = billBoard.At(tagOrderIndex)

            SetArenaBillLV(robotBillboardData, updRobotLV)

            GameWorld.DebugLog("    机器人在榜上，更新等级信息! tagPlayerID=%s,tagUpdOrder=%s,updRobotLV=%s" % (tagPlayerID, tagUpdOrder, updRobotLV), playerID)

        else:

            GameWorld.DebugLog("    机器人不在榜上，不更新等级信息! tagPlayerID=%s" % tagPlayerID, playerID)

            
    battleRecMaxCount = min(MaxBattleRecCount, IpyGameDataPY.GetFuncCfg("ArenaSet", 4))

    

    # 插入对战记录

@@ -903,6 +1039,11 @@
    

    # 对战结束，最后免费刷新一次匹配列表

    __DoArenaMatchRefresh(curPlayer, True, playerLV, updScore)

    
    drDict = {"AccID":accID, "PlayerID":playerID, "playerLV":playerLV, "realmLV":realmLV, "fightPower":fightPower, "curScore":[curScore, addScore, updScore], 
              "TagAccID":tagAccID, "TagPlayerID":tagPlayerID, "tagLV":tagLV, "tagRealmLV":tagRealmLV, "tagFightPower":tagFightPower, 
              "tagScore":[tagScore, tagAddScore, updTagScore], "isWin":isWin}

    DataRecordPack.SendEventPack("ArenaBattleResult", drDict)

    return retDict



def __SyncPlayerBechallengedUpdScore(curPlayer, updScore):

@@ -915,26 +1056,28 @@
                                                       cmdStr, len(cmdStr), curPlayer.GetRouteServerIndex())

    return



def __CalcBattleAddScore(curScore, tagScore, isWin):

def __CalcBattleAddScore(playerID, curScore, tagScore, isWin):

    ## 计算对战增加积分

    diffScore = curScore - tagScore # 积分差，有正负

    calcScoreFormatDict = IpyGameDataPY.GetFuncEvalCfg("ArenaBattleAward", 1) if isWin else IpyGameDataPY.GetFuncEvalCfg("ArenaBattleAward", 2)

    scoreKeyList = calcScoreFormatDict.keys()

    scoreKeyList.sort()

    calcKey = ""

    calcKey = None

    for scoreKey in scoreKeyList:

        if diffScore <= scoreKey:

            calcKey = scoreKey

            break

        

    if not calcKey:

    if calcKey == None:

        GameWorld.ErrLog("    计算得分公式: playerID=%s,diffScore=%s,scoreKeyList=%s,isWin=%s 找不到对应key公式" 
                           % (playerID, diffScore, scoreKeyList, isWin))

        return 0

    

    compileKey = "ArenaBattleScore_%s_%s" % (int(isWin), str(calcKey))

    formatStr = calcScoreFormatDict[calcKey]

    addScore = eval(FormulaControl.GetCompileFormula(compileKey, formatStr))

    GameWorld.DebugLog("    计算得分公式: diffScore=%s,isWin=%s,compileKey=%s,formatStr=%s,addScore=%s" 
                       % (diffScore, isWin, compileKey, formatStr, addScore))

    GameWorld.DebugLog("    计算得分公式: playerID=%s,diffScore=%s,scoreKeyList=%s,isWin=%s,compileKey=%s,formatStr=%s,addScore=%s" 
                       % (playerID, diffScore, scoreKeyList, isWin, compileKey, formatStr, addScore))

    return addScore



#// A9 A8 查看竞技场对战记录 #tagCGQueryArenaBattleRecord

@@ -964,6 +1107,7 @@
        recInfo.PlayerID = battleRec.tagPlayerID

        recInfo.Job = battleRec.tagJob

        recInfo.LV = battleRec.tagLV

        recInfo.Score = battleRec.tagScore

        recInfo.AddScore = str(battleRec.addScore)

        recInfo.AddScoreLen = len(recInfo.AddScore)

        recInfo.IsWin = battleRec.isWin

@@ -973,9 +1117,12 @@
            curCache = PlayerViewCache.FindViewCache(recInfo.PlayerID)

            if curCache:

                cacheDict = PlayerViewCache.GetCachePropDataDict(curCache)

                fightPower = cacheDict["FightPower"]

                recInfo.LV = cacheDict["LV"]

                recInfo.PlayerName = cacheDict["Name"]

                recInfo.RealmLV = cacheDict["RealmLV"]

                recInfo.FightPower = cacheDict["FightPower"]

                recInfo.FightPower = fightPower % ShareDefine.Def_PerPointValue

                recInfo.FightPowerEx = fightPower / ShareDefine.Def_PerPointValue

                

        clientPack.BattleRecordList.append(recInfo)

        

@@ -983,7 +1130,41 @@
    NetPackCommon.SendFakePack(curPlayer, clientPack)

    return











#// A9 A5 查看竞技场对战玩家最新信息 #tagCGQueryArenaBattlePlayer

#

#struct    tagCGQueryArenaBattlePlayer

#{

#    tagHead        Head;

#    DWORD        PlayerID;        //目标玩家ID，仅支持查真实玩家

#};

def OnQueryArenaBattlePlayer(index, clientData, tick):

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

    if not curPlayer:

        return

    
    tagPlayerID = clientData.PlayerID

    tagBattleRecList = GetPlayerArenaBattleRecList(tagPlayerID)

    if not tagBattleRecList:

        GameWorld.ErrLog("竞技场玩家无对战记录，无法查询最新数据! tagPlayerID=%s" % tagPlayerID, curPlayer.GetPlayerID())

        return

    tagBattleRec = tagBattleRecList[-1] # 取最后一条为最新数据

    tagScore = tagBattleRec.updScore

    
    clientPack = ChPyNetSendPack.tagGCArenaBattlePlayerInfo()

    clientPack.PlayerID = tagPlayerID

    clientPack.Score = tagScore

    
    curCache = PlayerViewCache.FindViewCache(tagPlayerID)

    if curCache:

        cacheDict = PlayerViewCache.GetCachePropDataDict(curCache)

        fightPower = cacheDict["FightPower"]

        clientPack.LV = cacheDict["LV"]

        clientPack.Job = cacheDict["Job"]

        clientPack.PlayerName = cacheDict["Name"]

        clientPack.RealmLV = cacheDict["RealmLV"]

        clientPack.FightPower = fightPower % ShareDefine.Def_PerPointValue

        clientPack.FightPowerEx = fightPower / ShareDefine.Def_PerPointValue

        
    NetPackCommon.SendFakePack(curPlayer, clientPack)

    return