4762 【后端】增加助战排行榜；增加离线玩家助战信息处理；

hxp

2018-11-26 e8bf98a53369d63ce2ea76e135d55c43b0494734

4762 【后端】增加助战排行榜；增加离线玩家助战信息处理；

 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py

@@ -574,6 +574,7 @@
            ShareDefine.Def_BT_Campaign_FightPower      : 100,           #战力排行(开服活动榜)

            ShareDefine.Def_BT_Campaign_RuneLV          : 100,           #符印等级(开服活动榜)

            ShareDefine.Def_BT_FCCostGold               : 5,             #消费排行榜(仙界盛典)

            ShareDefine.Def_BT_FBHelpBattle             : 100,           #助战次数榜

            

            ShareDefine.Def_BT_HighLadder               : 1000,          #玩家天梯竞技场排行

            ShareDefine.Def_BT_HighLadder_Yester        : 1000,          #玩家天梯竞技场昨日排行


 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -24985,6 +24985,7 @@
                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("IsOK", c_ubyte),    #是否成功

                  ("IsLogin", c_ubyte),    #是否登录同步已登记

                  ]



    def __init__(self):

@@ -25002,6 +25003,7 @@
        self.Cmd = 0xB2

        self.SubCmd = 0x05

        self.IsOK = 0

        self.IsLogin = 0

        return



    def GetLength(self):

