From 1ea73e1885835466265ce788d93556b7030ee0e8 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期日, 30 十二月 2018 18:42:00 +0800 Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(GM工具增加子服服务器维护,文字翻译版) --- ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py | 41 +++++++++++++++-------------------------- 1 files changed, 15 insertions(+), 26 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py index 7479df5..ba4f61b 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py @@ -25,9 +25,9 @@ import PlayerFamily import PlayerDBGSEvent import GameWorldActionControl +import PlayerFBHelpBattle import ChPyNetSendPack import NetPackCommon -import PlayerManorWar import PlayerDuJie #--------------------------------------------------------------------- @@ -54,12 +54,6 @@ if isMixServer: PlayerDBGSEvent.SetDBGSTrig_ServerTime(PlayerDBGSEvent.Def_MixServerDay) - #设定上次开启活动时间距离现在天数事件 - GameWorldActionControl.DoLogic_ServerLastOpenActionDay() - - #领地争夺战OnDay - #PlayerManorWar.OnDay() - #家族更新 PlayerFamily.FamilyOnDay(tick) @@ -81,7 +75,8 @@ def DoLogic_GameServer_OnDayEx(tick): #渡劫OnDay PlayerDuJie.OnDayEx() - + #副本助战 + PlayerFBHelpBattle.HelpBattleOnDay() playerManager = GameWorld.GetPlayerManager() for i in xrange(playerManager.GetPlayerCount()): curPlayer = playerManager.GetPlayerByIndex(i) @@ -183,12 +178,6 @@ #通知开服天数 Sync_OpenServerDay(curPlayer) - #通知上次根据开服天数开启的活动到现在的天数 - #Sync_ServerLastOpenActionDay(curPlayer) - - #通知跨服服务器开启的活动到现在的天数 - #Sync_MergeServerOpenActionDay(curPlayer) - GameWorld.Log("PlayerOnDay!", curPlayer.GetPlayerID()) return @@ -285,6 +274,10 @@ # @param curPlayer: 玩家实例 # @return: None def Sync_OpenServerDay(curPlayer): + # 服务器时间 + serverTime = GameWorld.GetServerTime() + if not serverTime: + return openDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) isMixServer = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer) mixServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay) @@ -293,19 +286,15 @@ packData.Day = openDay packData.IsMixServer = isMixServer packData.MixDay = mixServerDay + packData.OpenWeekday = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OpenServerWeekday) + packData.NowYear = serverTime.year + packData.NowMonth = serverTime.month + packData.NowDay = serverTime.day + packData.NowHour = serverTime.hour + packData.NowMinute = serverTime.minute + packData.NowSecond = serverTime.second + packData.NowMicSecond = serverTime.microsecond NetPackCommon.SendFakePack(curPlayer, packData) - return - - -## 通知上次根据开服天数开启的活动到现在的天数 -# @param curPlayer: 玩家实例 -# @return: None -def Sync_ServerLastOpenActionDay(curPlayer): -# lastOpenActionDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerLastOpenActionDay) -# packData = ChPyNetSendPack.tagServerLastOpenActionDay() -# packData.Clear() -# packData.Day = lastOpenActionDay -# NetPackCommon.SendFakePack(curPlayer, packData) return -- Gitblit v1.8.0