From 19e0109ec1e936204cb85362d2e3f705b8b9554c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 03 十二月 2020 11:19:38 +0800
Subject: [PATCH] 8585 【主干】【BT】【长尾】【后端】竞技场（封包）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 162 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 132 insertions(+), 30 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 1cff4a0..e8956af 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -59,6 +59,10 @@
def OnPlayerLogin(curPlayer):
+ if GameWorld.IsCrossServer():
+ # 跨服不处理运营活动
+ return
+
isReload, OperationActionInfo = __GetOperationActionInfo()
operationActionDict = OperationActionInfo[OperationAction_TodayInfo]
@@ -99,6 +103,10 @@
def SendMapServerOperationActionState():
# 地图启动成功时通知本日运行活动相关状态
+ if GameWorld.IsCrossServer():
+ # 跨服不处理运营活动
+ return
+
isReload, OperationActionInfo = __GetOperationActionInfo()
mapServerInfoDict = OperationActionInfo[OperationAction_MapServerInfo]
@@ -137,15 +145,18 @@
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 = {}
mapServerOperationActionDict = {}
serverGroupID = GameWorld.GetServerGroupID()
ipyDataMgr = IpyGameDataPY.IPY_Data()
+ curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1
GameWorld.Log("===== 加载本日运营活动信息: %s, serverGroupID=%s,openServerDay=%s,customMaxServerDay=%s,isMixServer=%s,mixServerDay=%s,maxCustomServerDayMix=%s,reloadSign=%s ====="
% (curDateTime, serverGroupID, openServerDay, customMaxServerDay, isMixServer, mixServerDay, maxCustomServerDayMix, reloadSign))
+ GameWorld.Log(" 今日周%s" % (curWeekday))
for actName in ShareDefine.OperationActionNameList:
@@ -153,6 +164,7 @@
GameWorld.Log("加载运营活动: actName=%s" % (actName))
curServerActIpyDataList = __GetOperationActionServerIpyDataList(ipyDataMgr, serverGroupID, actName)
GameWorld.Log(" 可处理条数=%s" % (len(curServerActIpyDataList)))
+ disableWeekIpyDataInfo = __GetOperationActionDisableWeekIpyDataInfo(curDateTime, curServerActIpyDataList)
needStartList = [] # [startDateTime, ...]
needEndList = [] # [endDateTime, ...]
needNotifyDict = {} # {notifyDateTime:[notifyKey, [参数]], ...}
@@ -167,6 +179,18 @@
endDateStr = ipyData.GetEndDate()
GameWorld.Log(" cfgID=%s,serverGroupIDList=%s,Except=%s,startDateStr=%s,endDateStr=%s,openServerDay=%s,isMixServer=%s,mixServerDay=%s,maxCustomServerDayMix=%s,curDateTime=%s"
% (cfgID, serverGroupIDList, serverGroupIDListExcept, startDateStr, endDateStr, openServerDay, isMixServer, mixServerDay, maxCustomServerDayMix, curDateTime))
+ if cfgID in disableWeekIpyDataInfo:
+ startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate = disableWeekIpyDataInfo[cfgID]
+ GameWorld.Log(" 按星期开启的在按日期开启的时间内，不处理! cfgID=%s,%s(%s) ~ %s(%s) in ymdCfgID=%s,%s ~ %s"
+ % (cfgID, startWeekDate, startDateStr, endWeekDate, endDateStr, ymdCfgID, ymdStartDate, ymdEndDate))
+ continue
+ if not startDateStr:
+ startDateStr = "%d-%d-%d" % (serverTime.year, serverTime.month, serverTime.day)
+ GameWorld.Log(" 开始日期为空，默认每天，今日为: startDateStr=%s" % startDateStr)
+ if not endDateStr:
+ endDateStr = "%d-%d-%d" % (serverTime.year, serverTime.month, serverTime.day)
+ GameWorld.Log(" 结束日期为空，默认每天，今日为: endDateStr=%s" % endDateStr)
+ # 活动优先级为 开服天=合服天>运营日期>运营周天
# 按开服天开的
if startDateStr.isdigit() and endDateStr.isdigit():
startServerDay, endServerDay = int(startDateStr), int(endDateStr)
@@ -193,28 +217,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 actName not in ShareDefine.FeastOperationActionNameList:
- 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
-
- 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 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 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 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 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()
@@ -423,8 +460,48 @@
return curServerActIpyDataList
+def __GetOperationActionDisableWeekIpyDataInfo(curDateTime, curServerActIpyDataList):
+ ## 获取不可用的按星期X开启的配置数据信息，按星期X开启的 活动优先级小于按日期的，当有重叠时以日期的为准
+ disableWeekIpyDataInfo = {}
+ curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1
+
+ weekIpyDataList, ymdIpyDatList = [], []
+ for ipyData in curServerActIpyDataList:
+ startDateStr = ipyData.GetStartDate()
+ endDateStr = ipyData.GetEndDate()
+ if startDateStr.isdigit() or startDateStr.startswith("Mix"):
+ # 开服天、合服天的不处理
+ continue
+
+ # 按星期X的
+ if startDateStr.startswith("W"):
+ startWeekday = int(startDateStr[1:])
+ endWeekday = int(endDateStr[1:])
+ startWeekDate = curDateTime + datetime.timedelta(days=(startWeekday-curWeekday))
+ endWeekDate = curDateTime + datetime.timedelta(days=(endWeekday-curWeekday))
+ weekIpyDataList.append([ipyData, startWeekDate, endWeekDate])
+ # 按日期的
+ else:
+ 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])
+
+ for ipyData, startWeekDate, endWeekDate in weekIpyDataList:
+ cfgID = ipyData.GetCfgID()
+ for ymdIpyData, ymdStartDate, ymdEndDate in ymdIpyDatList:
+ if ymdStartDate <= startWeekDate <= ymdEndDate or ymdStartDate <= endWeekDate <= ymdEndDate:
+ ymdCfgID = ymdIpyData.GetCfgID()
+ disableWeekIpyDataInfo[cfgID] = [startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate]
+
+ return disableWeekIpyDataInfo
+
def Dispose_OperationActionState(reloadRefresh=False):
# 运营活动状态处理, 每天0点会强制同步当天的运营活动详情到地图服务器
+
+ if GameWorld.IsCrossServer():
+ # 跨服不处理运营活动
+ return
isReload, OperationActionInfo = __GetOperationActionInfo(False) # 这里必须传False
isReload = isReload or reloadRefresh
@@ -438,6 +515,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 # 默认关闭
@@ -450,19 +529,40 @@
#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:
@@ -796,7 +896,8 @@
PlayerControl.WorldNotify(0, notifyKey, paramList)
dictName = ShareDefine.Def_Notify_WorldKey_DailyActionState % dailyActionID
- if gameWorld.GetDictByKey(dictName) == state:
+ beforeState = gameWorld.GetDictByKey(dictName)
+ if beforeState == state:
#已经是这个状态了
continue
@@ -804,13 +905,14 @@
# 骑宠争夺活动开始前同步有效人数到地图
if dailyActionID == ShareDefine.DailyActionID_FamilyRobBoss:
GameWorldBoss.SyncMapServer_HorsePetRobBossPlayerCount()
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ActionBossRebornSign % dailyActionID, int(time.time()))
#通知Mapserver,设置字典
GameWorld.SendMapServerMsgEx(dictName, state)
#更新字典值
gameWorld.SetDict(dictName, state)
GameWorld.Log("日常活动状态变更: dailyActionID=%s,state=%s,dictName=%s" % (dailyActionID, state, dictName))
- __DoLogic_GameServer_ActionState(dictName, state)
+ __DoLogic_GameServer_ActionState(dictName, state, beforeState)
return
@@ -1251,7 +1353,7 @@
# @remarks
def __DoLogic_GameServer_ActionState(dictName, isOpen, beforeState=0):
#仙盟宴会
- if dictName == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty:
+ if dictName == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyParty:
PlayerFamilyParty.FamilyPartyStateChange(isOpen, beforeState)
#仙盟联赛
elif dictName == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyWar:
--
Gitblit v1.8.0