@@ -25014,12 +25016,14 @@
        DumpString = '''// B2 05 助战登记结果 //tagMCHelpBattleCheckInResult:

                                Cmd:%s,

                                SubCmd:%s,

                                IsOK:%d

                                IsOK:%d,

                                IsLogin:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.IsOK

                                self.IsOK,

                                self.IsLogin

                                )

        return DumpString




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

@@ -98,6 +98,7 @@
#import ReloadModule

import MergeChildMsg

#import MergePlayer

import PlayerFBHelpBattle

import PlayerFamilyRedPacket

import IpyGameDataPY

import PlayerFamilyParty

@@ -1241,6 +1242,8 @@
    PlayerXMZZ.OnGameServerInitOK()

    #加载活跃玩家等级信息

    ChPlayer.LoadPlayerLVData()

    #加载助战信息

    PlayerFBHelpBattle.OnServerStart()

    #世界boss被杀次数重置

    #GameWorldBoss.CheckResetBossKilledCntOnServerInit()

    #GameWorldActionTeHui.OnGameServerInitOK() # 特惠活动初始化

@@ -1900,6 +1903,7 @@
def BeforeClose(tick):

    PlayerTeam.OnServerClose(tick)

    ChPlayer.SavePlayerLVData()

    PlayerFBHelpBattle.OnServerClose()

    GameWorld.Log("通知C++关服！")

    GameWorld.GetGameWorld().OnServerClose()

    


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

@@ -170,6 +170,8 @@
        GameWorldActionControl.OnPlayerLogin(curPlayer)

        #玩家等级记录

        PyGameData.g_todayPlayerLVDict[curPlayer.GetID()] = curPlayer.GetLV()

        #副本助战

        PlayerFBHelpBattle.OnHelpPlayerLogin(curPlayer)

        

        GMShell.OnPlayerLogin(curPlayer)

        GMT_CTG.OnPlayerLogin(curPlayer)


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

@@ -16,21 +16,23 @@
#-------------------------------------------------------------------------------



import PlayerFriend

import PlayerViewCache

import IpyGameDataPY

import PlayerViewCache

import IPY_GameServer

import PlayerControl

import ShareDefine

import PyGameData

import GameWorld

import ChConfig



import random

import time

import IPY_GameServer

import PlayerControl

import ChConfig

import ChPyNetSendPack

import NetPackCommon



MaxRobotID = 100 # 最大机器人NPC定义ID

    


Def_RecType_CheckInPlayer = ShareDefine.Def_UniversalGameRecType_FBHelpBattleCheckInPlayer

Def_RecType_HelpRecord = ShareDefine.Def_UniversalGameRecType_FBHelpBattleRecord



## 助战玩家简要信息

class HelpBattlePlayer():

    

@@ -62,7 +64,119 @@
        self.vipLV = 0 # 当时的VIP等级

        self.recordTime = 0 # 记录的时间

        return



def OnServerStart():

    GameWorld.Log("开服加载助战相关信息...")

    universalRecMgr = GameWorld.GetUniversalRecMgr()

    checkInPlayerRecList = universalRecMgr.GetTypeList(Def_RecType_CheckInPlayer)

    for index in xrange(checkInPlayerRecList.Count()):

        recData = checkInPlayerRecList.At(index)

        playerID = recData.GetValue1()

        helpBattlePlayer = HelpBattlePlayer(playerID)

        helpBattlePlayer.checkInTime = recData.GetTime()

        helpBattlePlayer.fightPower = recData.GetValue2()

        helpBattlePlayer.familyID = recData.GetValue3()

        helpBattlePlayer.checkInCount = recData.GetValue4()

        value5 = recData.GetValue5()

        helpBattlePlayer.playerLV = value5 / 100000

        helpBattlePlayer.vipLV = int(str(value5)[-5:-3])

        helpBattlePlayer.realmLV = int(str(value5)[-3:-1])

        helpBattlePlayer.job = value5 % 10

        helpBattlePlayer.playerName = recData.GetStrValue1()

        helpBattlePlayer.todayXianyuanCoin = int(recData.GetStrValue2())

        helpCountDictStr = recData.GetStrValue3()

        if helpCountDictStr.startswith("{") and helpCountDictStr.endswith("{"):

            helpBattlePlayer.todayHelpCountDict = eval(helpCountDictStr)

        else:

            GameWorld.ErrLog("LoadCheckInPlayerError: helpCountDictStr=%s" % helpCountDictStr, playerID)

        PyGameData.g_fbHelpBattleCheckInPlayerDict[playerID] = helpBattlePlayer

    GameWorld.Log("加载助战登记玩家记录: %s" % len(PyGameData.g_fbHelpBattleCheckInPlayerDict))

    

    helpRecordRecList = universalRecMgr.GetTypeList(Def_RecType_HelpRecord)

    for index in xrange(helpRecordRecList.Count()):

        recData = helpRecordRecList.At(index)

        playerID = recData.GetValue1()

        
        helpRecord = FBHelpBattleRecord()

        helpRecord.callPlayerID = int(recData.GetStrValue2())

        helpRecord.callPlayerName = recData.GetStrValue1()

        helpRecord.mapID = recData.GetValue2()

        helpRecord.funcLineID = recData.GetValue3()

        helpRecord.xianyuanCoinAdd = recData.GetValue4()

        helpRecord.relation = recData.GetValue5() % 10

        helpRecord.vipLV = recData.GetValue5() / 10

        helpRecord.recordTime = recData.GetTime()

        
        unNotifyRecordList = PyGameData.g_fbHelpBattleRecord.get(playerID, [])

        unNotifyRecordList.append(helpRecord)

        PyGameData.g_fbHelpBattleRecord[playerID] = unNotifyRecordList

        
    GameWorld.Log("加载玩家未同步助战: %s" % len(PyGameData.g_fbHelpBattleRecord))

    for playerID, helpList in PyGameData.g_fbHelpBattleRecord.items():

        GameWorld.Log("加载玩家未同步助战记录: %s" % (len(helpList)), playerID)

    return



def OnServerClose():

    GameWorld.Log("关服保存助战相关信息...")

    universalRecMgr = GameWorld.GetUniversalRecMgr()

    universalRecMgr.Delete(Def_RecType_CheckInPlayer)

    universalRecMgr.Delete(Def_RecType_HelpRecord)

    
    GameWorld.Log("保存助战登记玩家记录: %s" % len(PyGameData.g_fbHelpBattleCheckInPlayerDict))

    checkInPlayerRecList = universalRecMgr.GetTypeList(Def_RecType_CheckInPlayer)

    for playerID, checkInPlayer in PyGameData.g_fbHelpBattleCheckInPlayerDict.items():

        recData = checkInPlayerRecList.AddRec()

        recData.SetTime(checkInPlayer.checkInTime)

        recData.SetValue1(playerID)

        recData.SetValue2(checkInPlayer.fightPower)

        recData.SetValue3(checkInPlayer.familyID)

        recData.SetValue4(checkInPlayer.checkInCount)

        recData.SetValue5(int("%d%02d%02d%d" % (checkInPlayer.playerLV, checkInPlayer.vipLV, checkInPlayer.realmLV, checkInPlayer.job)))

        recData.SetStrValue1(checkInPlayer.playerName)

        recData.SetStrValue2(str(checkInPlayer.todayXianyuanCoin))

        recData.SetStrValue3(str(checkInPlayer.todayHelpCountDict).replace(" ", ""))

        
    GameWorld.Log("保存助战未同步记录: %s" % len(PyGameData.g_fbHelpBattleRecord))

    helpRecordRecList = universalRecMgr.GetTypeList(Def_RecType_HelpRecord)

    for playerID, helpList in PyGameData.g_fbHelpBattleRecord.items():

        GameWorld.Log("玩家未同步助战记录: %s" % (len(helpList)), playerID)

        for helpRecord in helpList:

            recData = helpRecordRecList.AddRec()

            recData.SetTime(helpRecord.recordTime)

            recData.SetValue1(playerID)

            recData.SetValue2(helpRecord.mapID)

            recData.SetValue3(helpRecord.funcLineID)

            recData.SetValue4(helpRecord.xianyuanCoinAdd)

            recData.SetValue5(helpRecord.vipLV*10+helpRecord.relation)

            recData.SetStrValue1(helpRecord.callPlayerName)

            recData.SetStrValue2(str(helpRecord.callPlayerID))

    return



def HelpBattleOnDay():

    curTime = int(time.time())

    checkInValidHours = IpyGameDataPY.GetFuncCfg("HelpBattleCheckIn", 1) # 登记有效时长，小时

    # 这里延长30分钟清除，防止已经被召唤还没结算的导致找不到登记信息

    checkInValidSeconds = checkInValidHours * 3600 + 30 * 60

    
    # 清超时登记，重置信息

    for playerID, checkInPlayer in PyGameData.g_fbHelpBattleCheckInPlayerDict.items():

        checkInTime = checkInPlayer.checkInTime

        if curTime - checkInTime > checkInValidSeconds:

            PyGameData.g_fbHelpBattleCheckInPlayerDict.pop(playerID)

            GameWorld.Log("清除超时助战登记玩家: curTime=%s,checkInTime=%s" % (curTime, checkInTime), playerID)

            continue

        checkInPlayer.todayHelpCountDict = {}

        checkInPlayer.todayXianyuanCoin = 0

    return



def OnHelpPlayerLogin(curPlayer):

    playerID = curPlayer.GetPlayerID()

    if playerID not in PyGameData.g_fbHelpBattleRecord:

        return

    unNotifyRecordList = PyGameData.g_fbHelpBattleRecord.pop(playerID)

    SendMapServer_FBHelpBattleRecord(curPlayer, unNotifyRecordList)

    return



## 是否在助战登记列表里

def IsInHelpBattleCheckInList(playerID): return playerID in PyGameData.g_fbHelpBattleCheckInPlayerDict



@@ -298,6 +412,14 @@
    if not fbFuncIpyData or not fbHelpIpyData or not calledPlayerDict:

        return

    

    helpCountLineID = funcLineID # 助战次数所属lineID，当所有层通用时，默认为0

    dayFreeHelpCountInfo = fbHelpIpyData.GetDayFreeHelpCount()

    if dayFreeHelpCountInfo and len(dayFreeHelpCountInfo) == 2:

        isAllLineCount = dayFreeHelpCountInfo[1]

        if isAllLineCount:

            helpCountLineID = 0

    helpCountKey = (mapID, helpCountLineID)

    
    curTime = int(time.time())

    tagPlayerID = curPlayer.GetPlayerID()

    tagPlayerName = curPlayer.GetName()

@@ -305,7 +427,7 @@
    xianyuanCoinUpper = IpyGameDataPY.GetFuncCfg("HelpBattlePoint", 1) # 每日仙缘币上限

    baseHelpPoint = fbFuncIpyData.GetHelpPoint() # 助战 - 基础仙缘币

    relationCoinAddDict = IpyGameDataPY.GetFuncEvalCfg("HelpBattlePoint", 2, {}) # 社交关系加成 {"社交关系":[过关加成, 助战加成], ...} 

    GameWorld.DebugLog("召唤助战: mapID=%s, funcLineID=%s, calledPlayerDict=%s" % (mapID, funcLineID, calledPlayerDict), tagPlayerID)

    GameWorld.DebugLog("召唤助战: mapID=%s, funcLineID=%s, helpCountKey=%s, calledPlayerDict=%s" % (mapID, funcLineID, helpCountKey, calledPlayerDict), tagPlayerID)

    

    for calledPlayerID, relation in calledPlayerDict.items():

        if calledPlayerID not in PyGameData.g_fbHelpBattleCheckInPlayerDict:

@@ -316,6 +438,8 @@
        relationAdd = relationAddList[1] if len(relationAddList) == 2 else 0

        

        helpBattlePlayer = PyGameData.g_fbHelpBattleCheckInPlayerDict[calledPlayerID]

        todayMapHelpCount = helpBattlePlayer.todayHelpCountDict.get(helpCountKey, 0) + 1

        helpBattlePlayer.todayHelpCountDict[helpCountKey] = todayMapHelpCount

        todayXianyuanCoin = helpBattlePlayer.todayXianyuanCoin # 今日已获得仙缘币

        vipLV = helpBattlePlayer.vipLV

        if vipLV:

@@ -329,7 +453,7 @@
        coinAdd = int((baseHelpPoint + relationAdd) * addCoinRate / 10000.0)

        canAddMax = max(playerXianyuanCoinUpper - todayXianyuanCoin, 0)

        coinAddReal = min(coinAdd, canAddMax) # 实际加仙缘币

        GameWorld.DebugLog("    助战增加仙缘币: coinAddReal=%s" % (coinAddReal), calledPlayerID)

        GameWorld.DebugLog("    助战增加仙缘币: coinAddReal=%s, todayMapHelpCount=%s" % (coinAddReal, todayMapHelpCount), calledPlayerID)

        

        # GameServer 直接先加

        helpBattlePlayer.todayXianyuanCoin += coinAddReal


 ServerPython/CoreServerGroup/GameServer/Script/PyGameData.py

@@ -80,6 +80,6 @@
g_dogzNPCRefreshTimeDict = {} # 神兽副本NPC刷新时间{npcid:剩余刷新时间}

g_bourseItemTradingTimeDict = {} # 物品开始交易的时间记录 {guid:tick}



g_fbHelpBattleCheckInPlayerDict = {} # 副本助战玩家登记缓存

g_fbHelpBattleRecord = {} # 未同步的副本助战记录

g_fbHelpBattleCheckInPlayerDict = {} # 副本助战玩家登记缓存 {playerID:HelpBattlePlayer, ...}

g_fbHelpBattleRecord = {} # 未同步的副本助战记录 {playerID:[FBHelpBattleRecord, ...], ...}




 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py

@@ -566,16 +566,17 @@
    

    Def_BT_FCCostGold,                        #消费排行榜(仙界盛典)

    Def_BT_Campaign_RuneLV,                   #符印等级(开服活动榜)

    Def_BT_FBHelpBattle,                      #助战次数排行榜

    

    Def_BT_HighLadder,                        #天梯竞技场排行

    Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行

    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录 20

    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录

    Def_BT_RechargeTeHui,                     #充值特惠活动排行榜-当前期记录

    

    Def_BT_MixCampaign_PlayerBattle,          #总战斗力(合服活动)

    Def_BT_MixCampaign_Recharge,              #累计充值(合服活动)

    Def_BT_MixCampaign_WinFamilyMember,       #获胜战盟成员,按职位排(合服活动)

    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动) 25

    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动)

    

    Def_BT_CostTeHui,                         #消费特惠排行榜

    Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期

@@ -583,7 +584,7 @@
    Def_BT_MergePKWeek,                       #跨服PK周积分榜

    

    Def_BT_Max,                               #排行榜最大类型

) = range(0, 30 + 2) 
) = range(0, 31 + 2) 
    

#职业对应战力排行榜类型

JobFightPowerBillboardDict = {

@@ -942,8 +943,8 @@
                                Def_UniversalGameRecType_TodayPlayerLVInfo, #今日活跃玩家等级信息6

                                Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7

                                Def_UniversalGameRecType_StoreServerCntRecord,  #商店全服购买记录 8,

                                Def_UniversalGameRecType_9,

                                Def_UniversalGameRecType_10,

                                Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9

                                Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10

                                Def_UniversalGameRecType_11,

                                Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12

                                Def_UniversalGameRecType_13,


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py

@@ -3672,6 +3672,7 @@


#助战

Def_PDict_HelpBattleCheckInCount = "HelpBattleCheckInCount" #助战登记次数, 登记次数*10+今日是否登记过

Def_PDict_HelpBattleTotalCount = "HelpBattleTotalCount" #累计助战次数

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

#类型 Def_PDictType_OnlinePrize

Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt"  # 新手在线已领取奖励次数


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py

@@ -24985,6 +24985,7 @@
                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("IsOK", c_ubyte),    #是否成功

                  ("IsLogin", c_ubyte),    #是否登录同步已登记

                  ]



    def __init__(self):

@@ -25002,6 +25003,7 @@
        self.Cmd = 0xB2

        self.SubCmd = 0x05

        self.IsOK = 0

        self.IsLogin = 0

        return



    def GetLength(self):

@@ -25014,12 +25016,14 @@
        DumpString = '''// B2 05 助战登记结果 //tagMCHelpBattleCheckInResult:

                                Cmd:%s,

                                SubCmd:%s,

                                IsOK:%d

                                IsOK:%d,

                                IsLogin:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.IsOK

                                self.IsOK,

                                self.IsLogin

                                )

        return DumpString




 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py

