4869 【主干】【长尾】【BT】运营活动按周开没有判断时间；（增加可配置活动开始天在开服、合服定制天内时，当定制天结束后可继续开启新活动；）

hxp

2020-11-26 a7386015c169263e9fc32496fddb6bce2bbea376

4869 【主干】【长尾】【BT】运营活动按周开没有判断时间；（增加可配置活动开始天在开服、合服定制天内时，当定制天结束后可继续开启新活动；）

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py

@@ -137,6 +137,7 @@
    curDateTimeStr = "%d-%d-%d %02d:%02d:00" % (serverTime.year, serverTime.month, serverTime.day, serverTime.hour, serverTime.minute)

    curDateTime = datetime.datetime.strptime(curDateTimeStr, ChConfig.TYPE_Time_Format)

    

    startDateInCustomCanOpenList = IpyGameDataPY.GetFuncEvalCfg("OperationAction", 2) # 开始天在定制天内在定制天结束后可继续开启的活动列表

    customMaxServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) # 定制运营活动最大开服天

    maxCustomServerDayMix = IpyGameDataPY.GetFuncCfg("MixServer", 1) # 定制运营活动最大合服天

    operationActionDict = {}

@@ -227,8 +228,9 @@
                    curStartDateTime = datetime.datetime.strptime("%s %02d:%02d:%02d" % (startDateStr, customMaxServerDateTime.hour, customMaxServerDateTime.minute, 

                                                                                         customMaxServerDateTime.second), ChConfig.TYPE_Time_Format)

                    if curServerOpenDateTime <= curStartDateTime <= customMaxServerDateTime:

                        GameWorld.Log("        按日期/周开的开始日期在开服定制限制天内，不处理! cfgID=%s,curServerOpenDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, curServerOpenDateTime, curStartDateTime, customMaxServerDateTime))

                        continue

                        if actName not in startDateInCustomCanOpenList:

                            GameWorld.Log("        按日期/周开的开始日期在开服定制限制天内，不处理! cfgID=%s,curServerOpenDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, curServerOpenDateTime, curStartDateTime, customMaxServerDateTime))

                            continue

                    

                    if isMixServer:

                        if mixServerDay <= maxCustomServerDayMix:

@@ -239,8 +241,9 @@
                        curStartDateTime = datetime.datetime.strptime("%s %02d:%02d:%02d" % (startDateStr, customMaxServerDateTime.hour, customMaxServerDateTime.minute, 

                                                                                             customMaxServerDateTime.second), ChConfig.TYPE_Time_Format)

                        if mixStartServerDateTime <= curStartDateTime <= customMaxServerDateTime:

                            GameWorld.Log("        按日期/周开的开始日期在合服定制限制天内，不处理! cfgID=%s,mixStartServerDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, mixStartServerDateTime, curStartDateTime, customMaxServerDateTime))

                            continue

                            if actName not in startDateInCustomCanOpenList:

                                GameWorld.Log("        按日期/周开的开始日期在合服定制限制天内，不处理! cfgID=%s,mixStartServerDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, mixStartServerDateTime, curStartDateTime, customMaxServerDateTime))

                                continue

                    

            if hasattr(ipyData, "GetStartTimeList") and hasattr(ipyData, "GetEndTimeList"):

                startHMStrList = ipyData.GetStartTimeList()