9693 【后端】【越南】【主干】坐骑觉醒吞噬没有战力提升 冲突提交

hxp

2022-08-24 cfeae20c987f7aa06d853bf45bc46db111e441e9

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

@@ -90,6 +90,7 @@
import CrossRealmPK

import CrossRealmMsg

import CrossRealmPlayer

import CrossBattlefield

import CrossActionControl

import PlayerFBHelpBattle

import PlayerFamilyRedPacket

@@ -98,12 +99,17 @@
import PlayerFamilyParty

import GameWorldFamilyWar

import GameWorldArena

import CrossLuckyCloudBuy

import AuctionHouse

import PlayerXMZZ

import PlayerLove

import PlayerTeam

import PyGameData

import CrossBoss

import ChPlayer

import PyDataManager

import GameWorldOpenServerCampaign

import CrossBillboard

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



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

@@ -139,6 +145,7 @@
    GameWorld.Log("GameServer -> OnDay!")

    #排行榜拷贝昨日榜单

    PlayerBillboard.CopyBillboardOnDay()

    CrossBillboard.CopyBillboardOnDay()

    #开服活动，放在排行榜拷贝昨日榜更新后处理

    PlayerEventCounter.DoLogic_GameServer_OnDay(tick)

    # 通知开服天数, 放在地图OnDay之前处理, 不然地图在OnDay时需要用到开服天时会取到昨天的值

@@ -164,6 +171,7 @@
    # 通知开服天数

    #openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)

    #GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ServerDay, openServerDay)

    GameWorldOpenServerCampaign.DoOnDay()

    #清理过期补偿

    PlayerCompensation.ClearUpTimeOutCompensation()

    #PlayerGeTui.ClearFMTGeTuiLimit()

@@ -171,6 +179,10 @@
    PlayerBourse.OverTimeItemsDeal()

    # 仙盟联赛

    GameWorldFamilyWar.DoOnDay()

    # 情缘

    PlayerLove.DoOnDay()

    # 云购

    CrossLuckyCloudBuy.DoOnDay()

    return



def OnDayEx(tick):

@@ -309,6 +321,9 @@
    #拍卖行

    AuctionHouse.OnAuctionItemTimeProcess(curTime, tick)

    

    #情缘

    PlayerLove.OnTimeProcess(curTime, tick)

    
    #每整分钟处理一次

    curDateTime = datetime.datetime.today()

    curMinute = curDateTime.minute

@@ -344,7 +359,8 @@
    # 每整分钟触发一次

    #检查服务器正式开服

    DoCheckNewServerOpen(tick)

    
    #回报数据库当前在线玩家数

    DisposeGameActivePlayer(tick)

    #处理游戏世界中的时间事件

    DisposeGameWorldEvenByTime(tick)

    GameWorldActionControl.Dispose_OperationActionState()

@@ -352,6 +368,7 @@
    GameWorldActionControl.Dispose_FBStateTime()

    #跨服PK

    CrossRealmPK.OnMinuteProcess()

    CrossBattlefield.OnMinuteProcess()

    #处理重开服务器后, 活动继续开启逻辑根据天数

    #GameWorldActionControl.Dispose_Action_GoOn_ByDay(tick)

    #触发世界等级

@@ -367,6 +384,9 @@
        PlayerFamily.UpdFamilyTotalFightPower()

        PlayerFamilyRedPacket.CheckDelRedpacketData()

        

    return



def OnReloadConfig():

    return



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

@@ -392,7 +412,7 @@
    #处理世界活动

    DisposeGameWorldGame(tick)

    #回报数据库当前在线玩家数

    DisposeGameActivePlayer(tick)

    #DisposeGameActivePlayer(tick)

    #同步地图服务器时间

    Dispose_MapServer_Time(tick)

    #保存玩家数据

@@ -592,15 +612,18 @@
    #activePlayerCount = GameWorld.GetPlayerManager().GetActivePlayerCount()

    #DataRecordPack.DR_OnLinePlayerCount(activePlayerCount, platformOLDict, tjgOnlineCnt)

    #===========================================================================

    for platform, playerCnt in platformOLDict.items():

        DataRecordPack.DR_OnLinePlayerCount(playerCnt, platform, tjgOnlineCnt) # 单平台

        EventReport.WriteEvent_concurrency(playerCnt, 0, platform) # 单平台  此处不能传脱机挂玩家总数

        


    isMixture = False #是否混服

    if isMixture:

        for platform, playerCnt in platformOLDict.items():

            DataRecordPack.DR_OnLinePlayerCount(playerCnt, platform, tjgOnlineCnt) # 单平台

            EventReport.WriteEvent_concurrency(playerCnt, 0, platform) # 单平台  此处不能传脱机挂玩家总数

        DataRecordPack.DR_OnLinePlayerCount(activePlayerCount, {}, tjgOnlineCnt)    # 总在线

        #EventReport.WriteEvent_concurrency(activePlayerCount, tjgOnlineCnt)

    else:

        serverPlatform = GameWorld.GetPlatform()

        DataRecordPack.DR_OnLinePlayerCount(activePlayerCount, {}, tjgOnlineCnt)    # 总在线

        EventReport.WriteEvent_concurrency(activePlayerCount, tjgOnlineCnt, serverPlatform)

    #===========================================================================



    DataRecordPack.DR_OnLinePlayerCount(activePlayerCount, {}, tjgOnlineCnt)    # 总在线

    #EventReport.WriteEvent_concurrency(activePlayerCount, tjgOnlineCnt)

    #刷新当前地图服务器

    #===========================================================================

    # custom_concurrencyMapList = ReadChConfig.GetEvalChConfig("EventReportMapID")

