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

hxp

2024-11-18 1029b172223ee7a30bda1b4dc64829b011fe2ff2

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

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

@@ -1100,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))

@@ -1114,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:

@@ -1128,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

@@ -1418,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))

@@ -1427,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()

@@ -1448,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

@@ -1477,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()