1111 优化开服副本状态时间定制、日常活动定制逻辑；

hxp

2024-11-18 1029b172223ee7a30bda1b4dc64829b011fe2ff2

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

@@ -33,8 +33,12 @@
import PlayerFamilyRedPacket

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerActFamilyCTGAssist

import PlayerActGarbageSorting

import PlayerActBossTrial

import PlayerActXianXiaMJ

import PlayerActGubao

import PlayerActHorsePetTrain

import PlayerUniversalGameRec

import GameWorldAverageLv

import PlayerFamilyBoss

@@ -243,8 +247,9 @@
        GameWorld.Log("加载运营活动: actName=%s,platform=%s,serverGroupID=%s" % (actName, platform, serverGroupID))

        curServerActIpyDataList = __GetOperationActionServerIpyDataList(ipyDataMgr, platform, serverGroupID, actName)

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

        actNumDisableWeekIpyDataInfo, disableWeekCfgIDDict = __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList)

        
        coverDisableLoopIpyDataInfo, disableLoopCfgIDDict, otherLoopCfgIDDict, coverDisableWeekIpyDataInfo, disableWeekCfgIDDict = \

            __GetOperationActionDisableIpyDataInfo(actName, curDateTime, curServerActIpyDataList)

            
        for ipyData in curServerActIpyDataList:

            

            platformList = [] if not hasattr(ipyData, "GetPlatformList") else ipyData.GetPlatformList()

@@ -276,10 +281,30 @@
                endDateStr = "%d-%d-%d" % (serverTime.year, serverTime.month, serverTime.day)

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

                

            # 开服常规：  开服天 > 日期 > 周x   （不受合服天影响，合服活动新增一套独立的活动，还是走运营活动配置）

            actByLoopYmd = startDateStr.startswith("L") # 按日期循环

            # 根据日期循环的通用

            if actByLoopYmd:

                if cfgID in coverDisableLoopIpyDataInfo:

                    loopStartDate, loopEndDate, ymdCfgID, ymdStartDate, ymdEndDate = coverDisableLoopIpyDataInfo[cfgID]

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

                    continue

                
                if cfgID in disableLoopCfgIDDict:

                    GameWorld.Log("        按日期循环的未到开启循环日期或已结束循环日期，不处理! cfgID=%s,startDateStr=%s,endDateStr=%s" % (cfgID, startDateStr, endDateStr))

                    continue

                
                if cfgID in otherLoopCfgIDDict:

                    loopCfgIDList, startDateStr, endDateStr, loopIndex, loopTimes = otherLoopCfgIDDict[cfgID]

                    GameWorld.Log("        按日期循环的还未循环到当前配置，不处理! cfgID=%s,startDateStr=%s,endDateStr=%s,loopCfgIDList=%s,loopIndex=%s,loopTimes=%s" 
                                  % (cfgID, startDateStr, endDateStr, loopCfgIDList, loopIndex, loopTimes))

                    continue

                startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)

                
            # 开服常规：  开服天 > 日期 > 周x=日期循环   （不受合服天影响，合服活动新增一套独立的活动，还是走运营活动配置）

            if actType == ShareDefine.ActType_OpenComm:

                actByWeek = (startDateStr.startswith("W") and endDateStr.startswith("W")) # 按周x开

                actByDate = (not actByWeek and startDateStr.count("-") == 2 and endDateStr.count("-") == 2) # 按日期开

                actByDate = (not actByLoopYmd and not actByWeek and startDateStr.count("-") == 2 and endDateStr.count("-") == 2) # 按日期开

                

                # 开服天的

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

