8691 【主干】GM后台增加流向查询（上架拍品增加记录流向类型）；

hxp

2021-01-16 4e1ba1b146b389e6bb0fdf84ed09c751688b43a9

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

@@ -37,6 +37,7 @@
import GameWorldAverageLv

import PlayerFamilyBoss

import PlayerHorsePetBoss

import CrossActionControl

import GameWorldProcess

import ChPyNetSendPack

import NetPackCommon

@@ -58,6 +59,10 @@
) = range(3)



def OnPlayerLogin(curPlayer):

    
    if GameWorld.IsCrossServer():

        # 跨服不处理运营活动

        return

    

    isReload, OperationActionInfo = __GetOperationActionInfo()

    operationActionDict = OperationActionInfo[OperationAction_TodayInfo]

@@ -99,6 +104,11 @@
def SendMapServerOperationActionState():

    # 地图启动成功时通知本日运行活动相关状态

    

    if GameWorld.IsCrossServer():

        # 跨服不处理运营活动

        return

    CrossActionControl.SendMapServerCrossActionState()

    
    isReload, OperationActionInfo = __GetOperationActionInfo()

    mapServerInfoDict = OperationActionInfo[OperationAction_MapServerInfo]

    

@@ -137,6 +147,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 = {}

@@ -155,11 +166,11 @@
        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, [参数]], ...}

        isCustomDay = False

        activityIpyData = None # 活动中的的配置，取需要处理的配置中开始时间最晚的，反之开关时间头尾相连的时候无法开启后面的活动

        # 注意：每个活动配置会有多个活动时间点，但是有且只能生效一条活动配置，换句话说就是每个活动配置时间不允许交叉

        for ipyData in curServerActIpyDataList:

@@ -186,8 +197,6 @@
            # 按开服天开的

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

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

                if not isCustomDay:

                    isCustomDay = startServerDay == openServerDay

                #结束日可能还需要处理广播之类，所以这里需要+1

                if openServerDay > endServerDay + 1:

                    GameWorld.Log("        当前开服天超过活动结束开服天，不处理! cfgID=%s,%s ~ %s < openServerDay(%s)" % (cfgID, startDateStr, endDateStr, openServerDay))

@@ -202,8 +211,6 @@
                    GameWorld.Log("        非合服服务器，不处理! cfgID=%s,%s ~ %s" % (cfgID, startDateStr, endDateStr))

                    continue

                startMixServerDay, endMixServerDay = int(startDateStr[3:]), int(endDateStr[3:])

                if not isCustomDay:

                    isCustomDay = startMixServerDay == mixServerDay

                #结束日可能还需要处理广播之类，所以这里需要+1

                if mixServerDay > endMixServerDay + 1:

                    GameWorld.Log("        当前合服天超过活动结束合服天，不处理! cfgID=%s,%s ~ %s < mixServerDay(%s)" % (cfgID, startDateStr, endDateStr, mixServerDay))

@@ -213,40 +220,41 @@
                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"):

                if isCustomDay:

                    GameWorld.Log("        当前开服合服天存在的定制天，周循环开启的不处理! cfgID=%s,%s ~ %s" % (cfgID, startDateStr, endDateStr))

                    continue

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

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

                    continue

                
                if isMixServer:

                    if mixServerDay <= maxCustomServerDayMix:

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

            else:

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

                    
                if actName not in ShareDefine.FeastOperationActionNameList:

                    if customOpenServerDayState and openServerDay <= customMaxServerDay:

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

                        continue

                    mixStartServerDateTime = curDateTime + datetime.timedelta(days=(1-mixServerDay)) # 合服第一天的日期

                    customMaxServerDateTime = curDateTime + datetime.timedelta(days=(maxCustomServerDayMix-mixServerDay))

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

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

                        continue

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

                    

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

                startHMStrList = ipyData.GetStartTimeList()

@@ -384,12 +392,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

@@ -455,17 +462,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的

@@ -485,14 +496,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():

        # 跨服不处理运营活动

        CrossActionControl.Dispose_CrossActState(reloadRefresh)

        return

    

    isReload, OperationActionInfo = __GetOperationActionInfo(False) # 这里必须传False

    isReload = isReload or reloadRefresh

@@ -506,6 +523,8 @@
    curDateTime = datetime.datetime.strptime("%d-%d-%d %d:%d:00" % (curDateTime.year, curDateTime.month, curDateTime.day,

                                                                    curDateTime.hour, curDateTime.minute), ChConfig.TYPE_Time_Format)

    

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

    
    for actName in ShareDefine.OperationActionNameList:

        

        state = 0 # 默认关闭

@@ -518,20 +537,41 @@
            #notifyDict = {} # {notifyDateTime:[notifyKey, [参数]], ...}

            #ipyData 可能为 None

            ipyData, startList, endList, notifyDict = operationActionDict[actName]

            # 精确匹配开启

            if curDateTime in startList:

                state = startList.index(curDateTime) + 1 # 也是代表第几个时间段

            # 精确匹配关闭

            elif curDateTime in endList:

                state = 0

            # goon ״̬

            else:

            
            if actName in startDateInCustomCanOpenList:

                # 由于某些活动的开始天允许和前定制X天有交叉的情况出现（实际不开，会等定制结束后才接下去开）

                # 所以会有时间交叉的情况出现，这种活动goon单独判断

                # 为防止动到其他活动，允许交叉的活动另外处理，理论上可以统一逻辑，为保险起见分开处理

                
                # 精确匹配开启

                if curDateTime in startList:

                    state = startList.index(curDateTime) + 1 # 也是代表第几个时间段

                # 精确匹配关闭

                elif curDateTime in endList:

                    state = 0

                    
                # goon ״̬

                for dIndex, startDateTime in enumerate(startList):

                    endDateTime = endList[dIndex]

                    if startDateTime < curDateTime < endDateTime:

                        state = dIndex + 1

                        break

                    

            else:

                # 精确匹配开启

                if curDateTime in startList:

                    state = startList.index(curDateTime) + 1 # 也是代表第几个时间段

                # 精确匹配关闭

                elif curDateTime in endList:

                    state = 0

                # goon ״̬

                else:

                    for dIndex, startDateTime in enumerate(startList):

                        endDateTime = endList[dIndex]

                        if startDateTime < curDateTime < endDateTime:

                            state = dIndex + 1

                            break

                    
            # 全服广播提示信息

            if curDateTime in notifyDict:

                notifyKey, paramList = notifyDict[curDateTime]