From cd69ff158ae8ffa10d9fd1b4971ebf7d2ed74c7c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 25 十二月 2018 17:29:34 +0800
Subject: [PATCH] 5580 【后端】【1.3.20】【1.3.100】【1.4】仙盟任务奖励背包已满时的处理

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py |  173 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 133 insertions(+), 40 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 46d63f1..70ac533 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -43,6 +43,7 @@
 import GameWorldProcess
 import ChPyNetSendPack
 import NetPackCommon
+import PlayerStore
 
 from types import IntType
 import time
@@ -125,7 +126,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)
     
-    customMaxServerDay = 14 # 定制运营活动最大开服天
+    customMaxServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) # 定制运营活动最大开服天
     operationActionDict = {}
     mapServerOperationActionDict = {}
     serverID = GameWorld.GetServerID()
@@ -154,7 +155,8 @@
             # 按开服天开的
             if startDateStr.isdigit() and endDateStr.isdigit():
                 startServerDay, endServerDay = int(startDateStr), int(endDateStr)
-                if openServerDay > endServerDay:
+                #结束日可能还需要处理广播之类,所以这里需要+1
+                if openServerDay > endServerDay + 1:
                     GameWorld.Log("        当前开服天超过活动结束开服天,不处理! cfgID=%s,%s ~ %s < openServerDay(%s)" % (cfgID, startDateStr, endDateStr, openServerDay))
                     continue
                 openServerDateTime = curDateTime + datetime.timedelta(days=(startServerDay-openServerDay))
@@ -162,11 +164,17 @@
                 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))
+            else:
+                if openServerDay <= customMaxServerDay:
+                    GameWorld.Log("        按日期开的在开服定制限制天内,不处理! cfgID=%s,%s ~ %s,openServerDay=%s" % (cfgID, startDateStr, endDateStr, openServerDay))
+                    continue
+                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))
+                    continue
                 
-            elif openServerDay <= customMaxServerDay:
-                GameWorld.Log("        按日期开的在开服定制限制天内,不处理! cfgID=%s,%s ~ %s,openServerDay=%s" % (cfgID, startDateStr, endDateStr, openServerDay))
-                continue
-            
             if hasattr(ipyData, "GetStartTimeList") and hasattr(ipyData, "GetEndTimeList"):
                 startHMStrList = ipyData.GetStartTimeList()
                 endHMStrList = ipyData.GetEndTimeList()
@@ -176,7 +184,7 @@
                 
             notifyInfoDictStart = ipyData.GetNotifyInfoStart() if hasattr(ipyData, "GetNotifyInfoStart") else {}
             notifyInfoDictEnd = ipyData.GetNotifyInfoEnd() if hasattr(ipyData, "GetNotifyInfoEnd") else {}