@@ -18,6 +18,7 @@
import GameWorld

import ChConfig

import PlayerControl

import PlayerBillboard

import ChPyNetSendPack

import NetPackCommon

import PlayerViewCacheTube

@@ -34,8 +35,26 @@
def DoPlayerOnDay(curPlayer):

    checkInInfo = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HelpBattleCheckInCount)

    checkInCount = checkInInfo / 10 # 累计登记

    checkInInfo = (checkInCount + 1) * 10 + 0

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HelpBattleCheckInCount, checkInInfo)

    todayIsCheckIn = checkInInfo % 10 # 今天是否已登记

    if todayIsCheckIn:

        checkInInfo = (checkInCount + 1) * 10 + 0

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HelpBattleCheckInCount, checkInInfo)

        SyncCheckInState(curPlayer, 0, False)

    return



def DoPlayerLogin(curPlayer):

    checkInInfo = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HelpBattleCheckInCount)

    todayIsCheckIn = checkInInfo % 10 # 今天是否已登记

    if todayIsCheckIn:

        SyncCheckInState(curPlayer, 1, True)

    return



def SyncCheckInState(curPlayer, checkInState, isLogin):

    ## 同步登记状态

    checkInPack = ChPyNetSendPack.tagMCHelpBattleCheckInResult()

    checkInPack.IsOK = checkInState

    checkInPack.IsLogin = int(isLogin)

    NetPackCommon.SendFakePack(curPlayer, checkInPack)

    return



