From f6fb3e2809aefd007e9113194257c0c511c18ac4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 03 十二月 2020 15:52:17 +0800
Subject: [PATCH] 4869 【主干】【长尾】【BT】运营活动支持在没配置开服/合服定制配置时，日期/周的配置不受开服/合服定制天影响，可开启；
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index e8956af..4c8cc92 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -164,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, [参数]], ...}
@@ -228,7 +229,7 @@
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)) # 开服第一天的日期
@@ -241,7 +242,7 @@
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)) # 合服第一天的日期
@@ -460,17 +461,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的
@@ -490,11 +495,12 @@
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点会强制同步当天的运营活动详情到地图服务器
--
Gitblit v1.8.0