From fbd34b145d0ea16141759deacf7db707e4f6f2ce Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 04 十二月 2020 10:27:05 +0800 Subject: [PATCH] 4869 【主干】【长尾】【BT】修复运营活动没配置开服/合服定制时,配置单日的活动在开服/合服定制天无法开启的bug; --- ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py index 4c8cc92..5608c72 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py @@ -236,7 +236,7 @@ customMaxServerDateTime = curDateTime + datetime.timedelta(days=(customMaxServerDay-openServerDay)) curStartDateTime = datetime.datetime.strptime("%s %02d:%02d:%02d" % (startDateStr, customMaxServerDateTime.hour, customMaxServerDateTime.minute, customMaxServerDateTime.second), ChConfig.TYPE_Time_Format) - if curServerOpenDateTime <= curStartDateTime <= customMaxServerDateTime: + if customOpenServerDayState and curServerOpenDateTime <= curStartDateTime <= customMaxServerDateTime: if actName not in startDateInCustomCanOpenList: GameWorld.Log(" 按日期/周开的开始日期在开服定制限制天内,不处理! cfgID=%s,curServerOpenDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, curServerOpenDateTime, curStartDateTime, customMaxServerDateTime)) continue @@ -249,7 +249,7 @@ customMaxServerDateTime = curDateTime + datetime.timedelta(days=(maxCustomServerDayMix-mixServerDay)) curStartDateTime = datetime.datetime.strptime("%s %02d:%02d:%02d" % (startDateStr, customMaxServerDateTime.hour, customMaxServerDateTime.minute, customMaxServerDateTime.second), ChConfig.TYPE_Time_Format) - if mixStartServerDateTime <= curStartDateTime <= customMaxServerDateTime: + if customMixServerDayState and mixStartServerDateTime <= curStartDateTime <= customMaxServerDateTime: if actName not in startDateInCustomCanOpenList: GameWorld.Log(" 按日期/周开的开始日期在合服定制限制天内,不处理! cfgID=%s,mixStartServerDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, mixStartServerDateTime, curStartDateTime, customMaxServerDateTime)) continue -- Gitblit v1.8.0