8301 【恺英】【后端】仙缘币货币调整（改为给灵石，刷新召唤改为消耗灵石）

hxp

2019-10-08 38904391ac59bc51133e66b9b5150c6b5db46ec4

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

@@ -27,28 +27,21 @@
import GMCommon

import ShareDefine

#import PlayerFamilyTech

import PlayerDataCollect

import time

import ChPyNetSendPack

import NetPackCommon

import GameDataRecord

import GameConfig

import ReadChConfig

import UpdatePlayerName

import GameWorldBoss

import PlayerFamilyBoss

#import PlayerManorWar

import PlayerBourse

import GameWorldActionTeHui

import PlayerZhuXianBoss

import PlayerXMZZ

import GameWorldShopItem

import PlayerTruck

import HighLadder

import EventReport

import PlayerHorsePetBoss

import PlayerCompensation

import PlayerFamilyRedPacket

import PlayerFamilyStore

import PyDataManager

#import PlayerFamilyStore

import PlayerSocial

import PlayerFamilyParty

import PlayerSealDemon

@@ -61,12 +54,15 @@
import PlayerGeTui

import PlayerStore

import GameWorldActionControl

import GameWorldFamilyWar

import PlayerFBHelpBattle

import GMT_CTG

import PyGameData

import GMShell

import IPY_PlayerDefine

import CrossRealmPK

import AuctionHouse

import PlayerFB

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



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

@@ -132,6 +128,7 @@
    #玩家队伍初始化

    PlayerTeam.OnPlayerLoginRefreshTeam(curPlayer, tick)

    PlayerCompensation.NotifyPlayerCompensation(curPlayer)

    __UpdOnedayJobPlayerLoginoffTime(curPlayer)

    

    if not PlayerControl.GetIsTJG(curPlayer):

        # 只有通知逻辑的应该放此处减少IO，如有逻辑处理存储等不可放在此处

@@ -149,14 +146,16 @@
        PlayerTruck.SyncPlayerTruckStartTime(curPlayer)

        #通知玩家交易所挂单情况

        PlayerBourse.OnPlayerLogin(curPlayer)



        #拍卖行

        AuctionHouse.OnPlayerLogin(curPlayer)

        
        #上线广播

        __CheckWorldNotifyOnLogin(curPlayer, tick)

        

        #仙盟红包

        PlayerFamilyRedPacket.OnPlayerLogin(curPlayer)

        #仙盟仓库

        PlayerFamilyStore.OnPlayerLogin(curPlayer)

        #PlayerFamilyStore.OnPlayerLogin(curPlayer)

        #仙盟宴会

        PlayerFamilyParty.OnPlayerLogin(curPlayer)

        #封魔坛

@@ -176,6 +175,7 @@
        #守卫人皇

        PlayerFamilySWRH.OnLogin(curPlayer)

        PlayerTalk.LoginChatMi(curPlayer)

        PlayerTalk.NotifyTalkCache(curPlayer)

        PlayerGeTui.CleanNewGuyCallBackGeTui(curPlayer.GetID())

        #活动

        GameWorldActionControl.OnPlayerLogin(curPlayer)

@@ -185,9 +185,41 @@
        PlayerFBHelpBattle.OnHelpPlayerLogin(curPlayer)

        #跨服PK

        CrossRealmPK.OnPlayerLogin(curPlayer)

        
        GMShell.OnPlayerLogin(curPlayer)

        #诛仙BOSS

        PlayerZhuXianBoss.OnPlayerLogin(curPlayer)

        #骑宠boss状态通知

        PlayerHorsePetBoss.OnLogin(curPlayer)

        GMT_CTG.OnPlayerLogin(curPlayer)

    return



def __UpdOnedayJobPlayerLoginoffTime(curPlayer):

    ## 更新一天内职业对应玩家登录、离线时间

    job = curPlayer.GetJob()

    playerID = curPlayer.GetPlayerID()

    if job not in PyGameData.g_onedayJobPlayerLoginoffTimeDict:

        PyGameData.g_onedayJobPlayerLoginoffTimeDict[job] = {}

    playerLoginoffTimeDict = PyGameData.g_onedayJobPlayerLoginoffTimeDict[job]

    playerLoginoffTimeDict[playerID] = int(time.time())

    #GameWorld.DebugLog("更新职业对应玩家登录离线时间: %s" % PyGameData.g_onedayJobPlayerLoginoffTimeDict)

    return