-            notifyInfoLoopInfo = ipyData.GetNotifyInfoLoop() if hasattr(ipyData, "GetNotifyInfoLoop") else {} # [循环分钟, 广播key]
+            notifyInfoLoopInfo = ipyData.GetNotifyInfoLoop() if hasattr(ipyData, "GetNotifyInfoLoop") else {} # [循环分钟, 广播key, [广播参数列表可选]]
             
             if len(startHMStrList) != len(endHMStrList):
                 GameWorld.ErrLog("        活动配置开始及结束时间个数不匹配! actName=%s,cfgID=%s,startHMStrList=%s,endHMStrList=%s" 
@@ -187,6 +195,9 @@
             if resetType == 1:
                 startDayDate = datetime.datetime.strptime("%s 05:00:00" % (startDateStr), ChConfig.TYPE_Time_Format)
                 endDayDate = datetime.datetime.strptime("%s 05:00:00" % (endDateStr), ChConfig.TYPE_Time_Format) # 结束日期5点
+            elif resetType == 2:
+                startDayDate = datetime.datetime.strptime("%s 05:00:00" % (startDateStr), ChConfig.TYPE_Time_Format)       
+                endDayDate = datetime.datetime.strptime("%s 00:00:00" % (endDateStr), ChConfig.TYPE_Time_Format) + datetime.timedelta(days=1) # 结束日期隔天0点
             else:
                 startDayDate = datetime.datetime.strptime("%s 00:00:00" % (startDateStr), ChConfig.TYPE_Time_Format)
                 endDayDate = datetime.datetime.strptime("%s 00:00:00" % (endDateStr), ChConfig.TYPE_Time_Format) + datetime.timedelta(days=1) # 结束日期隔天0点
@@ -203,6 +214,7 @@
             isActivity = False # 有需要处理开关时间的(开始、结束)
             isNotify = False
             isAdvanceNotice = False
+            isEnd = False
             # 没配置时分的代表全天, 只要开始或结束时分没配都算
             if not startHMStrList or not endHMStrList:
                 startDateTime = startDayDate
@@ -215,10 +227,12 @@
                     needStartList.append(startDateTime)
                     needEndList.append(endDateTime)
                     isActivity = True
+                    isEnd = (curDateTime == endDayDate)
                     
             # 每天按时段开启的,支持多时段
             else:
                 if startDayDate <= curDateTime <= endDayDate:
+                    isEnd = (curDateTime == endDayDate)
                     for hmIndex, startHMStr in enumerate(startHMStrList):
                         endHMStr = endHMStrList[hmIndex]
                         # 每天开的, 实际开关时间只取今天的日期; 这里有个问题,全服广播的时间不是今天的, 暂不做支持,之后真有这种需求再说
@@ -261,9 +275,10 @@
                         isNotify = True
                         
                 # 广播 - 循环广播
-                if notifyInfoLoopInfo and len(notifyInfoLoopInfo) == 2:
-                    loopMinutes, loopNotifyKey = notifyInfoLoopInfo
-                    notifyInfo = [loopNotifyKey, []] # 循环广播的默认无参数,不做支持
+                if notifyInfoLoopInfo and len(notifyInfoLoopInfo) >= 2:
+                    loopMinutes, loopNotifyKey = notifyInfoLoopInfo[:2]
+                    loopNotifyParamList = notifyInfoLoopInfo[2] if len(notifyInfoLoopInfo) > 2 else []
+                    notifyInfo = [loopNotifyKey, loopNotifyParamList] # 循环广播的默认无参数
                     loopCount, loopMaxCount = 0, 100
                     while loopMinutes and loopNotifyKey and loopCount < loopMaxCount:
                         loopCount += 1
@@ -285,10 +300,10 @@
             if not isActivity and not isNotify and not isAdvanceNotice:
                 continue
             
-            GameWorld.Log("        需要处理的运营活动信息: cfgID=%s,isAdvanceNotice=%s,isActivity=%s,isNotify=%s" % (cfgID, isAdvanceNotice, isActivity, isNotify))
-            # 当天有需要激活活动或者提前预告活动的取开始时间较早的为准
+            GameWorld.Log("        需要处理的运营活动信息: cfgID=%s,isAdvanceNotice=%s,isActivity=%s,isEnd=%s,isNotify=%s" % (cfgID, isAdvanceNotice, isActivity, isEnd, isNotify))
+            # 当天有需要激活活动或者提前预告活动的取非结束的为准,如果有多个非结束的一般就是策划在活动时间上配置交叉,这种是不允许的
             if isActivity or isAdvanceNotice:
-                if not activityIpyData or activityIpyData.GetStartDate() < ipyData.GetStartDate():
+                if not activityIpyData or (isActivity and not isEnd):
                     activityIpyData = ipyData
                     activityInfoDict = {ShareDefine.ActKey_CfgID:cfgID}
                     
@@ -330,11 +345,16 @@
     ## 获取运营活动本服务器对应的配置数据列表
     
     # 所有配置先按活动标识归组
+    platform = GameWorld.GetPlatform()
     actGroupDict = {} # {ActMark:{ServerIDTuple:[ipyData, ...], ...}, ...}
     actCfgCount = getattr(ipyDataMgr, "Get%sCount" % actName)()
     for cfgIndex in xrange(actCfgCount):
         ipyData = getattr(ipyDataMgr, "Get%sByIndex" % actName)(cfgIndex)
         actMark = ipyData.GetActMark()
+        platformList = [] if not hasattr(ipyData, "GetPlatformList") else ipyData.GetPlatformList()
+        if platformList and platform not in platformList:
+            GameWorld.Log("非本平台活动,不取!platform=%s,platformList=%s,actName=%s,cfgID=%s" % (platform, platformList, actName, ipyData.GetCfgID()))
+            continue
         serverIDTuple = tuple(ipyData.GetServerIDList())
         
         serverIpyDataDict = actGroupDict.get(actMark, {})
@@ -437,7 +457,7 @@
             
             
                 
-        if state == 1 and actName in ShareDefine.NeedWorldLVOperationActNameList:
+        if state >= 1 and actName in ShareDefine.NeedWorldLVOperationActNameList:
             actWorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OActWorldLV % actName)
             sendMapServerMsgDict[ShareDefine.ActKey_WorldLV] = actWorldLV
         
