From 28bb89eb2ee8558b1529df973347803088cef88e Mon Sep 17 00:00:00 2001 From: xdh <xiefantasy@qq.com> Date: 星期五, 19 四月 2019 15:10:27 +0800 Subject: [PATCH] 6374 境界提示增加参数 --- ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py index f564c1e..1dfac90 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py @@ -36,6 +36,7 @@ import PlayerUniversalGameRec import GameWorldAverageLv import PlayerFamilyBoss +import PlayerHorsePetBoss import GameWorldProcess import ChPyNetSendPack import NetPackCommon @@ -270,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] # 每天开的, 实际开关时间只取今天的日期; 这里有个问题,全服广播的时间不是今天的, 暂不做支持,之后真有这种需求再说 @@ -1266,9 +1267,11 @@ 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, - ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss2,]: + 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