From 31f23f47e183bc9ea886af369b4b4e1f290a6b1c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 22 十一月 2021 17:04:29 +0800
Subject: [PATCH] 9367 【BT5】【主干】战力压制拓展到21亿以上(主干冲突)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
index ba4f61b..24c18df 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
@@ -24,11 +24,14 @@
 import datetime
 import PlayerFamily
 import PlayerDBGSEvent
-import GameWorldActionControl
+import PlayerViewCache
 import PlayerFBHelpBattle
+import PlayerFairyDomain
 import ChPyNetSendPack
+import GameWorldArena
 import NetPackCommon
 import PlayerDuJie
+import PlayerCharm
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -39,6 +42,7 @@
 def DoLogic_GameServer_OnHour(tick):
     #处理这个小时发出的邮件
     #GameWorld.GetMailManager().ProcessAllMail()
+    PlayerFairyDomain.OnHour()
     return
 
 ## 处理玩家每日响应
@@ -54,11 +58,11 @@
     if isMixServer:
         PlayerDBGSEvent.SetDBGSTrig_ServerTime(PlayerDBGSEvent.Def_MixServerDay)
     
+    #魅力
+    PlayerCharm.DoOnDay()
     #家族更新
     PlayerFamily.FamilyOnDay(tick)
     
-    #合服活动
-    #GameWorldMixServerCampaign.MixServerOnDay()
     playerManager = GameWorld.GetPlayerManager()
     for i in xrange(playerManager.GetPlayerCount()):
         curPlayer = playerManager.GetPlayerByIndex(i)
@@ -77,6 +81,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)
@@ -96,6 +106,8 @@
     #设定服务器当前周事件
     PlayerDBGSEvent.SetDBGSTrig_ServerTime(PlayerDBGSEvent.Def_ServerWeek)
     
+    #魅力
+    PlayerCharm.DoOnWeek()
     #家族更新
     PlayerFamily.FamilyOnWeek(tick)
     
@@ -111,6 +123,9 @@
     return
 
 def DoLogic_GameServer_OnWeekEx(tick):
+    
+    # 竞技场
+    GameWorldArena.OnWeekEx()
     
     playerManager = GameWorld.GetPlayerManager()
     for i in xrange(playerManager.GetPlayerCount()):
@@ -174,6 +189,9 @@
 #  @return None
 #  @remarks 函数详细说明.
 def PlayerOnDay(curPlayer):
+    
+    if GameWorld.IsCrossServer():
+        return
     
     #通知开服天数
     Sync_OpenServerDay(curPlayer)
@@ -294,6 +312,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