def GameServer_FBHelpBattleResult(curPlayer, msgList, tick):

@@ -89,9 +108,7 @@
        if not haveViewCache:

            PlayerViewCacheTube.UpdateGameServerPlayerCache(curPlayer, tick, False)

            

    checkInPack = ChPyNetSendPack.tagMCHelpBattleCheckInResult()

    checkInPack.IsOK = isOK

    NetPackCommon.SendFakePack(curPlayer, checkInPack)

    SyncCheckInState(curPlayer, 1, False)

    

    GameWorld.DebugLog("FBHelpBattleResult: %s,checkInCount=%s,fightPower=%s,isOK=%s,haveViewCache=%s" 

                       % (cmd, checkInCount, fightPower, isOK, haveViewCache), curPlayer.GetPlayerID())

@@ -351,6 +368,7 @@
    return



def __OnHelpBattleRecord(curPlayer, msgList, tick):

    ## 助战记录同步

    cmd, helpRecordList = msgList

    playerID = curPlayer.GetPlayerID()

    GameWorld.DebugLog("__OnHelpBattleRecord %s,helpRecordList=%s" % (cmd, helpRecordList), playerID)

@@ -359,6 +377,7 @@
    addXianyuanCoinTotalTotay = 0 # 累计需要增加的今日仙缘币

    drList = []

    

    totalHelpCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HelpBattleTotalCount)

    recordPack = ChPyNetSendPack.tagMCHelpBattleRecordList()

    recordPack.RecordList = []

    for recordInfo in helpRecordList:

