From 8bf2e133de607c17a898bec2264f55aa463a3fa7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 10 五月 2019 16:37:12 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 4012状态判定增加 查找是否释放者

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py |   44 ++++++++++++++------------------------------
 1 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
index b0386b1..cb2b1bd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
@@ -24,10 +24,11 @@
 import datetime
 import PlayerFamily
 import PlayerDBGSEvent
-import GameWorldActionControl
+import PlayerViewCache
+import PlayerFBHelpBattle
+import PlayerFairyDomain
 import ChPyNetSendPack
 import NetPackCommon
-import PlayerManorWar
 import PlayerDuJie
 #---------------------------------------------------------------------
 
@@ -39,6 +40,7 @@
 def DoLogic_GameServer_OnHour(tick):
     #处理这个小时发出的邮件
     #GameWorld.GetMailManager().ProcessAllMail()
+    PlayerFairyDomain.OnHour()
     return
 
 ## 处理玩家每日响应
@@ -54,17 +56,9 @@
     if isMixServer:
         PlayerDBGSEvent.SetDBGSTrig_ServerTime(PlayerDBGSEvent.Def_MixServerDay)
     
-    #设定上次开启活动时间距离现在天数事件
-    GameWorldActionControl.DoLogic_ServerLastOpenActionDay()
-    
-    #领地争夺战OnDay
-    #PlayerManorWar.OnDay()
-    
     #家族更新
     PlayerFamily.FamilyOnDay(tick)
     
-    #合服活动
-    #GameWorldMixServerCampaign.MixServerOnDay()
     playerManager = GameWorld.GetPlayerManager()
     for i in xrange(playerManager.GetPlayerCount()):
         curPlayer = playerManager.GetPlayerByIndex(i)
@@ -81,7 +75,12 @@
 def DoLogic_GameServer_OnDayEx(tick):
     #渡劫OnDay
     PlayerDuJie.OnDayEx()
-    
+    #副本助战
+    PlayerFBHelpBattle.HelpBattleOnDay()
+    #玩家缓存
+    PlayerViewCache.DoOnDayEx()
+    #缥缈OnDay
+    PlayerFairyDomain.OnDayEx()
     playerManager = GameWorld.GetPlayerManager()
     for i in xrange(playerManager.GetPlayerCount()):
         curPlayer = playerManager.GetPlayerByIndex(i)
@@ -180,14 +179,11 @@
 #  @remarks 函数详细说明.
 def PlayerOnDay(curPlayer):
     
+    if GameWorld.IsCrossServer():
+        return
+    
     #通知开服天数
     Sync_OpenServerDay(curPlayer)
-    
-    #通知上次根据开服天数开启的活动到现在的天数
-    #Sync_ServerLastOpenActionDay(curPlayer)
-    
-    #通知跨服服务器开启的活动到现在的天数
-    #Sync_MergeServerOpenActionDay(curPlayer)
     
     GameWorld.Log("PlayerOnDay!", curPlayer.GetPlayerID())
     return
@@ -297,7 +293,7 @@
     packData.Day = openDay
     packData.IsMixServer = isMixServer
     packData.MixDay = mixServerDay
-    packData.OpenWeekday = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_InitOpenServerTime)
+    packData.OpenWeekday = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OpenServerWeekday)
     packData.NowYear = serverTime.year
     packData.NowMonth = serverTime.month
     packData.NowDay = serverTime.day
@@ -306,18 +302,6 @@
     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