@@ -295,21 +320,20 @@
                    GameWorld.Log("        开服天转化为日期: %s ~ %s" % (startDateStr, endDateStr))

                    

                # 常规配置: 开服前X天不开，不受合服影响，功能配置表可配置 开服前X天后交叉可开，每日重置的活动默认可开

                elif actByWeek or actByDate:

                elif actByWeek or actByDate or actByLoopYmd:

                    if openServerDay <= customMaxServerDay:

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

                        continue

                    

                    disableWeekIpyDataInfo = actNumDisableWeekIpyDataInfo.get(actNum, {})

                    if cfgID in disableWeekIpyDataInfo:

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

                    if cfgID in coverDisableWeekIpyDataInfo:

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

                        GameWorld.Log("        常规活动，按星期开启的在按日期开启的时间内，不处理! cfgID=%s,%s(%s) ~ %s(%s) in ymdCfgID=%s,%s ~ %s" 

                                      % (cfgID, startWeekDate, startDateStr, endWeekDate, endDateStr, ymdCfgID, ymdStartDate, ymdEndDate))

                        continue

                    

                    if cfgID in disableWeekCfgIDDict:

                        GameWorld.Log("        常规活动，按星期开启的未到开启循环日期或已结束循环日期，不处理! cfgID=%s,startDateStr=%s,endDateStr=%s, %s" 

                                      % (cfgID, startDateStr, endDateStr, disableWeekCfgIDDict[cfgID]))

                                      % (cfgID, startDateStr, endDateStr, str(disableWeekCfgIDDict[cfgID])))

                        continue

                    

                    if actByWeek:

@@ -649,11 +673,16 @@
                

    return curServerActIpyDataList



def __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList):

def __GetOperationActionDisableIpyDataInfo(actName, curDateTime, curServerActIpyDataList):

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

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

    actNumWeekYMDIpyDataInfo = {} # {actNum:[weekIpyDataList, ymdIpyDatList], ...}

    disableWeekCfgIDDict = {} # {cfgID:[startDateStr, endDateStr], ...}

    # 优先级 日期 > 按日期循环 > 按星期循环

    
    actNumYMDIpyDataInfo = {} # {actNum:ymdIpyDataList, ...} # 配置日期的

    actNumLoopIpyDataInfo = {} # {actNum:{loopKey:[loopCfgIDList, loopDateInfo]}, ...} # 按日期循环的

    actNumWeekIpyDataInfo = {} # {actNum:weekIpyDataList, ...} # 按星期循环的

    
    disableWeekCfgIDDict = {} # {cfgID:[startDateStr, endDateStr], ...} # 未开始循环的星期

    disableLoopCfgIDDict = {} # {cfgID:[startDateStr, endDateStr], ...} # 未开始循环的日期

    

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

    curDateTimeYmd = GameWorld.ChangeStrToDatetime(curDateTimeYmdStr, ChConfig.TYPE_Time_YmdFormat)

