From f6a4dfb5b00b4a2ff652ac2a1669904a267a5830 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 06 五月 2021 16:55:27 +0800
Subject: [PATCH] 8721 【主干】【BT2】【后端】H.活动-合服庆典(转盘 同步主干冲突)
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
index 954a651..8390752 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
@@ -24,9 +24,11 @@
import datetime
import PlayerFamily
import PlayerDBGSEvent
-import GameWorldActionControl
+import PlayerViewCache
import PlayerFBHelpBattle
+import PlayerFairyDomain
import ChPyNetSendPack
+import GameWorldArena
import NetPackCommon
import PlayerDuJie
#---------------------------------------------------------------------
@@ -39,6 +41,7 @@
def DoLogic_GameServer_OnHour(tick):
#处理这个小时发出的邮件
#GameWorld.GetMailManager().ProcessAllMail()
+ PlayerFairyDomain.OnHour()
return
## 处理玩家每日响应
@@ -57,8 +60,6 @@
#家族更新
PlayerFamily.FamilyOnDay(tick)
- #合服活动
- #GameWorldMixServerCampaign.MixServerOnDay()
playerManager = GameWorld.GetPlayerManager()
for i in xrange(playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(i)
@@ -77,6 +78,12 @@
PlayerDuJie.OnDayEx()
#副本助战
PlayerFBHelpBattle.HelpBattleOnDay()
+ #玩家缓存
+ PlayerViewCache.DoOnDayEx()
+ #缥缈OnDay
+ PlayerFairyDomain.OnDayEx()
+ #竞技场
+ GameWorldArena.OnDayEx()
playerManager = GameWorld.GetPlayerManager()
for i in xrange(playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(i)
@@ -111,6 +118,9 @@
return
def DoLogic_GameServer_OnWeekEx(tick):
+
+ # 竞技场
+ GameWorldArena.OnWeekEx()
playerManager = GameWorld.GetPlayerManager()
for i in xrange(playerManager.GetPlayerCount()):
@@ -297,6 +307,7 @@
packData.NowMinute = serverTime.minute
packData.NowSecond = serverTime.second
packData.NowMicSecond = serverTime.microsecond
+ packData.WeekOfYear = GameWorld.GetWeekOfYear()
NetPackCommon.SendFakePack(curPlayer, packData)
return
--
Gitblit v1.8.0