@@ -382,16 +401,22 @@
        addXianyuanCoinTotal += xianyuanCoinAdd

        if isSameDay:

            addXianyuanCoinTotalTotay += xianyuanCoinAdd

            
        totalHelpCount += 1

        
    recordPack.RecordCount = len(recordPack.RecordList)

    NetPackCommon.SendFakePack(curPlayer, recordPack)

    

    addDataDict = {"HelpList":drList}

    GameWorld.DebugLog("    addXianyuanCoinTotal=%s,addXianyuanCoinTotalTotay=%s" % (addXianyuanCoinTotal, addXianyuanCoinTotalTotay), playerID)

    GameWorld.DebugLog("    addXianyuanCoinTotal=%s,addXianyuanCoinTotalTotay=%s,totalHelpCount=%s" 
                       % (addXianyuanCoinTotal, addXianyuanCoinTotalTotay, totalHelpCount), playerID)

    PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_XianyuanCoin, addXianyuanCoinTotal, addDataDict=addDataDict, isSysHint=False)

    if addXianyuanCoinTotalTotay:

        PlayerControl.AddTodayXianyuanCoin(curPlayer, addXianyuanCoinTotalTotay)

        
    
    # 更新总助战次数，更新排行榜

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HelpBattleTotalCount, totalHelpCount)

    if totalHelpCount >= IpyGameDataPY.GetFuncCfg("HelpBattleRefresh", 4):

        PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_FBHelpBattle, totalHelpCount)

    return



