From 509e00333a0b4d26885e291af094f26ec5e010f2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 13 十二月 2021 14:48:10 +0800
Subject: [PATCH] 9265 【BT5】【后端】53、新增幸运云购（调整为跨服节日活动模式；跨服节日活动管理优化）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py | 200 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 158 insertions(+), 42 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py
index 15bcc39..0129fbc 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py
@@ -32,7 +32,8 @@
(
CrossAct_ReloadSign, # 信息重载标记
CrossAct_TodayInfo, # 当日的活动信息
-) = range(2)
+CrossAct_CfgIDInfo, # 处理的cfgID信息
+) = range(3)
def OnPlayerLogin(curPlayer):
return
@@ -70,6 +71,55 @@
return
+def GetCrossActZoneID(actName, serverGroupID):
+ ## 获取子服ID所属跨服活动分区， 跨服、子服通用
+ actInfoDict = GetCrossActInfoByServerGroupID(actName, serverGroupID)
+ if not actInfoDict:
+ return
+ cfgID = actInfoDict.get(ShareDefine.ActKey_CfgID)
+ ipyDataInfo = actInfoDict.get(ShareDefine.ActKey_IpyDataInfo)
+ if not ipyDataInfo:
+ GameWorld.ErrLog("ActKey_IpyDataInfo为空, 找不到跨服活动所属分区! actName=%s, serverGroupID=%s, cfgID=%s"
+ % (actName, serverGroupID, cfgID))
+ return
+ return ipyDataInfo.get("ZoneID")
+
+def GetCrossActInfoByServerGroupID(actName, serverGroupID):
+ '''获取子服ID所属跨服活动信息， 跨服、子服通用
+ @param serverGroupID: 服务器ID或服务器分ID
+ 跨服活动表配置的是服务器ID，而子服合服后以主服的服务器ID作为服务器组ID，所以两种服务器ID在此函数中通用
+ @return: None or ActKey_IpyDataInfo
+ '''
+
+ crossActInfoDict = PyGameData.g_crossActInfoDict
+ if crossActInfoDict and actName in crossActInfoDict:
+ curActInfoDict = crossActInfoDict[actName]
+
+ for actInfoDict in curActInfoDict.values():
+ if not actInfoDict.get(ShareDefine.ActKey_State, 0):
+ continue
+ serverIDRangeList = actInfoDict.get(ShareDefine.ActKey_ServerIDRangeList)
+ if not serverIDRangeList:
+ continue
+
+ for groupInfo in serverIDRangeList:
+ if (isinstance(groupInfo, int) and serverGroupID == groupInfo) \
+ or ((isinstance(groupInfo, tuple) or isinstance(groupInfo, list)) \
+ and len(groupInfo) == 2 and groupInfo[0] <= serverGroupID <= groupInfo[1]):
+ return actInfoDict
+
+ GameWorld.DebugLog("找不到服务器组ID对应跨服活动分区! actName=%s, serverGroupID=%s" % (actName, serverGroupID))
+ return
+
+def GetCrossActInfoByCfgID(actName, cfgID):
+ crossActInfoDict = GetCrossActInfoDict()
+ if actName not in crossActInfoDict:
+ return
+ curActInfoDict = crossActInfoDict[actName]
+ if cfgID not in curActInfoDict:
+ return
+ return curActInfoDict[cfgID]
+
def GetCrossActInfoDict():
if PyGameData.g_crossActInfoDict == None:
PyGameData.g_crossActInfoDict = {}
@@ -91,8 +141,10 @@
if actName not in PyGameData.g_crossActInfoDict:
PyGameData.g_crossActInfoDict[actName] = {}
actInfoDict = PyGameData.g_crossActInfoDict[actName]
- dbInfo = {ShareDefine.ActKey_ID:actID, ShareDefine.ActKey_State:state, ShareDefine.ActKey_TemplateID:templateID} # 活动ID、状态、模板信息单独存储，重置活动判断用
- actInfo = {ShareDefine.ActKey_CfgID:cfgID, ShareDefine.ActKey_ServerIDRangeList:serverIDRangeList}
+ # 活动ID、状态、模板信息单独存储，重置活动判断用
+ dbInfo = {ShareDefine.ActKey_ID:actID, ShareDefine.ActKey_State:state, ShareDefine.ActKey_TemplateID:templateID,
+ ShareDefine.ActKey_CfgID:cfgID, ShareDefine.ActKey_ServerIDRangeList:serverIDRangeList}
+ actInfo = {}
actInfo.update(dbInfo)
actInfo[ShareDefine.ActKey_DBInfo] = dbInfo
actInfoDict[cfgID] = actInfo
@@ -104,6 +156,7 @@
def __GetParseIpyDataList(ipyDataMgr, actName, actInfoDict):
## 获取需要处理的合法分组活动配置列表，已经在活动中的必须要处理
+ groupNameList = [] # 确保分组顺序
groupInfo = {}
actCfgCount = getattr(ipyDataMgr, "Get%sCount" % actName)()
for cfgIndex in xrange(actCfgCount):
@@ -111,11 +164,13 @@
actGroupName = ipyData.GetActGroupName()
if actGroupName not in groupInfo:
groupInfo[actGroupName] = []
+ groupNameList.append(actGroupName)
groupIpyDataList = groupInfo[actGroupName]
groupIpyDataList.append(ipyData)
parseIpyDataList = []
- for actGroupName, groupIpyDataList in groupInfo.items():
+ for actGroupName in groupNameList:
+ groupIpyDataList = groupInfo[actGroupName]
allOpen = False
cfgIDList = []
allServerIDRangeList = []
@@ -128,10 +183,11 @@
actInfo = actInfoDict[cfgID]
# 已经在活动中的记录必须要处理
parseIpyDataList.append(ipyData)
- serverIDRangeList = actInfo[ShareDefine.ActKey_ServerIDRangeList]
- GameWorld.Log(" 使用已经在活动中的记录的区服分组: cfgID=%s,serverIDRangeList=%s"
- % (cfgID, serverIDRangeList))
-
+ if actName in ShareDefine.CrossActLockServerGroupIDList:
+ serverIDRangeList = actInfo[ShareDefine.ActKey_ServerIDRangeList]
+ GameWorld.Log(" 使用已经在活动中的记录的区服分组: cfgID=%s,serverIDRangeList=%s"
+ % (cfgID, serverIDRangeList))
+
# 没配置的全服开放
if not serverIDRangeList:
allOpen = True
@@ -185,6 +241,7 @@
curDateTime = datetime.datetime.strptime(curDateTimeStr, ChConfig.TYPE_Time_Format)
actTimeInfoDict = {}
+ actCfgIDInfoDict = {}
ipyDataMgr = IpyGameDataPY.IPY_Data()
GameWorld.Log("=============================================================")
@@ -207,9 +264,10 @@
parseIpyDataList = __GetParseIpyDataList(ipyDataMgr, actName, curActInfoDict)
for ipyData in parseIpyDataList:
cfgID = ipyData.GetCfgID()
+ actGroupName = ipyData.GetActGroupName()
startDateStr = ipyData.GetStartDate()
endDateStr = ipyData.GetEndDate()
- GameWorld.Log(" cfgID=%s,startDateStr=%s,endDateStr=%s,curDateTime=%s" % (cfgID, startDateStr, endDateStr, curDateTime))
+ GameWorld.Log(" cfgID=%s,actGroupName==%s,startDateStr=%s,endDateStr=%s,curDateTime=%s" % (cfgID, actGroupName, startDateStr, endDateStr, curDateTime))
if not startDateStr:
startDateStr = curDateStr
GameWorld.Log(" 开始日期为空，默认每天，今日为: startDateStr=%s" % startDateStr)
@@ -328,6 +386,9 @@
if actName not in actTimeInfoDict:
actTimeInfoDict[actName] = {}
actTimeInfoDict[actName][cfgID] = [ipyData, startList, endList, notifyDict]
+ if actName not in actCfgIDInfoDict:
+ actCfgIDInfoDict[actName] = [[], []]
+ endCfgIDList, actCfgIDList = actCfgIDInfoDict[actName]
if actName not in crossActInfoDict:
crossActInfoDict[actName] = {}
@@ -346,12 +407,35 @@
GameWorld.Log(" ipyDataDict=%s" % ipyDataDict)
curCfgActInfoDict.update({ShareDefine.ActKey_CfgID:cfgID, ShareDefine.ActKey_IpyDataInfo:ipyDataDict})
- if ShareDefine.ActKey_ServerIDRangeList not in curCfgActInfoDict:
+ if ShareDefine.ActKey_ServerIDRangeList not in curCfgActInfoDict or actName not in ShareDefine.CrossActLockServerGroupIDList:
# 没有的话则使用配置中的，防止配置修改导致服务器ID分区变动引起的活动数据异常，除非后台工具强制修改
curCfgActInfoDict[ShareDefine.ActKey_ServerIDRangeList] = ipyData.GetServerIDRangeList()
actID, dayIndex, templateID = 0, 0, 0
if isActTime:
+ ''' 注： 检查是否已经存在活动中的分组，有的话强制将其置为结算状态，有且仅有一个活动中的组，后面的强制覆盖前面的
+ parseIpyDataList 确保同一活动组名的serverID不会重复
+ 这里进一步确保不同活动组名的不会同时开启活动，有且仅有一个活动中的活动组
+ '''
+ for befIpyData in parseIpyDataList:
+ befCfgID = befIpyData.GetCfgID()
+ befActGroupName = befIpyData.GetActGroupName()
+ if befActGroupName == actGroupName:
+ break
+ if befCfgID not in actCfgIDList:
+ continue
+ actCfgIDList.remove(befCfgID)
+ if befCfgID in curActInfoDict:
+ befCfgActInfoDict = curActInfoDict[befCfgID]
+ befCfgActInfoDict[ShareDefine.ActKey_ID] = 0 # 活动ID强制置为0
+
+ if befCfgID in endCfgIDList:
+ continue
+ endCfgIDList.append(befCfgID)
+ GameWorld.Log(" 前面存在活动的分组，则强制结束活动！ befCfgID=%s,befActGroupName=%s" % (befCfgID, befActGroupName))
+ if cfgID not in actCfgIDList:
+ actCfgIDList.append(cfgID)
+
dayIndex = (curDateTime - startDayDate).days
actIDDateTime = startDayDate
isDayReset = 0 if not hasattr(ipyData, "GetIsDayReset") else ipyData.GetIsDayReset()
@@ -367,15 +451,18 @@
templateID = templateIDList[-1] if dayIndex >= len(templateIDList) else templateIDList[dayIndex]
# 其他特殊模板ID获取处理，有需要的单独处理即可，根据活动规则自行扩展...
-
+ else:
+ if cfgID not in endCfgIDList:
+ endCfgIDList.append(cfgID)
curCfgActInfoDict.update({ShareDefine.ActKey_ID:actID, ShareDefine.ActKey_TemplateID:templateID,
ShareDefine.ActKey_DayIndex:dayIndex})
- CrossActInfo = IpyGameDataPY.SetConfigEx(key, [reloadSign, actTimeInfoDict])
+ CrossActInfo = IpyGameDataPY.SetConfigEx(key, [reloadSign, actTimeInfoDict, actCfgIDInfoDict])
GameWorld.Log("本日跨服运营活动信息加载完毕!reloadSign=%s,isRefreshState=%s" % (reloadSign, isRefreshState))
GameWorld.Log(" actTimeInfoDict=%s" % actTimeInfoDict)
+ GameWorld.Log(" actCfgIDInfoDict=%s" % actCfgIDInfoDict)
GameWorld.Log(" crossActInfoDict=%s" % crossActInfoDict)
GameWorld.Log("=============================================================")
if isRefreshState:
@@ -388,6 +475,7 @@
isReload, CrossActInfo = __GetCrossActInfo(False) # 这里必须传False
isReload = isReload or reloadRefresh
actTimeInfoDict = CrossActInfo[CrossAct_TodayInfo]
+ actCfgIDInfoDict = CrossActInfo[CrossAct_CfgIDInfo]
crossActInfoDict = GetCrossActInfoDict()
@@ -398,28 +486,38 @@
sysnCrossActInfoDict = {}
for actName in ShareDefine.CrossActNameList:
- if actName not in actTimeInfoDict or actName not in crossActInfoDict:
+ if actName not in actTimeInfoDict or actName not in crossActInfoDict or actName not in actCfgIDInfoDict:
continue
-
- for ipyData, startList, endList, notifyDict in actTimeInfoDict[actName].values():
+
+ timeInfoDict = actTimeInfoDict[actName]
+ endCfgIDList, actCfgIDList = actCfgIDInfoDict[actName]
+ # 可能一条cfgID处理结束，另一条cfgID处理开始，也可能同一条cfgID即结束同时又开始（如每天重置的）
+ cfgIDList = endCfgIDList + actCfgIDList
+ for cfgID in cfgIDList:
+ if cfgID not in timeInfoDict:
+ continue
+ ipyData, startList, endList, notifyDict = timeInfoDict[cfgID]
state = 0 # 默认关闭
cfgID = ipyData.GetCfgID()
+ groupName = ipyData.GetActGroupName()
+ zoneID = ipyData.GetZoneID()
if cfgID not in crossActInfoDict[actName]:
crossActInfoDict[actName][cfgID] = {}
actInfoDict = crossActInfoDict[actName][cfgID]
# 状态
- for dIndex, startDateTime in enumerate(startList):
- endDateTime = endList[dIndex]
- if startDateTime <= curDateTime < endDateTime:
- state = dIndex + 1 # 也是代表第几个时间段
- break
+ if cfgID not in endCfgIDList:
+ for dIndex, startDateTime in enumerate(startList):
+ endDateTime = endList[dIndex]
+ if startDateTime <= curDateTime < endDateTime:
+ state = dIndex + 1 # 也是代表第几个时间段
+ break
+ serverIDRangeList = actInfoDict.get(ShareDefine.ActKey_ServerIDRangeList)
# 全服广播提示信息
if curDateTime in notifyDict:
- serverIDRangeList = actInfoDict.get(ShareDefine.ActKey_ServerIDRangeList)
if serverIDRangeList != None:
notifyKey, paramList = notifyDict[curDateTime]
country = 0
@@ -430,41 +528,50 @@
dbInfo = actInfoDict.get(ShareDefine.ActKey_DBInfo, {})
dbState = dbInfo.get(ShareDefine.ActKey_State, 0)
+ dbCfgID = dbInfo.get(ShareDefine.ActKey_CfgID, 0)
dbActID = dbInfo.get(ShareDefine.ActKey_ID, 0)
dbTemplateID = dbInfo.get(ShareDefine.ActKey_TemplateID, 0)
+ dbServerIDRangeList = dbInfo.get(ShareDefine.ActKey_ServerIDRangeList, None)
+ forceReset = False
+ if dbCfgID == cfgID and dbServerIDRangeList != serverIDRangeList:
+ forceReset = True
+
actID = actInfoDict.get(ShareDefine.ActKey_ID, 0)
templateID = actInfoDict.get(ShareDefine.ActKey_TemplateID, 0)
- if not isReload and dbState == state and dbActID == actID:
+ if not isReload and dbState == state and dbActID == actID and not forceReset:
#已经是这个状态了
continue
- GameWorld.Log("跨服运营活动变更: actName=%s,cfgID=%s,dbState=%s -> state=%s, dbActID=%s -> actID=%s"
- % (actName, cfgID, dbState, state, dbActID, actID))
+ GameWorld.Log("跨服运营活动状态: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbState=%s -> state=%s, dbActID=%s -> actID=%s,forceReset=%s"
+ % (actName, cfgID, groupName, zoneID, dbState, state, dbActID, actID, forceReset))
- if dbActID != actID:
- GameWorld.Log(" 活动ID变更: actName=%s,cfgID=%s,dbActID=%s -> actID=%s,dbTemplateID=%s"
- % (actName, cfgID, dbActID, actID, dbTemplateID))
-
- if actName == ShareDefine.CrossActName_CTGBillboard:
- CrossActCTGBillboard.OnActIDChange(cfgID, dbTemplateID, state)
-
- if dbState != state:
- pass
-
# 更新状态
actInfoDict[ShareDefine.ActKey_State] = state
- actInfoDict[ShareDefine.ActKey_DBInfo] = {ShareDefine.ActKey_ID:actID, ShareDefine.ActKey_State:state, ShareDefine.ActKey_TemplateID:templateID}
- GameWorld.Log(" 活动状态同步信息: actName=%s,cfgID=%s,actInfoDict=%s" % (actName, cfgID, actInfoDict))
+ dbInfo = {ShareDefine.ActKey_ID:actID, ShareDefine.ActKey_State:state, ShareDefine.ActKey_TemplateID:templateID,
+ ShareDefine.ActKey_CfgID:cfgID, ShareDefine.ActKey_ServerIDRangeList:serverIDRangeList}
+ actInfoDict[ShareDefine.ActKey_DBInfo] = dbInfo
+ #GameWorld.Log(" 活动状态同步信息: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,actInfoDict=%s" % (actName, cfgID, groupName, zoneID, actInfoDict))
if actName not in sysnCrossActInfoDict:
sysnCrossActInfoDict[actName] = {}
sysnCrossActInfoDict[actName][cfgID] = actInfoDict
+ if dbActID != actID or forceReset:
+ GameWorld.Log(" 活动ID变更: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbActID=%s -> actID=%s,forceReset=%s,dbTemplateID=%s"
+ % (actName, cfgID, groupName, zoneID, dbActID, actID, forceReset, dbTemplateID))
+
+ if actName == ShareDefine.CrossActName_CTGBillboard:
+ CrossActCTGBillboard.OnActIDChange(cfgID, dbTemplateID, state)
+
+ elif actName == ShareDefine.CrossActName_LuckyCloudBuy:
+ import CrossLuckyCloudBuy
+ CrossLuckyCloudBuy.OnLuckyCloudBuyReset(ipyData, state)
+
# 非活动中的处理完关闭后，最后删除
if not state:
del crossActInfoDict[actName][cfgID]
if not crossActInfoDict[actName]:
del crossActInfoDict[actName]
- GameWorld.DebugLog(" 删除结束的活动: actName=%s,cfgID=%s,crossActInfoDict=%s" % (actName, cfgID, crossActInfoDict))
+ #GameWorld.Log(" 移除结束的活动: actName=%s,cfgID=%s,crossActInfoDict=%s" % (actName, cfgID, crossActInfoDict))
# 同步子服务器
serverGroupIDList = []
@@ -493,12 +600,21 @@
## 收到跨服服务器同步的跨服运营活动状态
GameWorld.Log("===== 收到跨服服务器同步的跨服运营活动状态: %s" % sysnCrossActInfoDict)
- if PyGameData.g_crossActInfoDict == None:
+ if PyGameData.g_crossActInfoDict == None or not sysnCrossActInfoDict:
PyGameData.g_crossActInfoDict = {}
- PyGameData.g_crossActInfoDict.update(sysnCrossActInfoDict)
-
- for actName, actInfoDict in sysnCrossActInfoDict.items():
- GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossActInfo % actName, actInfoDict)
+
+ for actName, syncActInfoDict in sysnCrossActInfoDict.items():
+ for cfgID, syncActInfo in syncActInfoDict.items():
+ if actName not in PyGameData.g_crossActInfoDict:
+ PyGameData.g_crossActInfoDict[actName] = {}
+ actInfoDict = PyGameData.g_crossActInfoDict[actName]
+ actInfoDict[cfgID] = syncActInfo
+
+ if actName == ShareDefine.CrossActName_LuckyCloudBuy:
+ import CrossLuckyCloudBuy
+ CrossLuckyCloudBuy.Sync_LuckyCloudBuyRoundInfo(None)
+
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossActInfo % actName, syncActInfoDict)
# 删除非活动中的
for actName, actInfoDict in PyGameData.g_crossActInfoDict.items():
--
Gitblit v1.8.0