def CheckOnedayJobPlayerLoginoffTimeout():

    ## 检查一天内职业对应玩家登录、离线时间超时玩家，每小时检查一次

    
    maxTime = 24 * 3600 # 暂定24小时

    curTime = int(time.time())

    #GameWorld.DebugLog("处理24小时内在线的角色职业玩家: curTime=%s,maxTime=%s, %s" % (curTime, maxTime, PyGameData.g_onedayJobPlayerLoginoffTimeDict))

    
    playerManager = GameWorld.GetPlayerManager()

    for playerDict in PyGameData.g_onedayJobPlayerLoginoffTimeDict.values():

        for playerID, loginoffTime in playerDict.items():

            if playerManager.FindPlayerByID(playerID):

                #GameWorld.DebugLog("    在线不处理, playerID=%s" % playerID)

                continue

            if curTime - loginoffTime > maxTime:

                playerDict.pop(playerID)

                #GameWorld.DebugLog("    超时玩家，移除! playerID=%s,loginoffTime=%s" % (playerID, loginoffTime))

    #GameWorld.DebugLog("    处理完毕，剩余玩家! %s" % PyGameData.g_onedayJobPlayerLoginoffTimeDict)

    return



## 增加高手玩家上线广播

@@ -218,9 +250,6 @@
            if checkMark not in ShareDefine.BillboardTypeList:

                continue

            

            if checkMark in [ShareDefine.Def_BT_HighLadder]:

                continue

            
            billboard = GameWorld.GetBillboard().FindBillboard(checkMark)

            if not billboard:

                continue

@@ -239,11 +268,7 @@
                objBillboard = billboard.At(index)

                if curPlayer.GetID() == objBillboard.GetID():

                    msgMark = notifyDict[order]

                    break

#        # 竞技场

#        elif checkMark == "HighLadder":

#            highLadderOrder = HighLadder.GetPlayerOrder(curPlayer.GetID()) + 1

#            msgMark = notifyDict.get(highLadderOrder, "")             
                    break           
        

        # 有可以广播的，马上广播，退出，不再检查

        if msgMark:

@@ -499,6 +524,9 @@
#  @remarks 函数详细说明.

def __Func_PlayerDisconnect(curPlayer, tick):

    

    if GameWorld.IsCrossServer():

        PlayerFB.OnPlayerDisconnectCrossServer(curPlayer)

        
    #跨服匹配PK

    CrossRealmPK.OnLeaveServer(curPlayer)

    

@@ -508,12 +536,19 @@
    PlayerFamily.PlayerLogoffRefreshFamily(curPlayer, tick)

    PlayerFriend.OnPlayerDisconnect(curPlayer, tick)

    

    __UpdOnedayJobPlayerLoginoffTime(curPlayer)

    PlayerGeTui.NewGuyCallBackGeTui(curPlayer, tick)

    # 设置家族成员离线时间

    SetPlayerOfflineTime(curPlayer)

    
    #拍卖行

    AuctionHouse.OnPlayerLeaveServer(curPlayer)

    #------------镖车逻辑

    #TruckPlayerDisconnectProcess(curPlayer, tick)

    
    if not PlayerControl.GetIsTJG(curPlayer):

        playerID = curPlayer.GetPlayerID()

        PyGameData.g_unTJLogoffTime[playerID] = int(time.time())

        
    return



## 设置玩家离线时间

@@ -618,8 +653,6 @@


    elif packType == IPY_GameServer.CDBPlayerRefresh_Job:

        curPlayer.SetJob(packValue)

    elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr1:

        PlayerControl.SetJobRank(curPlayer, packValue)

        

#    elif packType == IPY_GameServer.CDBPlayerRefresh_CurrentPlayerType:

#        #这里应该通知组队那边刷新

@@ -641,6 +674,10 @@
    elif packType == IPY_GameServer.CDBPlayerRefresh_VIPLv:

        curPlayer.SetVIPLv(packValue);

#        __RefreshTeamState(curPlayer)

    
    elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr5:

        PlayerControl.SetCrossMapID(curPlayer, packValue, False)

        
    elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr9:

        PlayerControl.SetVIPExpireTime(curPlayer, packValue)

        

