8199 【400】【主干】【后端】运营活动 和开（合）服活动时间交叉优化

hxp

2019-08-28 ae75fd5ec02495ca1433809a5e0f01e749ad9fb5

8199 【400】【主干】【后端】运营活动 和开（合）服活动时间交叉优化

 ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py

@@ -544,6 +544,15 @@
    @param dateInfo: 运营活动表配置的日期信息, 如果是纯数字代表开服天

    @param openServerDay: 当前开服天

    '''

    if not dateInfo:

        curDateTime = datetime.datetime.today()

        return "%d-%d-%d" % (curDateTime.year, curDateTime.month, curDateTime.day)

    if dateInfo.startswith("W"):

        curDateTime = datetime.datetime.today()

        curWeekday = curDateTime.weekday() + 1

        actionWeekday = int(dateInfo[1:])

        actionDateTime = curDateTime + datetime.timedelta(days=(actionWeekday-curWeekday))

        return "%d-%d-%d" % (actionDateTime.year, actionDateTime.month, actionDateTime.day)

    if dateInfo.startswith("Mix"):

        diffDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay) + 1

        actionServerDay = int(dateInfo[3:])


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

@@ -143,9 +143,11 @@
    mapServerOperationActionDict = {}

    serverGroupID = GameWorld.GetServerGroupID()

    ipyDataMgr = IpyGameDataPY.IPY_Data()

    curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1

    

    GameWorld.Log("===== 加载本日运营活动信息: %s, serverGroupID=%s,openServerDay=%s,customMaxServerDay=%s,isMixServer=%s,mixServerDay=%s,maxCustomServerDayMix=%s,reloadSign=%s =====" 

                  % (curDateTime, serverGroupID, openServerDay, customMaxServerDay, isMixServer, mixServerDay, maxCustomServerDayMix, reloadSign))

    GameWorld.Log("    今日周%s" % (curWeekday))

    

    for actName in ShareDefine.OperationActionNameList:

        

@@ -153,6 +155,7 @@
        GameWorld.Log("加载运营活动: actName=%s" % (actName))

        curServerActIpyDataList = __GetOperationActionServerIpyDataList(ipyDataMgr, serverGroupID, actName)

        GameWorld.Log("    可处理条数=%s" % (len(curServerActIpyDataList)))

        disableWeekIpyDataInfo = __GetOperationActionDisableWeekIpyDataInfo(curDateTime, curServerActIpyDataList)

        needStartList = [] # [startDateTime, ...]

        needEndList = [] # [endDateTime, ...]

        needNotifyDict = {} # {notifyDateTime:[notifyKey, [参数]], ...}

@@ -167,6 +170,18 @@
            endDateStr = ipyData.GetEndDate()

            GameWorld.Log("    cfgID=%s,serverGroupIDList=%s,Except=%s,startDateStr=%s,endDateStr=%s,openServerDay=%s,isMixServer=%s,mixServerDay=%s,maxCustomServerDayMix=%s,curDateTime=%s" 

                          % (cfgID, serverGroupIDList, serverGroupIDListExcept, startDateStr, endDateStr, openServerDay, isMixServer, mixServerDay, maxCustomServerDayMix, curDateTime))

            if cfgID in disableWeekIpyDataInfo:

                startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate = disableWeekIpyDataInfo[cfgID]

                GameWorld.Log("        按星期开启的在按日期开启的时间内，不处理! cfgID=%s,%s(%s) ~ %s(%s) in ymdCfgID=%s,%s ~ %s" 
                              % (cfgID, startWeekDate, startDateStr, endWeekDate, endDateStr, ymdCfgID, ymdStartDate, ymdEndDate))

                continue

            if not startDateStr:

                startDateStr = "%d-%d-%d" % (serverTime.year, serverTime.month, serverTime.day)

                GameWorld.Log("        开始日期为空，默认每天，今日为: startDateStr=%s" % startDateStr)

            if not endDateStr:

                endDateStr = "%d-%d-%d" % (serverTime.year, serverTime.month, serverTime.day)

                GameWorld.Log("        结束日期为空，默认每天，今日为: endDateStr=%s" % endDateStr)

            # 活动优先级为   开服天=合服天>运营日期>运营周天

            # 按开服天开的

            if startDateStr.isdigit() and endDateStr.isdigit():

                startServerDay, endServerDay = int(startDateStr), int(endDateStr)

@@ -193,15 +208,24 @@
                startDateStr = "%d-%d-%d" % (openServerDateTime.year, openServerDateTime.month, openServerDateTime.day)

                endDateStr = "%d-%d-%d" % (endServerDateTime.year, endServerDateTime.month, endServerDateTime.day)

                GameWorld.Log("        合服天转化为日期: %s ~ %s" % (startDateStr, endDateStr))

            elif startDateStr.startswith("W") and endDateStr.startswith("W"):

                startWeekday = int(startDateStr[1:])

                endWeekday = int(endDateStr[1:])

                startWeekDate = curDateTime + datetime.timedelta(days=(startWeekday-curWeekday))

                endWeekDate = curDateTime + datetime.timedelta(days=(endWeekday-curWeekday))

                startDateStr = "%d-%d-%d" % (startWeekDate.year, startWeekDate.month, startWeekDate.day)

                endDateStr = "%d-%d-%d" % (endWeekDate.year, endWeekDate.month, endWeekDate.day)

                GameWorld.Log("        星期X转化为日期: %s ~ %s" % (startDateStr, endDateStr))

            elif actName not in ShareDefine.FeastOperationActionNameList:

                if openServerDay <= customMaxServerDay:

                    GameWorld.Log("        按日期开的在开服定制限制天内，不处理! cfgID=%s,%s ~ %s,openServerDay=%s" % (cfgID, startDateStr, endDateStr, openServerDay))

                    continue

                curServerOpenDateTime = curDateTime + datetime.timedelta(days=(1-openServerDay)) # 开服第一天的日期

                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 curStartDateTime <= customMaxServerDateTime:

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

                if curServerOpenDateTime <= curStartDateTime <= customMaxServerDateTime:

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

                    continue

                

                if isMixServer:

@@ -213,7 +237,7 @@
                    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))

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

                        continue

                    

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

@@ -423,6 +447,42 @@
                

    return curServerActIpyDataList



def __GetOperationActionDisableWeekIpyDataInfo(curDateTime, curServerActIpyDataList):

    ## 获取不可用的按星期X开启的配置数据信息，按星期X开启的 活动优先级小于按日期的，当有重叠时以日期的为准

    disableWeekIpyDataInfo = {}

    curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1

        
    weekIpyDataList, ymdIpyDatList = [], []

    for ipyData in curServerActIpyDataList:

        startDateStr = ipyData.GetStartDate()

        endDateStr = ipyData.GetEndDate()

        if startDateStr.isdigit() or startDateStr.startswith("Mix"):

            # 开服天、合服天的不处理

            continue

        
        # 按星期X的

        if startDateStr.startswith("W"):

            startWeekday = int(startDateStr[1:])

            endWeekday = int(endDateStr[1:])

            startWeekDate = curDateTime + datetime.timedelta(days=(startWeekday-curWeekday))

            endWeekDate = curDateTime + datetime.timedelta(days=(endWeekday-curWeekday))

            weekIpyDataList.append([ipyData, startWeekDate, endWeekDate])

        # 按日期的

        else:

            ymdIpyData = ipyData

            ymdStartDate = datetime.datetime.strptime("%s %02d:%02d:00" % (startDateStr, curDateTime.hour, curDateTime.minute), ChConfig.TYPE_Time_Format)

            ymdEndDate = datetime.datetime.strptime("%s %02d:%02d:00" % (endDateStr, curDateTime.hour, curDateTime.minute), ChConfig.TYPE_Time_Format)

            ymdIpyDatList.append([ymdIpyData, ymdStartDate, ymdEndDate])

            
    for ipyData, startWeekDate, endWeekDate in weekIpyDataList:

        cfgID = ipyData.GetCfgID()

        for ymdIpyData, ymdStartDate, ymdEndDate in ymdIpyDatList:

            if ymdStartDate <= startWeekDate <= ymdEndDate or ymdStartDate <= endWeekDate <= ymdEndDate:

                ymdCfgID = ymdIpyData.GetCfgID()

                disableWeekIpyDataInfo[cfgID] = [startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate]

                
    return disableWeekIpyDataInfo



def Dispose_OperationActionState(reloadRefresh=False):

    # 运营活动状态处理, 每天0点会强制同步当天的运营活动详情到地图服务器

    


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py

@@ -595,6 +595,15 @@
    @param dateInfo: 运营活动表配置的日期信息, 如果是纯数字代表开服天

    @param openServerDay: 当前开服天

    '''

    if not dateInfo:

        curDateTime = datetime.datetime.today()

        return "%d-%d-%d" % (curDateTime.year, curDateTime.month, curDateTime.day)

    if dateInfo.startswith("W"):

        curDateTime = datetime.datetime.today()

        curWeekday = curDateTime.weekday() + 1

        actionWeekday = int(dateInfo[1:])

        actionDateTime = curDateTime + datetime.timedelta(days=(actionWeekday-curWeekday))

        return "%d-%d-%d" % (actionDateTime.year, actionDateTime.month, actionDateTime.day)

    if dateInfo.startswith("Mix"):

        diffDay = GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_MixServerDay) + 1

        actionServerDay = int(dateInfo[3:])