From a15e3af5eb36a3c4eb6016e824faca23d6d6a9dc Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 14 一月 2019 11:06:06 +0800
Subject: [PATCH] 5768 【后端】【1.5】新增8-14天活动功能(通知修改)
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index 74ee805..794177d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -94,6 +94,7 @@
import EventReport
#import ReloadModule
import CrossRealmPK
+import CrossRealmMsg
import PlayerFBHelpBattle
import PlayerFamilyRedPacket
import IpyGameDataPY
@@ -543,22 +544,16 @@
# 所有服务器人数要回报一次， 每个map也要回报一次
# gameWorld.GetTickByType(0 - n) 取间隔
def DisposeGameActivePlayer(tick):
-# gameWorld = GameWorld.GetGameWorld()
-# lastTick = gameWorld.GetTickByType(ChConfig.TYPE_GetActivePlayerCount)
-#
-# if lastTick == -1:
-# #GameWorld.Log("未初始化服务器")
-# return
-#
-# if tick - lastTick < ChConfig.TYPE_Tick_Time[ChConfig.TYPE_GetActivePlayerCount]:
-# return
-#
-#
-# gameWorld.SetTickByType(ChConfig.TYPE_GetActivePlayerCount , tick)
-
+ gameWorld = GameWorld.GetGameWorld()
+ curMinute = datetime.datetime.today().minute
#为了每个服的输出时间点统一一个分钟点，便于统计
- if datetime.datetime.today().minute % 5 != 0:
+ if curMinute % 5 != 0:
return
+ noteData = gameWorld.GetDictByKey("OnlineCntM")
+ if noteData == curMinute:
+ # 同一分钟不多发送，此处不建议用CD处理，避免两CD冲突
+ return
+ gameWorld.SetDict("OnlineCntM", curMinute)
# 全服在线人数平台明细
platformOLDict = {} # 平台在线人数 {平台:人数, ...}
@@ -1211,7 +1206,8 @@
if initOpenServerTime <= 0 or openServerWeekday <= 0:
#记录首次开发时间(现实时间戳)
PlayerDBGSEvent.SetInitOpenServerTime(initOpenServerTime if initOpenServerTime else int(time.time()))
-
+
+ CrossRealmMsg.OnGameServerInitOK()
#初始化家族数量
GameWorld.GetFamilyManager().SetFamilyUpperLimitCount(ChConfig.Def_Family_MaxCnt)
#排序元宝交易平台
@@ -1238,12 +1234,20 @@
ChPlayer.LoadPlayerLVData()
#加载助战信息
PlayerFBHelpBattle.OnServerStart()
+ #跨服PK
+ CrossRealmPK.OnGameServerInitOK()
#世界boss被杀次数重置
#GameWorldBoss.CheckResetBossKilledCntOnServerInit()
#GameWorldActionTeHui.OnGameServerInitOK() # 特惠活动初始化
- #子服启动成功告知跨服主服
- serverGroupID = GameWorld.GetServerGroupID()
- GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
+ isCrossServer = GameWorld.IsCrossServer()
+ if isCrossServer:
+ isServerClose = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_CrossServerClose)
+ isServerOpen = 0 if isServerClose else 1
+ GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isServerOpen)
+ GameWorld.Log("跨服服务器启动成功: isServerOpen=%s" % isServerOpen)
+ else:
+ serverGroupID = GameWorld.GetServerGroupID()
+ GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
return
def DoCheckNewServerOpen(tick):
@@ -1403,6 +1407,10 @@
# 商店信息
#GameWorldShopItem.OnMapServerInitOK()
+ # 跨服服务器状态
+ isCrossServerOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isCrossServerOpen)
+
# 跨服PK
CrossRealmPK.OnMapServerInitOK()
@@ -1432,7 +1440,6 @@
# 清除指定通用数据
universalRecMgr = GameWorld.GetUniversalRecMgr()
delRecTypeList = [ShareDefine.Def_UniversalGameRecType_ManorWarInfo,
- #ShareDefine.Def_UniversalGameRecType_MergeRegister,
]
GameWorld.DebugLog(" 清除指定通用数据 delRecTypeList=%s" % str(delRecTypeList))
for delRecType in delRecTypeList:
@@ -1457,7 +1464,7 @@
# 删除过期的通用数据
curTime = int(time.time())
GameWorld.Log("执行删除过期的通用数据, curTime=%s" % curTime)
- delOutofdayRecDataDict = {ShareDefine.Def_UniversalGameRecType_MergeRegister:31 * 24 * 3600,
+ delOutofdayRecDataDict = {
}
for otDayRecType, otTime in delOutofdayRecDataDict.items():
otRecDataList = universalRecMgr.GetTypeList(otDayRecType)
--
Gitblit v1.8.0