@@ -649,7 +686,10 @@
        

    elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr11:

        PlayerControl.SetTodayXianyuanCoin(curPlayer, packValue)



        
    elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr13:

        PlayerControl.SetPlayerServerGroupID(curPlayer, packValue)

        
    elif packType == IPY_GameServer.CDBPlayerRefresh_OperateInfo:

        curPlayer.SetOperateInfo(packValue);

    

@@ -683,6 +723,7 @@
    GameWorldBoss.OnPlayerChangeMap(curPlayer)

    PlayerFamily.OnPlayerChangeMap(curPlayer, tick)

    PlayerFamilyParty.OnPlayerChangeMap(curPlayer, tick)

    GameWorldFamilyWar.OnPlayerChangeMap(curPlayer)

    return 



## 玩家切换真实地图

@@ -760,6 +801,9 @@
    #改到mapServer登录成功通知

    #Sync_PyServerDataTimeToClient(curPlayer, tick)

    

    if GameWorld.IsCrossServer():

        PlayerFB.PlayerLoginLoadCrossMapOK(curPlayer)

        
    PlayerTeam.OnPlayerReadMapOK(curPlayer, tick)

    

    #刷新人物日期状态

@@ -773,7 +817,7 @@
#===============================================================================

    #自己已经初始化成功

    curPlayer.SetInitOK(True)

    
    GMShell.OnPlayerLogin(curPlayer)

    #发送请求至目标地图(任务需要登陆家族长触发事件)

    __RefreshFamilyToMapServer(curPlayer)

    return

@@ -873,17 +917,29 @@
#{

#    tagHead        Head;

#    DWORD        MapID;

#    BYTE        FBLineID;

#    BYTE        IsAllLine;

#    BYTE        LineCount;

#    BYTE        LineIDList[LineCount];    //个数为0时代表查全部

#};

def ClinetQueryFBLinePlayerCnt(index, clientData, tick):

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

    queryMapID = clientData.MapID

    fbLineID = clientData.FBLineID

    isAllLine = clientData.IsAllLine

    queryFBLineIDList = clientData.LineIDList

    playerManager = GameWorld.GetPlayerManager()

    

    sendCMD = str([queryMapID, fbLineID, isAllLine])

    if queryMapID in ChConfig.Def_CrossMapIDList:

        fbLinePlayerInfoDict = PyGameData.g_crossFBFuncLinePlayerCountInfo.get(queryMapID, {})

        if not queryFBLineIDList:

            resultInfo = [queryMapID, fbLinePlayerInfoDict]

        else:

            defaultInfo = [0] # 与本服结构相同，默认0人

            queryFBLineInfo = {}

            for lineID in queryFBLineIDList:

                queryFBLineInfo[lineID] = fbLinePlayerInfoDict.get(lineID, defaultInfo)

            resultInfo = [queryMapID, queryFBLineInfo]

        QueryFBLinePlayerCntResult(curPlayer, resultInfo)

        return

    
    sendCMD = str([queryMapID, queryFBLineIDList])

    playerManager.MapServer_QueryPlayer(curPlayer.GetPlayerID(), 0, 0, queryMapID,

                'FBLinePlayerCnt', sendCMD, len(sendCMD), curPlayer.GetRouteServerIndex())

    return

@@ -899,11 +955,13 @@
    fblinePack = ChPyNetSendPack.tagGCFBLinePlayerCnt()

    fblinePack.MapID = tagMapID

    fblinePack.FBLineInfoList = []

    for lineID, playerCnt in fbLinePlayerCntDict.items():

    for lineID, infoList in fbLinePlayerCntDict.items():

        mapLineState = ChPyNetSendPack.tagGCFBLineInfo()

        mapLineState.Clear()

        mapLineState.FBLineID = lineID

        mapLineState.PlayerCnt = playerCnt

        mapLineState.PlayerCnt = infoList[0] if infoList else 0

        mapLineState.ExtraStr = infoList[1] if len(infoList) > 1 else ''

        mapLineState.ExtraStrLen = len(mapLineState.ExtraStr)

        fblinePack.FBLineInfoList.append(mapLineState)

    

    fblinePack.Count = len(fblinePack.FBLineInfoList)