@@ -460,6 +480,11 @@
         elif actName == ShareDefine.OperationActionName_RealmPoint:
             if isReload and ipyData:
                 Sync_OperationAction_RealmPoint(ipyData)
+        elif actName == ShareDefine.OperationActionName_FlashSale:
+            if ipyData and preState != state:
+                dayIndex = sendMapServerMsgDict.get(ShareDefine.ActKey_DayIndex, 0)
+                PlayerStore.ResetFlashSaleBuyCnt(ipyData, dayIndex, state)
+                
         #通知Mapserver,设置字典
         #GameWorld.SendMapServerMsgEx(dictName, state) # 运营活动不单独通知活动状态,需与活动信息整合后一起通知
         
@@ -474,10 +499,11 @@
         return
     if len(ipyData.GetStartTimeList()) != len(ipyData.GetEndTimeList()):
         return
+    openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
     multiExpRateInfo = ChPyNetSendPack.tagGCMultiExpRateInfo()
     multiExpRateInfo.Clear()
-    multiExpRateInfo.StartDate = ipyData.GetStartDate()
-    multiExpRateInfo.EndtDate = ipyData.GetEndDate()
+    multiExpRateInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)
+    multiExpRateInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
     multiExpRateInfo.ActivityTime = []
     for i, startTime in enumerate(ipyData.GetStartTimeList()):
         endTime = ipyData.GetEndTimeList()[i]
@@ -506,12 +532,14 @@
     ##多倍修行点活动信息通知
     if not ipyData:
         return
+    openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
     multiRealmPointInfo = ChPyNetSendPack.tagGCMultiRealmPointInfo()
     multiRealmPointInfo.Clear()
-    multiRealmPointInfo.StartDate = ipyData.GetStartDate()
-    multiRealmPointInfo.EndtDate = ipyData.GetEndDate()
+    multiRealmPointInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)
+    multiRealmPointInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
     multiRealmPointInfo.Multiple = ipyData.GetMultiple()
     multiRealmPointInfo.LimitLV = ipyData.GetLVLimit()
+    multiRealmPointInfo.LimitPoint = ipyData.GetPointLimit()
     if not curPlayer:
         # 全服广播在线玩家
         playerManager = GameWorld.GetPlayerManager()
@@ -544,22 +572,37 @@
     curDateStr = GameWorld.ChangeTimeNumToStr(curTime, ChConfig.TYPE_Time_YmdFormat) # 当天日期
     
     openServerWeekday = GameWorldProcess.GetOpenServerWeekday() # 服务器开服时是星期几