@@ -663,50 +692,90 @@
        startDateStr = ipyData.GetStartDate()

        endDateStr = ipyData.GetEndDate()

        actNum = GetOperationActNum(actName, ipyData)

        actType = GetOperationActType(actNum)

        # 这里只处理常规运营活动，日期优先级大于周

        if actType != ShareDefine.ActType_OpenComm:

            continue

        
        if actNum not in actNumWeekYMDIpyDataInfo:

            weekIpyDataList, ymdIpyDatList = [], []

            actNumWeekYMDIpyDataInfo[actNum] = [weekIpyDataList, ymdIpyDatList]

        weekIpyDataList, ymdIpyDatList = actNumWeekYMDIpyDataInfo[actNum]

        

        # 按星期X的

        if startDateStr.startswith("W"):

            if actNum not in actNumWeekIpyDataInfo:

                actNumWeekIpyDataInfo[actNum] = []

            weekIpyDataList = actNumWeekIpyDataInfo[actNum]

            startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)

            startWeekDate = GameWorld.ChangeStrToDatetime(startDateStr, ChConfig.TYPE_Time_YmdFormat)

            endWeekDate = GameWorld.ChangeStrToDatetime(endDateStr, ChConfig.TYPE_Time_YmdFormat)

            if startWeekDate > curDateTimeYmd or curDateTimeYmd > endWeekDate: # 还未开始的循环 or 已经强制结束的循环

                disableWeekCfgIDDict[cfgID] = [startDateStr, endDateStr]

            else:

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

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

            

        # 按日期循环

        elif startDateStr.startswith("L"):

            loopStartDate, loopEndDate, loopTimes = GameWorld.GetOperationActionLoopDate(startDateStr, endDateStr, curDateTime)

            if loopStartDate > curDateTimeYmd or curDateTimeYmd > loopEndDate: # 还未开始的循环 or 已经强制结束的循环

                disableLoopCfgIDDict[cfgID] = [startDateStr, endDateStr]

            else:

                loopKey = (startDateStr, endDateStr) # 同个循环周期的视为同一组

                if actNum not in actNumLoopIpyDataInfo:

                    actNumLoopIpyDataInfo[actNum] = {}

                loopIpyDataDict = actNumLoopIpyDataInfo[actNum]

                if loopKey not in loopIpyDataDict:

                    loopCfgIDList, loopDateInfo = [], [loopStartDate, loopEndDate, loopTimes]

                    loopIpyDataDict[loopKey] = [loopCfgIDList, loopDateInfo]

                loopCfgIDList, loopDateInfo = loopIpyDataDict[loopKey]

                loopCfgIDList.append(cfgID)

                
        # 按日期的

        elif startDateStr.count("-") == 2:

            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])

            if actNum not in actNumYMDIpyDataInfo:

                actNumYMDIpyDataInfo[actNum] = []

            ymdIpyDataList = actNumYMDIpyDataInfo[actNum]

            ymdStartDate = GameWorld.ChangeStrToDatetime(startDateStr, ChConfig.TYPE_Time_YmdFormat)

            ymdEndDate = GameWorld.ChangeStrToDatetime(endDateStr, ChConfig.TYPE_Time_YmdFormat)

            ymdIpyDataList.append([cfgID, ymdStartDate, ymdEndDate])

            

        else:

            # 只处理按星期、按日期的，其他的不处理

            # 其他的不处理

            pass

        

    actNumDisableWeekIpyDataInfo = {} # {actNum:{cfgID:[info], ...}, ...}

    for actNum, weekYMDIpyDataInfo in actNumWeekYMDIpyDataInfo.items():

        weekIpyDataList, ymdIpyDatList = weekYMDIpyDataInfo

        for ipyData, startWeekDate, endWeekDate in weekIpyDataList:

            cfgID = ipyData.GetCfgID()

            for ymdIpyData, ymdStartDate, ymdEndDate in ymdIpyDatList:

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

                    if actNum not in actNumDisableWeekIpyDataInfo:

                        actNumDisableWeekIpyDataInfo[actNum] = {}

                    ymdCfgID = ymdIpyData.GetCfgID()

                    actNumDisableWeekIpyDataInfo[actNum][cfgID] = [startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate]

    nowLoopYMDIpyDataInfo = {} # {actNum:loopIpyDataList, ...} # # 日期循环中当前在循环的

    otherLoopCfgIDDict = {} # {cfgID:[info], ...} # 日期循环中不是当前循环的其他循环

    coverDisableLoopIpyDataInfo = {} # {cfgID:[info], ...} # 被日期覆盖的日期循环

    for actNum, loopIpyDataDict in actNumLoopIpyDataInfo.items():

        ymdIpyDataList = actNumYMDIpyDataInfo.get(actNum, [])

        if actNum not in nowLoopYMDIpyDataInfo:

            nowLoopYMDIpyDataInfo[actNum] = []

        loopIpyDataList = nowLoopYMDIpyDataInfo[actNum]

        for loopKey, loopInfo in loopIpyDataDict.items():

            startDateStr, endDateStr = loopKey

            loopCfgIDList, loopDateInfo = loopInfo

            loopStartDate, loopEndDate, loopTimes = loopDateInfo

            loopIndex = (loopTimes - 1) % len(loopCfgIDList) # 当前循环次数对应的循环索引

            curLoopCfgID = 0

            for index, loopCfgID in enumerate(loopCfgIDList):

                if index == loopIndex: # 当前循环的

                    curLoopCfgID = loopCfgID

                    loopIpyDataList.append([loopCfgID, loopStartDate, loopEndDate])

                else:

                    otherLoopCfgIDDict[loopCfgID] = [loopCfgIDList, startDateStr, endDateStr, loopIndex, loopTimes]

                    

    return actNumDisableWeekIpyDataInfo, disableWeekCfgIDDict

            for ymdCfgID, ymdStartDate, ymdEndDate in ymdIpyDataList:

                if ymdStartDate <= loopStartDate <= ymdEndDate or ymdStartDate <= loopEndDate <= ymdEndDate:

                    coverDisableLoopIpyDataInfo[curLoopCfgID] = [loopStartDate, loopEndDate, ymdCfgID, ymdStartDate, ymdEndDate]

                    
    coverDisableWeekIpyDataInfo = {} # {cfgID:[info], ...} # 被日期覆盖的星期循环

    for actNum, weekIpyDataList in actNumWeekIpyDataInfo.items():

        ymdIpyDataList = actNumYMDIpyDataInfo.get(actNum, [])

        loopIpyDatList = nowLoopYMDIpyDataInfo.get(actNum, [])

        for weekCfgID, startWeekDate, endWeekDate in weekIpyDataList:

            # 被常规日期覆盖的

            for ymdCfgID, ymdStartDate, ymdEndDate in ymdIpyDataList:

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

                    coverDisableWeekIpyDataInfo[weekCfgID] = [startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate]

                    
            # 被循环日期覆盖的

            for loopCfgID, loopStartDate, loopEndDate in loopIpyDatList:

                if loopStartDate <= startWeekDate <= loopEndDate or loopStartDate <= endWeekDate <= loopEndDate:

                    coverDisableWeekIpyDataInfo[weekCfgID] = [startWeekDate, endWeekDate, loopCfgID, loopStartDate, loopEndDate]

                    
    return coverDisableLoopIpyDataInfo, disableLoopCfgIDDict, otherLoopCfgIDDict, coverDisableWeekIpyDataInfo, disableWeekCfgIDDict