def DoSingleFBAddXianyuanCoin(curPlayer, mapID, lineID):


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

@@ -110,6 +110,7 @@
import PlayerFairyCeremony

import ChNetSendPack

import FamilyRobBoss

import FBHelpBattle

import PyGameData

import PlayerCoin

import PlayerGeTui

@@ -556,6 +557,8 @@
    SyncLittleHelper(curPlayer)

    # 聊天气泡框

    SyncChatBubbleBoxState(curPlayer)

    # 副本助战

    FBHelpBattle.DoPlayerLogin(curPlayer)

    

    curPlayer.SetState(0)   # 脱机挂恢复为正常上线

    curPlayer.SetFacePic(0) # 通知数据库是否保存还是下线，做一次恢复，1为保存 0为正常下线


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py

@@ -566,16 +566,17 @@
    

    Def_BT_FCCostGold,                        #消费排行榜(仙界盛典)

    Def_BT_Campaign_RuneLV,                   #符印等级(开服活动榜)

    Def_BT_FBHelpBattle,                      #助战次数排行榜

    

    Def_BT_HighLadder,                        #天梯竞技场排行

    Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行

    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录 20

    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录

    Def_BT_RechargeTeHui,                     #充值特惠活动排行榜-当前期记录

    

    Def_BT_MixCampaign_PlayerBattle,          #总战斗力(合服活动)

    Def_BT_MixCampaign_Recharge,              #累计充值(合服活动)

    Def_BT_MixCampaign_WinFamilyMember,       #获胜战盟成员,按职位排(合服活动)

    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动) 25

    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动)

    

    Def_BT_CostTeHui,                         #消费特惠排行榜

    Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期

@@ -583,7 +584,7 @@
    Def_BT_MergePKWeek,                       #跨服PK周积分榜

    

    Def_BT_Max,                               #排行榜最大类型

) = range(0, 30 + 2) 
) = range(0, 31 + 2) 
    

#职业对应战力排行榜类型

JobFightPowerBillboardDict = {

@@ -942,8 +943,8 @@
                                Def_UniversalGameRecType_TodayPlayerLVInfo, #今日活跃玩家等级信息6

                                Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7

                                Def_UniversalGameRecType_StoreServerCntRecord,  #商店全服购买记录 8,

                                Def_UniversalGameRecType_9,

                                Def_UniversalGameRecType_10,

                                Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9

                                Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10

                                Def_UniversalGameRecType_11,

                                Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12

                                Def_UniversalGameRecType_13,