-    GameWorld.Log("加载本日日常活动信息: %s, 当前星期%s,开服第%s天,开服是星期%s" % (curDateStr, weekDay, openServerDay, openServerWeekday))
+    curMaxCustomServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) - openServerWeekday + 1 # 最大有效定制开服天
+    GameWorld.Log("===== 加载今天日常活动信息 =====")
+    GameWorld.Log("    开服是星期%s, 开服第%s天, 当前星期%s" % (openServerWeekday, openServerDay, weekDay))
+    GameWorld.Log("    最大有效定制开服天: %s" % (curMaxCustomServerDay))
     
     customDailyIDList = []
     dailyTimeInfoList = []
-    customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("DailyActionCustom", openServerWeekday, openServerDay)
-    if customIpyDataList:
+    # 暂固定前2周定制有效, 为方便GM命令测试,这里用开服天做判断,不用开服周
+    if openServerDay <= curMaxCustomServerDay:
+        customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("DailyActionCustom", openServerWeekday)
+        GameWorld.Log("    本周定制的日常活动条数: %s" % len(customIpyDataList))
         customIDList = []
+        todayCustomIDList = []
         for customIpyData in customIpyDataList:
             dataID = customIpyData.GetID()
             dailyID = customIpyData.GetDailyID()
             if dailyID not in customDailyIDList:
                 customDailyIDList.append(dailyID)
-            dailyTimeInfoList.append([True, customIpyData.GetOpenTimeList(), customIpyData])
             customIDList.append(dataID)
-        GameWorld.Log("    本地定制日常活动条数: %s, 配置表ID列表=%s, 定制活动ID列表=%s" % (len(customIpyDataList), customIDList, customDailyIDList))
+            if customIpyData.GetOpenServerDay() == openServerDay:
+                todayCustomIDList.append(dataID)
+                isCustom = True
+                dailyTimeInfoList.append([isCustom, customIpyData.GetOpenTimeList(), customIpyData])
+                GameWorld.Log("    增加本日日常活动信息: isCustom=%s,dailyID=%s,dataID=%s" % (isCustom, dailyID, dataID))
+        GameWorld.Log("    本周定制的日常配置表ID列表: %s" % (customIDList))
+        GameWorld.Log("    本周定制的日常活动ID列表: %s" % (customDailyIDList))
+        GameWorld.Log("    今天定制的日常表ID列表=%s" % (todayCustomIDList))
+    else:
+        GameWorld.Log("    超过最大定制开服天,不定制,走常规日常配置!")
     
+    GameWorld.Log("    处理常规日常活动配置")
     ipyDataMgr = IpyGameDataPY.IPY_Data()
     dailyActionCount = ipyDataMgr.GetDailyActionCount()
     for i in xrange(dailyActionCount):
@@ -626,6 +669,7 @@
         
     TodayDailyActionInfo = IpyGameDataPY.SetConfigEx(key, [openServerDay, todayActionInfo])
     GameWorld.Log("本日日常活动信息加载完毕!")
+    GameWorld.Log("=============================================================")
     return TodayDailyActionInfo[1]
 
 def Dispose_DailyActionState():
@@ -763,53 +807,102 @@
         GameWorld.Log("    不需要重置的定制ID: %s" % FBStateEndTimeNotResetCustomIDList)
     return notResetIDList
 
-def Dispose_FBStateTime():
-    ## 副本状态时间表状态处理, 支持 goon作用,开关服状态不受影响,服务器重新启动会自动变更为所有时间段的状态值
+def __GetTodayFBStateTimeInfo():
+    key = "TodayFBStateTimeInfo"
+    openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
+    TodayFBStateTimeInfo = IpyGameDataPY.GetConfigEx(key)
+    if TodayFBStateTimeInfo and TodayFBStateTimeInfo[0] == openServerDay:
+        #GameWorld.DebugLog("已经加载过本日副本状态处理信息!openServerDay=%s" % openServerDay)
+        return TodayFBStateTimeInfo[1]
     
