ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -59,6 +59,10 @@
def OnPlayerLogin(curPlayer):
    
    if GameWorld.IsCrossServer():
        # 跨服不处理运营活动
        return
    isReload, OperationActionInfo = __GetOperationActionInfo()
    operationActionDict = OperationActionInfo[OperationAction_TodayInfo]
    
@@ -98,6 +102,10 @@
def SendMapServerOperationActionState():
    # 地图启动成功时通知本日运行活动相关状态
    if GameWorld.IsCrossServer():
        # 跨服不处理运营活动
        return
    
    isReload, OperationActionInfo = __GetOperationActionInfo()
    mapServerInfoDict = OperationActionInfo[OperationAction_MapServerInfo]
@@ -156,7 +164,8 @@
        GameWorld.Log("加载运营活动: actName=%s" % (actName))
        curServerActIpyDataList = __GetOperationActionServerIpyDataList(ipyDataMgr, serverGroupID, actName)
        GameWorld.Log("    可处理条数=%s" % (len(curServerActIpyDataList)))
        disableWeekIpyDataInfo = __GetOperationActionDisableWeekIpyDataInfo(curDateTime, curServerActIpyDataList)
        disableWeekIpyDataInfo, customOpenServerDayState, customMixServerDayState = __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList)
        GameWorld.Log("    是否有配开服天活动=%s, 是否有配合服天活动=%s" % (customOpenServerDayState, customMixServerDayState))
        needStartList = [] # [startDateTime, ...]
        needEndList = [] # [endDateTime, ...]
        needNotifyDict = {} # {notifyDateTime:[notifyKey, [参数]], ...}
@@ -220,27 +229,27 @@
                    GameWorld.Log("        星期X转化为日期: %s ~ %s" % (startDateStr, endDateStr))
                    
                if actName not in ShareDefine.FeastOperationActionNameList:
                    if openServerDay <= customMaxServerDay:
                    if customOpenServerDayState and 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 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
                    
                    if isMixServer:
                        if mixServerDay <= maxCustomServerDayMix:
                        if customMixServerDayState and mixServerDay <= maxCustomServerDayMix:
                            GameWorld.Log("        按日期/周开的在合服定制限制天内,不处理! cfgID=%s,%s ~ %s,mixServerDay=%s" % (cfgID, startDateStr, endDateStr, mixServerDay))
                            continue
                        mixStartServerDateTime = curDateTime + datetime.timedelta(days=(1-mixServerDay)) # 合服第一天的日期
                        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
@@ -381,12 +390,11 @@
                        activityInfoDict[ShareDefine.ActKey_WorldLVList] = GameWorldAverageLv.GetWorldLVListByTime(startDayDate, (endDayDate - startDayDate).days)
                    
                    if startDayDate <= curDateTime < endDayDate:
                        dayIndex = 0
                        dayIndex = (curDateTime - startDayDate).days
                        actIDDateTime = startDayDate
                        isDayRest = 0 if not hasattr(ipyData, "GetIsDayReset") else ipyData.GetIsDayReset()
                        # 按时段开的默认每天重置
                        if isDayRest or (startHMStrList and endHMStrList):
                            dayIndex = (curDateTime - startDayDate).days
                            actIDDateTime += datetime.timedelta(days=dayIndex)
                        actID = int(time.mktime(actIDDateTime.timetuple())) # 默认取开始时间点的time值作为活动ID
                        activityInfoDict[ShareDefine.ActKey_DayIndex] = dayIndex
@@ -452,17 +460,21 @@
                
    return curServerActIpyDataList
def __GetOperationActionDisableWeekIpyDataInfo(curDateTime, curServerActIpyDataList):
def __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList):
    ## 获取不可用的按星期X开启的配置数据信息,按星期X开启的 活动优先级小于按日期的,当有重叠时以日期的为准
    disableWeekIpyDataInfo = {}
    curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1
    customOpenServerDayState, customMixServerDayState = False, False # 是否有配开服天、合服天活动
    weekIpyDataList, ymdIpyDatList = [], []
    for ipyData in curServerActIpyDataList:
        startDateStr = ipyData.GetStartDate()
        endDateStr = ipyData.GetEndDate()
        if startDateStr.isdigit() or startDateStr.startswith("Mix"):
            # 开服天、合服天的不处理
            if startDateStr.isdigit():
                customOpenServerDayState = True
            else:
                customMixServerDayState = True
            continue
        
        # 按星期X的
@@ -482,15 +494,20 @@
    for ipyData, startWeekDate, endWeekDate in weekIpyDataList:
        cfgID = ipyData.GetCfgID()
        for ymdIpyData, ymdStartDate, ymdEndDate in ymdIpyDatList:
            if ymdStartDate <= startWeekDate <= ymdEndDate or ymdStartDate <= endWeekDate <= ymdEndDate:
            if ymdStartDate <= startWeekDate <= ymdEndDate or ymdStartDate <= endWeekDate <= ymdEndDate \
                or (actName in ShareDefine.FeastOperationActionNameList and ymdStartDate <= curDateTime <= ymdEndDate):
                ymdCfgID = ymdIpyData.GetCfgID()
                disableWeekIpyDataInfo[cfgID] = [startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate]
                
    return disableWeekIpyDataInfo
    return disableWeekIpyDataInfo, customOpenServerDayState, customMixServerDayState
def Dispose_OperationActionState(reloadRefresh=False):
    # 运营活动状态处理, 每天0点会强制同步当天的运营活动详情到地图服务器
    
    if GameWorld.IsCrossServer():
        # 跨服不处理运营活动
        return
    isReload, OperationActionInfo = __GetOperationActionInfo(False) # 这里必须传False
    isReload = isReload or reloadRefresh
    operationActionDict = OperationActionInfo[OperationAction_TodayInfo]