From 9e6207bd55a334561f1640ec109aa3481bcaa0f8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 18 三月 2026 19:17:31 +0800
Subject: [PATCH] 526 【挑战】PVP群英榜-后端(功能开启时补充挑战令到满,溢出不补;优化自身名次与上次匹配时的名次不同时强制重刷匹配;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py |  195 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 153 insertions(+), 42 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
index 824a5dd..76e21b4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
@@ -15,6 +15,8 @@
 #"""Version = 2025-05-15 10:35"""
 #-------------------------------------------------------------------------------
 
+import CrossMgr
+import ChConfig
 import DBDataMgr
 import GameWorld
 import PyMongoMain
@@ -23,13 +25,13 @@
 import IPY_GameWorld
 import DataRecordPack
 import PlayerEventCounter
-import PlayerViewCache
+import GameLogic_Qunying
+import GameWorldAction
 import PlayerControl
 import NetPackCommon
 import PlayerOnline
 import ShareDefine
 import PyGameData
-import ItemCommon
 import BattleObj
 import ChPlayer
 import ObjPool
@@ -80,16 +82,24 @@
 
 def InitGameWorld(tick):
     ## GameWorld初始化
-    if PyGameData.g_initGameTime:
+    if PyGameData.g_initGameWorldOK:
         return
     serverID = GameWorld.GetGameWorld().GetServerID()
-    GameWorld.Log("服务器启动初始化InitGameWorld: serverID=%s" % serverID)
+    serverType = GameWorld.GetServerType()
+    GameWorld.Log("服务器启动初始化InitGameWorld: serverID=%s,serverType=%s" % (serverID, serverType))
     DBDataMgr.OnServerStart() # 优先加载公共数据
-    ItemCommon.InitPyItem()
+    #ItemCommon.InitPyItem() # 改为放 InitItem 加载
     LoadDBPlayer()
-    PlayerViewCache.LoadRobot()
+    #PlayerViewCache.LoadRobot()
     PyGameData.g_initGameTime = int(time.time()) # 放到加载数据之后
     
+    # 检查跨服中心唯一性
+    GameWorld.CheckCrossCenterUniquenessErr()
+    
+    if DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_FamilyTransDataTime):
+        DBDataMgr.GetEventTrigMgr().SetValue(ShareDefine.Def_FamilyTransDataTime, 0)
+        GameWorld.Log("启动服务器时重置跨服公会传输数据状态!")
+        
     #初始话开服时间、星期几
     initOpenServerTime = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_InitOpenServerTime)
     openServerWeekday = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_OpenServerWeekday)
@@ -101,19 +111,45 @@
     __DoMixServerInit()
     
     # 其他功能初始化
+    GameLogic_Qunying.OnServerStart()
     
+    # 最后触发检查是否完全启动成功
+    PyGameData.g_initGameWorldOK = True
+    OnServerInitOK()
+    return
+
+def OnServerInitOK():
+    '''服务器完全启动初始化成功后的处理,如db数据加载及静态物品数据等都加载完毕了
+    如跨服间相关逻辑通讯需要等服务器完全启动完毕后才可进行
+    '''
+    if not PyGameData.g_initGameWorldOK or not PyGameData.g_initPyItem:
+        return
+    if PyGameData.g_serverInitOK:
+        return
+    PyGameData.g_serverInitOK = True
+    
+    tick = GameWorld.GetGameWorld().GetTick()
+    serverID = GameWorld.GetGameWorld().GetServerID()
     
     OnHighProcess(tick) # 主动触发一次高精度的调用,确保服务器启动后一些功能活动等的数据会被加载
     OnMinute(tick)
     
     GameWorld.Log("=============================== 服务器启动成功 ===================================")
+    serverType = GameWorld.GetServerType()
     isCrossServer = GameWorld.IsCrossServer()
     if isCrossServer:
-        pass
+        GameWorld.Log("跨服服务器启动成功: serverType=%s,serverID=%s" % (serverType, serverID))
     else:
-        serverGroupID = GameWorld.GetServerGroupID()
-        GameWorld.Log("服务器启动成功: ServerGroupID=%s,serverID=%s" % (serverGroupID, serverID))
-    PyGameData.g_serverInitOK = True
+        serverDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_ServerDay) + 1
+        isMixServer = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_IsMixServer)
+        mixServerDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_MixServerDay) + 1
+        GameWorld.Log("游戏服务器启动成功: serverType=%s,serverID=%s,serverDay=%s,isMixServer=%s,mixServerDay=%s" 
+                      % (serverType, serverID, serverDay, isMixServer, mixServerDay))
+        
+    DataRecordPack.DR_Reload("restart")
+    
+    # ---------- 以下处理服务器完全启动好后的逻辑 ----------
+    
     return
 
 def AllMapServerInitOK(tick):
@@ -124,30 +160,6 @@
         return
     #PlayerDBOper.FindDBOper(PlayerDBOper.Table_DBPlayer, {}, {"PlayerID":1, "AccID":1, "_id":0}, LoadDBPlayerRet)
     return
-
-def GMSetOpenServerTime(openServerTime):
-    '''GM设置开服时间
-    @param openServerTime: 开服时间戳
-    @return: 1-成功;-1-设置的时间异常;-2-已经设置过且开服了,不能重复设置
-    '''
-    serverID = GameWorld.GetGameWorld().GetServerID()
-    curTime = int(time.time())
-    if openServerTime < curTime:
-        GameWorld.ErrLog("当前时间已经超过设置的开服时间,不能设置! serverID=%s" % serverID)
-        #GMCommon.GMCommandResult(orderId, gmCmdDict, GMCommon.Def_InvalidTime, "The set time is less than the current time.")
-        return -1
-    setOpenServerTime = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_SetOpenServerTime)
-    if setOpenServerTime and curTime > setOpenServerTime:
-        GameWorld.ErrLog("已经设置过且开服了,不能重复设置! serverID=%s" % serverID)
-        #GMCommon.GMCommandResult(orderId, gmCmdDict, GMCommon.Def_ServerAlreadyOpen, "The server has been opened.")
-        return -2
-    
-    DBDataMgr.GetEventTrigMgr().SetValue(ShareDefine.Def_SetOpenServerTime, openServerTime)
-    GameWorld.Log("GM设置开服时间: serverID=%s,%s,%s" % (serverID, GameWorld.ChangeTimeNumToStr(openServerTime), openServerTime))
-    if openServerTime == curTime:
-        OnNewServerOpen(GameWorld.GetGameWorld().GetTick())
-        
-    return 1
 
 def DoCheckNewServerOpen(tick):
     setOpenServerTime = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_SetOpenServerTime)
@@ -178,16 +190,24 @@
     #清DBGSTrig
     excludeList = [ShareDefine.Def_InitOpenServerTime, ShareDefine.Def_SetOpenServerTime]
     DBDataMgr.GetEventTrigMgr().DelAllKey(excludeList)
+    #清榜单
+    DBDataMgr.GetBillboardMgr().DelAllData()
+    #清通用记录
+    DBDataMgr.GetGameRecMgr().DelAllData()
     #清家族
     DBDataMgr.GetFamilyMgr().DelAllFamily()
     #清邮件
     DBDataMgr.GetMailMgr().DelAllMail()
     DBDataMgr.GetPlayerViewCacheMgr().DelAllCache()
     
+    # 设置允许跨服,该函数为自动开服会触发,所以要设置为允许跨服,手动开服的需后台手动设置为允许
+    DBDataMgr.GetEventTrigMgr().SetValue(ShareDefine.Def_CanCross, 1)
     SetInitOpenServerTime(setOpenServerTime)
     AllMapServerInitOK(tick)
     