-    FBStateEndTimeNotResetIDList, FBStateEndTimeNotResetCustomIDList = __GetFBStateEndTimeNotResetIDList()
     openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
     curDateTime = GameWorld.GetServerTime()
     curWeekDay, curHour, curMinute = curDateTime.weekday() + 1, curDateTime.hour, curDateTime.minute
     
-    curTimeWHM = curWeekDay * 10000 + curHour * 100 + curMinute
     openServerWeekday = GameWorldProcess.GetOpenServerWeekday() # 服务器开服时是星期几
-    GameWorld.DebugLog("副本状态时间表状态处理...开服是星期%s,开服第%s天, 当前星期%s,%s点%s分" 
-                       % (openServerWeekday, openServerDay, curWeekDay, curHour, curMinute))
-    GameWorld.DebugLog("    FBStateEndTimeNotResetIDList=%s" % (FBStateEndTimeNotResetIDList))
-    GameWorld.DebugLog("    FBStateEndTimeNotResetCustomIDList=%s" % (FBStateEndTimeNotResetCustomIDList))
+    if openServerWeekday <= 0:
+        GameWorld.ErrLog("获取开服是星期几数据错误!openServerWeekday=%s" % openServerWeekday)
+        return []
     
-    gameWorld = GameWorld.GetGameWorld()
+    curMaxCustomServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) - openServerWeekday + 1 # 最大有效定制开服天
+    GameWorld.Log("===== 加载今天副本状态时间表 =====")
+    GameWorld.Log("    开服是星期%s, 开服第%s天, 当前星期%s,%s点%s分 !" % (openServerWeekday, openServerDay, curWeekDay, curHour, curMinute))
+    GameWorld.Log("    最大有效定制开服天: %s" % (curMaxCustomServerDay))
+    
     ipyDataMgr = IpyGameDataPY.IPY_Data()
     
-    customMapIDList = []
+    customMapIDList = [] # 本周有定制的副本数据地图ID列表
     fbStateTimeInfoList = []
-    customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("FBStateTimeCustom", openServerWeekday, openServerDay)
-    if customIpyDataList:
-        customIDList = []
+    # 暂固定前2周定制有效, 为方便GM命令测试,这里用开服天做判断,不用开服周
+    if openServerDay <= curMaxCustomServerDay:
+        customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("FBStateTimeCustom", openServerWeekday)
+        GameWorld.Log("    本周定制的副本活动条数: %s" % len(customIpyDataList))
+        customIDList = [] # 本周定制的数据表ID
+        todayCustomIDList = [] # 今天定制的数据表ID
         for customIpyData in customIpyDataList:
             dataID = customIpyData.GetID()
             dataMapID = customIpyData.GetDataMapID()
             if dataMapID not in customMapIDList:
                 customMapIDList.append(dataMapID)
-            isCustom, startWeekDay, endWeekDay = True, curWeekDay, curWeekDay
-            fbStateTimeInfoList.append([isCustom, startWeekDay, endWeekDay, customIpyData])
             customIDList.append(dataID)
-        GameWorld.DebugLog("    定制副本活动条数: %s, 配置表ID列表=%s" % (len(customIpyDataList), customIDList))
+            if customIpyData.GetOpenServerDay() == openServerDay:
+                todayCustomIDList.append(dataID)
+                isCustom, startWeekDay, endWeekDay = True, curWeekDay, curWeekDay
+                fbStateTimeInfoList.append([isCustom, startWeekDay, endWeekDay, customIpyData])
+                GameWorld.Log("    今天要处理的副本状态配置: 是否定制=%s,dataID=%s" % (isCustom, dataID))
+        GameWorld.Log("    本周定制的配置表ID列表: %s" % (customIDList))
+        GameWorld.Log("    本周定制的副本地图列表: %s" % (customMapIDList))
+        GameWorld.Log("    今天定制的表ID列表=%s" % (todayCustomIDList))
+    else:
+        GameWorld.Log("    超过最大定制开服天,不定制,走常规副本状态时间!")
         
