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 | 97 ++++++++++++++++++++++++++----------------------
1 files changed, 52 insertions(+), 45 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 e366e5e..76e21b4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
@@ -25,7 +25,8 @@
import IPY_GameWorld
import DataRecordPack
import PlayerEventCounter
-import PlayerViewCache
+import GameLogic_Qunying
+import GameWorldAction
import PlayerControl
import NetPackCommon
import PlayerOnline
@@ -89,8 +90,11 @@
DBDataMgr.OnServerStart() # 优先加载公共数据
#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)
@@ -107,7 +111,7 @@
__DoMixServerInit()
# 其他功能初始化
-
+ GameLogic_Qunying.OnServerStart()
# 最后触发检查是否完全启动成功
PyGameData.g_initGameWorldOK = True
@@ -157,30 +161,6 @@
#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)
if not setOpenServerTime:
@@ -210,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
@@ -332,15 +320,13 @@
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()
@@ -365,6 +351,14 @@
gameWorld.SetGameWorldDict("OnlineCntM", curMinute)
activePlayerCount = GameWorld.GetPlayerManager().OnlineCount()
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):
@@ -457,22 +451,26 @@
PlayerEventCounter.DoLogic_OnYear(tick)
return
-def DoLogic_CrossCenterEvent(centerEventValue, centerServerID=0):
+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 centerServerID:
- GameWorld.Log("处理跨服中心事件值! serverEventValue=%s,centerEventValue=%s,centerServerID=%s" % (serverEventValue, centerEventValue, centerServerID))
-
- if serverEventValue == centerEventValue:
- GameWorld.DebugLog("跨服中心事件值不变! serverEventValue=%s,centerEventValue=%s,centerServerID=%s" % (serverEventValue, centerEventValue, centerServerID))
+ #第一次也要执行一次
+ #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
- serverEventTime = GameWorld.ChangeStrToDatetime("%s:%02d:%02d" % serverEventValue, ChConfig.TYPE_Time_Format_YmdHMS)
- centerEventTime = GameWorld.ChangeStrToDatetime("%s:%02d:%02d" % centerEventValue, ChConfig.TYPE_Time_Format_YmdHMS)
+ 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
@@ -491,12 +489,12 @@
isEvent = False
#OnHour事件
- if (serverHour != centerHour or serverDay != centerDay or serverMonth != centerMonth or serverYear != centerYear):
+ 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):
+ if (serverDay != centerDay or serverMonth != centerMonth or serverYear != centerYear or gmEvent == "GMOnDay"):
isEvent = True
PlayerEventCounter.DoLogic_CrossCenterOnDay(centerEventValue)
@@ -512,6 +510,15 @@
#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):
--
Gitblit v1.8.0