-    GameWorld.GetGameWorld().SaveGameServerData()
+    #强制备档一次、入库
+    DBDataMgr.BackupGameWorldData(saveToDB=True)
+    #GameWorld.GetGameWorld().SaveGameServerData()
     GameWorld.SendGameError("ClearOpenServerOK")
     return
 
@@ -238,7 +258,7 @@
 
 def OnHighProcess(tick):
     ## 每秒分钟执行一次
-    if not PyGameData.g_initGameTime:
+    if not PyGameData.g_serverInitOK:
         return
     curTime = int(time.time())
     if not PyGameData.g_highProcessTime:
@@ -263,6 +283,7 @@
         return
     
     PyMongoMain.GetUserCtrlDB().onSecondProcess()
+    CrossMgr.OnSecondProcess(tick, curTime)
     
     OnMinute(tick)
     
@@ -299,15 +320,14 @@
     DoCheckNewServerOpen(tick)
     DBDataMgr.OnMinute(curTime)
     DoLogic_GameWorldEvenByTime(tick)
+    GameWorldAction.OnProcessGameAction(curTime)
     
     #每5分钟
     if curMinute % 5 == 0:
         OnMinute_5(curTime, tick)
         
     #其他功能逻辑
-    #GameWorldActionControl.Dispose_OperationActionState()
-    #GameWorldActionControl.Dispose_DailyActionState()
-    #GameWorldActionControl.Dispose_FBStateTime()
+    PlayerControl.OnMinute(curTime)
     PlayerFamily.OnMinute()
     PlayerOnline.OnMinute()
     BattleObj.OnMinute()
@@ -333,7 +353,27 @@
     DataRecordPack.DR_OnLinePlayerCount(activePlayerCount) # 总在线
     return
 
+def OnGM_CrossCenterEvent(gmEvent):
+    if not GameWorld.IsCrossCenter():
+        return
+    serverEventValue = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_CrossCenterEvent)
+    if DoLogic_CrossCenterEvent(serverEventValue, gmEvent=gmEvent):
+        CrossMgr.SendCrossServerEvent(gmEvent=gmEvent)
+    return
+
 def DoLogic_GameWorldEvenByTime(tick):
+    '''跨服事件由跨服中心服务器驱动,游戏服使用原方式
+    跨服中心OnEvent -> 其他服务器OnEvent (包含个常规跨服服务器及游戏服,不保证谁先执行)
+        个别功能如果需要确保跨服先执行Event,再处理游戏服Event,可以由功能驱动跨服先执行,再同步游戏服执行
+    '''
+    if GameWorld.IsCrossServer():
+        if not GameWorld.IsCrossCenter():
+            return
+        eventValue = GameWorld.ToIntDef(GameWorld.ChangeTimeNumToStr(int(time.time()), ChConfig.TYPE_Time_Format_YmdH))
+        if DoLogic_CrossCenterEvent(eventValue):
+            CrossMgr.SendCrossServerEvent()
+        return  
+      
     #-----------服务器当前时间
     curTime = datetime.datetime.today()
     curTimeHour = curTime.hour
@@ -383,11 +423,13 @@
     GameWorld.Log("Server -> OnDay!")
     #设定服务器当前天事件
     eventMgr = DBDataMgr.GetEventTrigMgr()
-    eventMgr.SetValueIncrement(ShareDefine.Def_ServerDay)
+    serverDay = eventMgr.SetValueIncrement(ShareDefine.Def_ServerDay)
     isMixServer = eventMgr.GetValue(ShareDefine.Def_IsMixServer)
+    mixServerDay = 0
     if isMixServer:
-        eventMgr.SetValueIncrement(ShareDefine.Def_MixServerDay)
-        
+        mixServerDay = eventMgr.SetValueIncrement(ShareDefine.Def_MixServerDay)
+    GameWorld.Log("OnDay -> serverDay=%s,isMixServer=%s,mixServerDay=%s" % (serverDay + 1, isMixServer, mixServerDay + 1))
+    
     PlayerEventCounter.DoLogic_OnDay(tick)
     return
 