+    GameWorld.Log("    处理常规副本状态时间配置")
     for i in xrange(ipyDataMgr.GetFBStateTimeCount()):
         fbStateTimeIpyData = ipyDataMgr.GetFBStateTimeByIndex(i)
         dataID = fbStateTimeIpyData.GetID()
         dataMapID = fbStateTimeIpyData.GetDataMapID()
         # 是当天开服天定制活动的不处理常规活动
         if dataMapID in customMapIDList:
+            GameWorld.Log("    dataID=%s,dataMapID=%s, 在本周定制的副本地图列表里,不处理!" % (dataID, dataMapID))
             continue
+        # 暂不支持跨天的活动
         isCustom, startWeekDay, endWeekDay = False, fbStateTimeIpyData.GetStartWeekday(), fbStateTimeIpyData.GetStartWeekday()
+        if curWeekDay != startWeekDay:
+            GameWorld.Log("    dataID=%s,dataMapID=%s, 不是本天的副本活动,不处理!curWeekDay=%s,startWeekDay=%s" 
+                          % (dataID, dataMapID, curWeekDay, startWeekDay))
+            continue 
         fbStateTimeInfoList.append([isCustom, startWeekDay, endWeekDay, fbStateTimeIpyData])
+        GameWorld.Log("    今天要处理的副本状态配置: 是否定制=%s,dataID=%s" % (isCustom, dataID))
         
+    TodayFBStateTimeInfo = IpyGameDataPY.SetConfigEx(key, [openServerDay, fbStateTimeInfoList])
+    GameWorld.Log("本日副本活动状态信息加载完毕!")
+    GameWorld.Log("=============================================================")
+    return TodayFBStateTimeInfo[1]
+
+def Dispose_FBStateTime():
+    ## 副本状态时间表状态处理, 支持 goon作用,开关服状态不受影响,服务器重新启动会自动变更为所有时间段的状态值
+    
+
+    FBStateEndTimeNotResetIDList, FBStateEndTimeNotResetCustomIDList = __GetFBStateEndTimeNotResetIDList()
+    openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
+    curDateTime = GameWorld.GetServerTime()
+    curWeekDay, curHour, curMinute = curDateTime.weekday() + 1, curDateTime.hour, curDateTime.minute
+    
+    curTimeWHM = curWeekDay * 10000 + curHour * 100 + curMinute
+    
+    openServerWeekday = GameWorldProcess.GetOpenServerWeekday() # 服务器开服时是星期几
+    GameWorld.DebugLog("副本状态时间表状态处理...开服是星期%s, 开服第%s天, 当前星期%s,%s点%s分" 
+                       % (openServerWeekday, openServerDay, curWeekDay, curHour, curMinute))
+    GameWorld.DebugLog("    FBStateEndTimeNotResetIDList=%s" % (FBStateEndTimeNotResetIDList))
+    GameWorld.DebugLog("    FBStateEndTimeNotResetCustomIDList=%s" % (FBStateEndTimeNotResetCustomIDList))
+    
+    gameWorld = GameWorld.GetGameWorld()
+    fbStateTimeInfoList = __GetTodayFBStateTimeInfo()
+    
     for isCustom, startWeekDay, endWeekDay, ipyData in fbStateTimeInfoList:
         dataID = ipyData.GetID()
         dataMapID = ipyData.GetDataMapID()
-        
+        GameWorld.DebugLog("    isCustom=%s,dataID=%s,dataMapID=%s" % (isCustom, dataID, dataMapID))
         startHour, startMinute = ipyData.GetStartHour(), ipyData.GetStartMinute()
         endHour, endMinute = ipyData.GetEndHour(), ipyData.GetEndMinute()
         # 星期配置0代表每天

--
Gitblit v1.8.0