From 1ff3e77b9f3398c3c0c057091b17a11d3040228a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 19 二月 2019 16:05:21 +0800
Subject: [PATCH] 6253 【主干】【1.6】守卫人皇添加怪物波数日志输出
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 104 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index b4d9c5b..98f9b51 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -83,8 +83,6 @@
import GameWorldAverageLv
import PlayerDBOper
import PlayerGeTui
-#import MergeBroadcast
-#import GameWorldMixServerCampaign
#import PlayerManorWar
import GameWorldBoss
#import GameWorldActionTeHui
@@ -94,9 +92,9 @@
import ReadChConfig
import EventReport
#import ReloadModule
-import CrossRealmMsg
import CrossRealmPK
-#import MergePlayer
+import CrossRealmMsg
+import CrossRealmPlayer
import PlayerFBHelpBattle
import PlayerFamilyRedPacket
import IpyGameDataPY
@@ -293,9 +291,8 @@
PlayerFamilyParty.FamilyParty_Process(tick)
# 帮主弹劾时钟调用
PlayerFamily.OnLeaderImpeachTick(tick)
-
- #跨服广播
- #MergeBroadcast.OnBroadcastProccee(tick)
+ #跨服玩家
+ CrossRealmPlayer.OnCrossProcess(tick)
#跨服PK匹配
CrossRealmPK.OnPKMatchProcess(tick)
@@ -359,6 +356,8 @@
PlayerTeam.DoCountdownLeaveTeamLogic(tick)
#副本助战
PlayerFBHelpBattle.OnMinuteProcess()
+ #红包
+ PlayerFamilyRedPacket.OnRedPacketMinuteProcess()
#每5分钟触发一次仙盟总战力更新
if curMinute % 5 == 0:
PlayerFamily.UpdFamilyTotalFightPower()
@@ -388,8 +387,6 @@
DisposeGameWorldGame(tick)
#回报数据库当前在线玩家数
DisposeGameActivePlayer(tick)
- #统计跨服服务器在线玩家
- #MergePlayer.DisposeMergeServerOnlinePlayer()
#同步地图服务器时间
Dispose_MapServer_Time(tick)
#保存玩家数据
@@ -550,22 +547,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 = {} # 平台在线人数 {平台:人数, ...}
@@ -1218,12 +1209,11 @@
if initOpenServerTime <= 0 or openServerWeekday <= 0:
#记录首次开发时间(现实时间戳)
PlayerDBGSEvent.SetInitOpenServerTime(initOpenServerTime if initOpenServerTime else int(time.time()))
-
+
#初始化家族数量
GameWorld.GetFamilyManager().SetFamilyUpperLimitCount(ChConfig.Def_Family_MaxCnt)
#排序元宝交易平台
GameWorld.GetGameWorld().GetDBGoldOrderFormMgr().Sort()
- PlayerBillboard.ClearBillboardOnServerInit()
#排序排行榜
PlayerBillboard.SortServerBillboard()
#排序仙盟
@@ -1245,12 +1235,28 @@
ChPlayer.LoadPlayerLVData()
#加载助战信息
PlayerFBHelpBattle.OnServerStart()
+ #跨服PK
+ CrossRealmPK.OnGameServerInitOK()
#世界boss被杀次数重置
#GameWorldBoss.CheckResetBossKilledCntOnServerInit()
#GameWorldActionTeHui.OnGameServerInitOK() # 特惠活动初始化
- #子服启动成功告知跨服主服
- serverGroupID = GameWorld.GetServerGroupID()
- GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
+
+ __Func_HighPrecisionProcess(tick) # 主动触发一次高精度的调用，确保服务器启动后一些功能活动等的数据会被加载
+
+ GameWorld.Log("=============================== 服务器启动成功 ===================================")
+ 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,crossZoneName=%s" % (isServerOpen, GameWorld.GetCrossZoneName()))
+ else:
+ serverGroupID = GameWorld.GetServerGroupID()
+ GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
+ GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_GameWorldInitOK, 1)
+
+ # 注意：跨服相关信息的调用需放在最后，不然可能导致服务器未启动功能或者功能未加载成功导致跨服服务器与子服之间的数据同步可能出现异常的情况
+ CrossRealmMsg.OnGameServerInitOK()
return
def DoCheckNewServerOpen(tick):
@@ -1357,8 +1363,6 @@
#触发节假日活动
#GameWorldActionHoliday.ActionHoliday_OpenAndClose(tick, True)
- #合服活动
- #GameWorldMixServerCampaign.UpdateMixServerCampaignState(True)
#通知世界等级
worldLv = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)
@@ -1378,12 +1382,11 @@
# 合服天
mixServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay)
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_MixServerDay, mixServerDay)
- # 上次合服时的开服天数
+ # 上次合服时的开服天数、世界等级
lastMixServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_LastMixServerDay)
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_LastMixServerDay, lastMixServerDay)
- # 上次清除排行榜的标记
- lastSign = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_ClearBillboardSign)
- GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ClearBillboardSign, lastSign)
+ lastMixServerWorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_LastMixServerWorldLV)
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_LastMixServerWorldLV, lastMixServerWorldLV)
# 通知战盟相关活动开启状态
fadState = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_FamilyActivityDayState)
@@ -1410,6 +1413,11 @@
# 商店信息
#GameWorldShopItem.OnMapServerInitOK()
+ # 跨服服务器状态
+ 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()
@@ -1434,38 +1442,44 @@
GameWorld.DebugLog("合服首次启动加载已经处理过！")
return
- GameWorld.DebugLog("合服首次启动加载处理...")
+ GameWorld.Log("合服首次启动加载处理...")
- # 清除指定通用数据
+ # 清除指定通用数据，一般是合服工具删，这里可以再做个补充
universalRecMgr = GameWorld.GetUniversalRecMgr()
- delRecTypeList = [ShareDefine.Def_UniversalGameRecType_ManorWarInfo,
- #ShareDefine.Def_UniversalGameRecType_MergeRegister,
- ]
- GameWorld.DebugLog(" 清除指定通用数据 delRecTypeList=%s" % str(delRecTypeList))
+ delRecTypeList = []
+ GameWorld.Log("清除指定通用数据 delRecTypeList=%s" % str(delRecTypeList))
for delRecType in delRecTypeList:
universalRecMgr.Delete(delRecType)
-
+
# 删除过期的通用数据
__DelOutofdayRecData(universalRecMgr)
# 仙盟联赛重置
GameWorldFamilyWar.DoFamilyWarReset()
+ # 重置所有仙盟联赛评级
+ familyManager = GameWorld.GetFamilyManager()
+ for i in xrange(familyManager.GetCount()):
+ family = familyManager.GetAt(i)
+ PlayerFamily.SetFamilyWarRank(family, 0)
+ PlayerFamily.DoFamilySort()
# 设置合服首次启动加载成功
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServerInitOK, 1)
- # 设置本次合服时的开服天数
+ # 设置本次合服时的开服天数、世界等级
serverDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_LastMixServerDay, serverDay)
- GameWorld.DebugLog(" 合服首次启动加载成功...")
+ worldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_LastMixServerWorldLV, worldLV)
+ GameWorld.Log(" 合服首次启动加载成功! serverDay=%s,worldLV=%s" % (serverDay, worldLV))
return
def __DelOutofdayRecData(universalRecMgr):
# 删除过期的通用数据
curTime = int(time.time())
- GameWorld.Log("执行删除过期的通用数据, curTime=%s" % curTime)
- delOutofdayRecDataDict = {ShareDefine.Def_UniversalGameRecType_MergeRegister:31 * 24 * 3600,
+ delOutofdayRecDataDict = {
}
+ GameWorld.Log("执行删除过期的通用数据, curTime=%s,delOutofdayRecDataDict=%s" % (curTime, delOutofdayRecDataDict))
for otDayRecType, otTime in delOutofdayRecDataDict.items():
otRecDataList = universalRecMgr.GetTypeList(otDayRecType)
if not otRecDataList:
--
Gitblit v1.8.0