@@ -409,6 +451,75 @@
     PlayerEventCounter.DoLogic_OnYear(tick)
     return
 
+def DoLogic_CrossCenterEvent(centerEventValue, centerServerID=0, gmEvent=""):
+    ## 收到跨服中心事件同步,如OnDay等
+    serverEventValue = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_CrossCenterEvent)
+    #第一次也要执行一次
+    #if not serverEventValue:
+    #    serverEventValue = centerEventValue
+    #    DBDataMgr.GetEventTrigMgr().SetValue(ShareDefine.Def_CrossCenterEvent, centerEventValue)
+    
+    if serverEventValue == centerEventValue and not gmEvent:
+        if centerServerID:
+            GameWorld.Log("本服与跨服中心事件值相同不处理! serverEventValue=%s,centerEventValue=%s,centerServerID=%s" % (serverEventValue, centerEventValue, centerServerID))
+        return
+    
+    if centerServerID:
+        GameWorld.Log("本服与跨服中心事件值变化! serverEventValue=%s,centerEventValue=%s,centerServerID=%s,gmEvent=%s" % (serverEventValue, centerEventValue, centerServerID, gmEvent))
+    else:
+        GameWorld.Log("跨服中心服务器事件值变化! serverEventValue=%s,centerEventValue=%s,gmEvent=%s" % (serverEventValue, centerEventValue, gmEvent))
+        
+    serverEventTime = GameWorld.ChangeStrToDatetime("%s" % serverEventValue, ChConfig.TYPE_Time_Format_YmdH)
+    centerEventTime = GameWorld.ChangeStrToDatetime("%s" % centerEventValue, ChConfig.TYPE_Time_Format_YmdH)
+    
+    serverHour = serverEventTime.hour
+    serverDay = serverEventTime.day
+    #serverWeek = datetime.datetime.isocalendar(serverEventTime)[1]
+    serverMonth = serverEventTime.month
+    serverYear = serverEventTime.year
+    
+    centerHour = centerEventTime.hour
+    centerDay = centerEventTime.day
+    #centerWeek = datetime.datetime.isocalendar(centerEventTime)[1]
+    centerMonth = centerEventTime.month
+    centerYear = centerEventTime.year
+    
+    DBDataMgr.GetEventTrigMgr().SetValue(ShareDefine.Def_CrossCenterEvent, centerEventValue)
+    
+    isEvent = False
+    
+    #OnHour事件
+    if (serverHour != centerHour or serverDay != centerDay or serverMonth != centerMonth or serverYear != centerYear or gmEvent == "GMOnHour"):
+        isEvent = True
+        PlayerEventCounter.DoLogic_CrossCenterOnHour(centerEventValue)
+        
+    #OnDay事件
+    if (serverDay != centerDay or serverMonth != centerMonth or serverYear != centerYear or gmEvent == "GMOnDay"):
+        isEvent = True
+        PlayerEventCounter.DoLogic_CrossCenterOnDay(centerEventValue)
+        
+    #OnWeek事件
+    #if (serverWeek != curTimeWeek):
+    #    OnWeek(tick)
+        
+    #OnMonth事件
+    #if (serverMonth != curTimeMonth or serverYear != curTimeYear):
+    #    OnMonth(tick)
+        
+    #OnYear事件
+    #if serverYear != curTimeYear:
+    #    OnYear(tick)
+    
+    # 游戏服额外处理玩家
+    if GameWorld.IsMainServer():
+        playerManager = GameWorld.GetPlayerManager()
+        for i in xrange(playerManager.OnlineCount()):
+            curPlayer = playerManager.OnlineAt(i)
+            if not GameWorld.IsNormalPlayer(curPlayer):
+                continue
+            PlayerEventCounter.PlayerOnCrossCenterEvent(curPlayer, centerEventValue, gmEvent=gmEvent)
+            
+    return isEvent
 
 def __CheckIpyDataRecycle(timeNow):
     ## 检查IpyData数据回收

--
Gitblit v1.8.0