@@ -1205,10 +1228,9 @@
def InitGameWorld(tick):

    #标记GameWorld初始化完成

    GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_IsGameWorldInit, int(time.time()))

    PlayerControl.LoadDBPlayer()

    #初始化游戏时钟

    GameWorld.GetGameWorld().SetTickTypeCount(ChConfig.TYPE_Tick_Count)

    #转移运营活动旧db记录key value 到 新记录

    GameWorldActionControl.TransferOperationActDBKeyValue()

    #初始话开服时间、星期几

    initOpenServerTime = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_InitOpenServerTime)

    openServerWeekday = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OpenServerWeekday)

@@ -1245,8 +1267,12 @@
    GameWorldArena.OnServerStart()

    #跨服PK

    CrossRealmPK.OnGameServerInitOK()

    #跨服战场

    CrossBattlefield.OnServerStart()

    #红包

    PlayerFamilyRedPacket.OnServerStart()

    #云购

    CrossLuckyCloudBuy.OnServerStart()

    #世界boss被杀次数重置

    #GameWorldBoss.CheckResetBossKilledCntOnServerInit()

    

@@ -1267,6 +1293,11 @@
    AuctionHouse.OnGameServerInitOK()

    # 注意：跨服相关信息的调用需放在最后，不然可能导致服务器未启动功能或者功能未加载成功导致跨服服务器与子服之间的数据同步可能出现异常的情况

    CrossRealmMsg.OnGameServerInitOK()

    if PyGameData.g_allMapServerInitOK:

        GameWorld.Log("InitGameWorld时AllMapServerInitOK已触发则补触发一次!")

        GameWorld.SendGameError("GameWarning", "InitGameWorld later than AllMapServerInitOK")

        AllMapServerInitOK(tick)

        
    return



def DoCheckNewServerOpen(tick):

@@ -1339,11 +1370,18 @@
    

    PyGameData.g_sortBOSSRefreshList = [] # boss刷新信息记录缓存重置, 不重置会导致通知前端的boss信息为空

    

    GameWorldArena.OnServerStart()

    
    CrossBattlefield.OnServerStart()

    
    PlayerDBGSEvent.SetInitOpenServerTime(setOpenServerTime)

    

    ReadChConfig.ReloadConfig()

    

    AllMapServerInitOK(tick)

    
    GameWorld.GetGameWorld().SaveGameServerData()

    GameWorld.SendGameError("ClearOpenServerOK")

    return



## 服务器开服时是星期几

@@ -1354,6 +1392,10 @@
#  @return None

#  @remarks 当一个mapServer开启时，

def AllMapServerInitOK(tick):

    PyGameData.g_allMapServerInitOK = True

    if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_IsGameWorldInit):

        GameWorld.Log("AllMapServerInitOK时GameServer还未启动好!")

        return

    #通知所有地图服务器初始化成功, 同步时间

    GameWorld.GetGameWorld().Notify_AllMapServerInitOK(GameWorld.GetCurrentDataTimeStr())

    

@@ -1417,14 +1459,19 @@
    GameWorldFamilyWar.OnMapServerInitOK()

    

    # 跨服服务器状态

    GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerTime, PyGameData.g_crossServerTimeInfo)

    isCrossServerOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)

    GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isCrossServerOpen)

    GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossZoneName, PyGameData.g_crossZoneName)

    

    # 跨服PK

    CrossRealmPK.OnMapServerInitOK()

    #跨服战场

    CrossBattlefield.OnMapServerInitOK()

    # 本服竞技场

    GameWorldArena.SendMapServerArenaInfo()

    # 幸运云购

    CrossLuckyCloudBuy.OnMapServerInitOK()

    

    SendAllMapGlobalDropInfo() # 全局掉落控制

    

@@ -1433,6 +1480,8 @@
    PlayerFamily.RandomFakeFamily()

    #缥缈仙域

    PlayerFairyDomain.OnMapServerInitOK()

    #情侣信息

    PyDataManager.GetDBPyCoupleManager().SendMapServerCoupleInfo()

    # 记录服务器是否正常开启完毕

    getUrl = ReadChConfig.GetPyMongoConfig("EventReport", "OpenStateUrl") + "?Type=MapInit&MapCount=%s"%GameWorld.GetGameWorld().GetGameMapManager().GetCount()

    GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)

@@ -1932,8 +1981,11 @@
    ChPlayer.SavePlayerLVData()

    PlayerFBHelpBattle.OnServerClose()

    CrossActionControl.OnServerClose()

    CrossBattlefield.OnServerClose()

    PlayerFamilyRedPacket.OnServerClose()

    CrossLuckyCloudBuy.OnServerClose()

    GameWorldArena.OnServerClose()

    PlayerLove.OnServerClose()

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

    GameWorld.GetGameWorld().OnServerClose()