From be35331b8931d2829f014749a827a1c37c78feff Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 29 五月 2019 17:11:18 +0800
Subject: [PATCH] 6997 【后端】【2.0】战力计算整理

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index f53d752..1dfac90 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -35,6 +35,8 @@
 import PlayerNewFairyCeremony
 import PlayerUniversalGameRec
 import GameWorldAverageLv
+import PlayerFamilyBoss
+import PlayerHorsePetBoss
 import GameWorldProcess
 import ChPyNetSendPack
 import NetPackCommon
@@ -269,9 +271,9 @@
                     isEnd = (curDateTime == endDayDate)
                     
             # 每天按时段开启的,支持多时段
-            else:
-                if startDayDate <= curDateTime <= endDayDate:
-                    isEnd = (curDateTime == endDayDate)
+            elif startDayDate <= curDateTime <= endDayDate:
+                isEnd = (curDateTime == endDayDate)
+                if not isEnd:
                     for hmIndex, startHMStr in enumerate(startHMStrList):
                         endHMStr = endHMStrList[hmIndex]
                         # 每天开的, 实际开关时间只取今天的日期; 这里有个问题,全服广播的时间不是今天的, 暂不做支持,之后真有这种需求再说
@@ -1264,6 +1266,13 @@
     #跨服PK
     elif dictName == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_CrossReamPK:
         CrossRealmPK.OnCrossRealmPKDailyActionStateChange(isOpen)
+    #仙盟BOSS
+    elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1]:
+        PlayerFamilyBoss.OnAllFamilyBossStateChange(isOpen)
+    #骑宠BOSS
+    elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_HorsePetBoss]:
+        PlayerHorsePetBoss.OnHorsePetBossStateChange(isOpen)
+    
     return
 
 #-------------------------------------------------------------------------------

--
Gitblit v1.8.0