def Dispose_OperationActionState(reloadRefresh=False):

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

@@ -741,7 +810,7 @@
        for sendMapServerMsgDict in curActMapInfoDictList:

            

            state = 0 # 默认关闭

            stateJoin = 0 # 可参与状态

            stateJoin = ShareDefine.ActStateJoin_None # 可参与状态，0-参与前；1-可参与；2-参与结束

            ipyData = None

            

            actNum = sendMapServerMsgDict.get(ShareDefine.ActKey_ActNum, 0)

@@ -772,10 +841,12 @@
                        for jIndex, joinStartDateTime in enumerate(joinStartTimeList):

                            endJoinDateTime = joinEndTimeList[jIndex]

                            if joinStartDateTime <= curDateTime < endJoinDateTime:

                                stateJoin = state

                                stateJoin = ShareDefine.ActStateJoin_Start

                                break

                            elif curDateTime >= endJoinDateTime:

                                stateJoin = ShareDefine.ActStateJoin_End

                    else:

                        stateJoin = state

                        stateJoin = ShareDefine.ActStateJoin_Start if state else ShareDefine.ActStateJoin_None

                        

                    # 全服广播提示信息

                    if curDateTime in notifyDict:

@@ -817,6 +888,12 @@
                if dbActID:

                    if actName == ShareDefine.OperationActionName_BossTrial:

                        PlayerActBossTrial.OnActEnd(actNum, ipyData, dayIndex)

                    elif actName == ShareDefine.OperationActionName_XianXiaMJ:

                        PlayerActXianXiaMJ.OnActEnd(actNum, ipyData, dayIndex)

                    elif actName == ShareDefine.OperationActionName_Gubao:

                        PlayerActGubao.OnActEnd(actNum, ipyData, dayIndex)

                    elif actName == ShareDefine.OperationActionName_HorsePetTrain:

                        PlayerActHorsePetTrain.OnActEnd(actNum, ipyData, dayIndex)

                        

                if curActID:

                    if actName in ShareDefine.NeedWorldLVOperationActNameList:

@@ -847,6 +924,14 @@
                        PlayerActGarbageSorting.OnActStart(actNum)

                    elif actName == ShareDefine.OperationActionName_BossTrial:

                        PlayerActBossTrial.OnActStart(actNum)

                    elif actName == ShareDefine.OperationActionName_XianXiaMJ:

                        PlayerActXianXiaMJ.OnActStart(actNum, ipyData)

                    elif actName == ShareDefine.OperationActionName_Gubao:

                        PlayerActGubao.OnActStart(actNum, ipyData)

                    elif actName == ShareDefine.OperationActionName_HorsePetTrain:

                        PlayerActHorsePetTrain.OnActStart(actNum, ipyData)

                    elif actName == ShareDefine.OperationActionName_FamilyCTGAssist:

                        PlayerActFamilyCTGAssist.OnActStart(actNum)

                else:

                    if actName == ShareDefine.OperationActionName_GarbageSorting:

                        PlayerActGarbageSorting.OnActEnd(actNum)

