From 2e0dbebc2b1e2dbfea405ac4674c7c50bd92b73d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 08 十一月 2024 13:56:48 +0800
Subject: [PATCH] 10289 【越南】【英语】【砍树】【tqxbqy】运势-服务端
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 145 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 105 insertions(+), 40 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 876a37b..bf08925 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -247,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()
@@ -280,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():
@@ -299,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:
@@ -653,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)
@@ -667,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点会强制同步当天的运营活动详情到地图服务器
--
Gitblit v1.8.0