@@ -854,6 +939,34 @@
            else:

                GameWorld.Log("    dbActID不变: dbActID=%s,curActID=%s" % (dbActID, curActID))

                

            # 活动中刷新，每次都需要刷新的逻辑，包含重读配置等

            if state:

                if actName == ShareDefine.OperationActionName_BossTrial:

                    PlayerActBossTrial.OnActInStateRefresh(actNum, ipyData, dayIndex)

                elif actName == ShareDefine.OperationActionName_XianXiaMJ:

                    PlayerActXianXiaMJ.OnActInStateRefresh(actNum, ipyData)

                elif actName == ShareDefine.OperationActionName_Gubao:

                    PlayerActGubao.OnActInStateRefresh(actNum, ipyData)

                elif actName == ShareDefine.OperationActionName_HorsePetTrain:

                    PlayerActHorsePetTrain.OnActInStateRefresh(actNum, ipyData)

                    
            # 仅活动有配置参与时间段的会触发

            if curActID and dbActID == curActID and preStateJoin != stateJoin:

                GameWorld.Log("    参与状态变更: preStateJoin=%s,stateJoin=%s" % (preStateJoin, stateJoin))

                # 参与开始

                if stateJoin == ShareDefine.ActStateJoin_Start:

                    pass

                # 参与结束

                elif stateJoin == ShareDefine.ActStateJoin_End:

                    if actName == ShareDefine.OperationActionName_BossTrial:

                        PlayerActBossTrial.OnActJoinEnd(actNum, ipyData, dayIndex)

                    elif actName == ShareDefine.OperationActionName_XianXiaMJ:

                        PlayerActXianXiaMJ.OnActJoinEnd(actNum, ipyData, dayIndex)

                    elif actName == ShareDefine.OperationActionName_Gubao:

                        PlayerActGubao.OnActJoinEnd(actNum, ipyData, dayIndex)

                    elif actName == ShareDefine.OperationActionName_HorsePetTrain:

                        PlayerActHorsePetTrain.OnActJoinEnd(actNum, ipyData, dayIndex)

                        
            if ipyData and actName in ShareDefine.NeedWorldLVOperationActNameList:

                actWorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(dbOperationActWorldLVKey)

                sendMapServerMsgDict[ShareDefine.ActKey_WorldLV] = actWorldLV

@@ -987,7 +1100,7 @@
    curDateStr = GameWorld.ChangeTimeNumToStr(curTime, ChConfig.TYPE_Time_YmdFormat) # 当天日期

    

    openServerWeekday = GameWorldProcess.GetOpenServerWeekday() # 服务器开服时是星期几

    curMaxCustomServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) - openServerWeekday + 1 # 最大有效定制开服天

    curMaxCustomServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) # 最大有效定制开服天

    maxCustomServerDayMix = IpyGameDataPY.GetFuncCfg("MixServer", 1)

    GameWorld.Log("===== 加载今天日常活动信息 =====")

    GameWorld.Log("开服是星期%s, 开服第%s天, 当前星期%s" % (openServerWeekday, openServerDay, weekDay))

@@ -1001,7 +1114,7 @@
        customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("DailyActionCustom", openServerWeekday)

        if not customIpyDataList:

            customIpyDataList = []

        GameWorld.Log("    本周定制的开服日常活动条数: %s" % len(customIpyDataList))

        GameWorld.Log("    定制的开服日常活动条数: %s" % len(customIpyDataList))

        customIDList = []

        todayCustomIDList = []

        for customIpyData in customIpyDataList:

@@ -1015,8 +1128,8 @@
                customType = 1

                dailyTimeInfoList.append([customType, customIpyData.GetOpenTimeList(), customIpyData])

                GameWorld.Log("    增加本日开服日常活动信息: customType=%s,dailyID=%s,dataID=%s" % (customType, dailyID, dataID))

        GameWorld.Log("    本周定制的开服日常配置表ID列表: %s" % (customIDList))

        GameWorld.Log("    本周定制的开服日常活动ID列表: %s" % (customDailyIDList))

        GameWorld.Log("    定制的开服日常配置表ID列表: %s" % (customIDList))

        GameWorld.Log("    定制的开服日常活动ID列表: %s" % (customDailyIDList))

        GameWorld.Log("    今天定制的开服日常表ID列表=%s" % (todayCustomIDList))

    elif isMixServer and mixServerDay <= maxCustomServerDayMix:

        todayCustomIDList = [] # 今天定制的数据表ID

@@ -1305,7 +1418,7 @@
        GameWorld.ErrLog("获取开服是星期几数据错误！openServerWeekday=%s" % openServerWeekday)

        return []

    

    curMaxCustomServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) - openServerWeekday + 1 # 最大有效定制开服天

    curMaxCustomServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) # 最大有效定制开服天

    maxCustomServerDayMix = IpyGameDataPY.GetFuncCfg("MixServer", 1)

    GameWorld.Log("===== 加载今天副本状态时间表 =====")

    GameWorld.Log("开服是星期%s, 开服第%s天, 当前星期%s,%s点%s分 ！" % (openServerWeekday, openServerDay, curWeekDay, curHour, curMinute))

@@ -1314,15 +1427,15 @@
    

    ipyDataMgr = IpyGameDataPY.IPY_Data()

    

    customMapIDList = [] # 本周有定制的副本数据地图ID列表

    customMapIDList = [] # 有定制的副本数据地图ID列表

    fbStateTimeInfoList = []

    # 暂固定前2周定制有效, 为方便GM命令测试，这里用开服天做判断，不用开服周

    if openServerDay <= curMaxCustomServerDay:

        customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("FBStateTimeCustom", openServerWeekday)

        if not customIpyDataList:

            customIpyDataList = []

        GameWorld.Log("    本周定制的开服副本活动条数: %s" % len(customIpyDataList))

        customIDList = [] # 本周定制的数据表ID

        GameWorld.Log("    定制的开服副本活动条数: %s" % len(customIpyDataList))

        customIDList = [] # 定制的数据表ID

        todayCustomIDList = [] # 今天定制的数据表ID

        for customIpyData in customIpyDataList:

            dataID = customIpyData.GetID()

@@ -1335,8 +1448,8 @@
                customType, startWeekDay, endWeekDay = 1, curWeekDay, curWeekDay

                fbStateTimeInfoList.append([customType, startWeekDay, endWeekDay, customIpyData])

                GameWorld.Log("    今天要处理的开服副本状态配置: customType=%s,dataID=%s" % (customType, dataID))

        GameWorld.Log("    本周定制的开服副本表ID列表: %s" % (customIDList))

        GameWorld.Log("    本周定制的开服副本地图列表: %s" % (customMapIDList))

        GameWorld.Log("    定制的开服副本表ID列表: %s" % (customIDList))

        GameWorld.Log("    定制的开服副本地图列表: %s" % (customMapIDList))

        GameWorld.Log("    今天定制的开服副本表ID列表=%s" % (todayCustomIDList))

    elif isMixServer and mixServerDay <= maxCustomServerDayMix:

        todayCustomIDList = [] # 今天定制的数据表ID

@@ -1364,7 +1477,7 @@
        dataMapID = fbStateTimeIpyData.GetDataMapID()

        # 是当天开服天定制活动的不处理常规活动

        if dataMapID in customMapIDList:

            GameWorld.Log("    dataID=%s,dataMapID=%s, 在本周定制的副本地图列表里,不处理！" % (dataID, dataMapID))

            GameWorld.Log("    dataID=%s,dataMapID=%s, 在定制的副本地图列表里,不处理！" % (dataID, dataMapID))

            continue

        # 暂不支持跨天的活动

        customType, startWeekDay, endWeekDay = 0, fbStateTimeIpyData.GetStartWeekday(), fbStateTimeIpyData.GetStartWeekday()