From 388823edfe6308cba6f76ca6dc4f20022c5cb2be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 30 六月 2025 19:03:50 +0800
Subject: [PATCH] 10431 【英文】看广告获得限时代金券
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py | 193 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 177 insertions(+), 16 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py
index b6912a2..4970bca 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossActionControl.py
@@ -23,6 +23,12 @@
import IpyGameDataPY
import CrossActCTGBillboard
import PlayerActBossTrial
+import PlayerActXianXiaMJ
+import PlayerActGubao
+import PlayerActHorsePetTrain
+import PlayerActLianqi
+import PlayerDBGSEvent
+import CrossFamilyGCZ
import CrossRealmMsg
import PyGameData
import PlayerFB
@@ -134,6 +140,37 @@
if zoneID != ipyZoneID:
return
return actInfo
+
+def GetCrossActInfoByZoneID(actName, zoneID):
+ ## 获取分区ID对应的跨服活动信息
+ crossActInfoDict = GetCrossActInfoDict()
+ if actName not in crossActInfoDict:
+ return
+ curActInfoDict = crossActInfoDict[actName]
+ for actInfo in curActInfoDict.values():
+ ipyDataDict = actInfo.get(ShareDefine.ActKey_IpyDataInfo, {})
+ if not ipyDataDict:
+ return
+ ipyZoneID = ipyDataDict.get("ZoneID", 0)
+ if zoneID == ipyZoneID:
+ return actInfo
+ return
+
+def GetCrossActZoneIDList(actName):
+ ## 获取跨服活动当前所有分区列表
+ crossActInfoDict = GetCrossActInfoDict()
+ if actName not in crossActInfoDict:
+ return []
+ zoneIDList = []
+ curActInfoDict = crossActInfoDict[actName]
+ for actInfo in curActInfoDict.values():
+ ipyDataDict = actInfo.get(ShareDefine.ActKey_IpyDataInfo, {})
+ if not ipyDataDict:
+ return
+ zoneID = ipyDataDict.get("ZoneID", 0)
+ if zoneID and zoneID not in zoneIDList:
+ zoneIDList.append(zoneID)
+ return zoneIDList
def GetCrossActInfoDict():
if PyGameData.g_crossActInfoDict == None:
@@ -527,6 +564,7 @@
actChangeList = []
actStateChangeList = []
sysnCrossActInfoDict = {}
+ flowStateErrorResetList = []
for actName in ShareDefine.CrossActNameList:
if actName not in actTimeInfoDict or actName not in crossActInfoDict or actName not in actCfgIDInfoDict:
continue
@@ -546,6 +584,8 @@
cfgID = ipyData.GetCfgID()
groupName = ipyData.GetActGroupName()
zoneID = ipyData.GetZoneID()
+ actFlowID = ipyData.GetActFlowID() if hasattr(ipyData, "GetActFlowID") else 0 # 活动流程ID
+ actStartDataTime = None
if cfgID not in crossActInfoDict[actName]:
crossActInfoDict[actName][cfgID] = {}
@@ -557,6 +597,7 @@
endDateTime = endList[dIndex]
if startDateTime <= curDateTime < endDateTime:
state = dIndex + 1 # 也是代表第几个时间段
+ actStartDataTime = startDateTime
break
if endList:
isEnd = (curDateTime >= endList[-1])
@@ -572,18 +613,11 @@
else:
stateJoin = ShareDefine.ActStateJoin_Start if state else ShareDefine.ActStateJoin_None
+ actID = actInfoDict.get(ShareDefine.ActKey_ID, 0)
+ templateID = actInfoDict.get(ShareDefine.ActKey_TemplateID, 0)
serverIDRangeList = actInfoDict.get(ShareDefine.ActKey_ServerIDRangeList)
- # 全服广播提示信息
- if curDateTime in notifyDict:
- if serverIDRangeList != None:
- notifyKey, paramList = notifyDict[curDateTime]
- country = 0
- serverGroupIDList = []
- crossNotifyList = []
- crossNotifyList.append([ShareDefine.CrossNotify_CrossAct, [country, notifyKey, paramList], serverIDRangeList])
- PlayerControl.CrossNotifyEx(serverGroupIDList, crossNotifyList)
-
dbInfo = actInfoDict.get(ShareDefine.ActKey_DBInfo, {})
+
dbState = dbInfo.get(ShareDefine.ActKey_State, 0)
dbStateJoin = dbInfo.get(ShareDefine.ActKey_StateJoin, 0)
dbCfgID = dbInfo.get(ShareDefine.ActKey_CfgID, 0)
@@ -595,8 +629,33 @@
if dbCfgID == cfgID and dbServerIDRangeList != serverIDRangeList:
forceReset = True
- actID = actInfoDict.get(ShareDefine.ActKey_ID, 0)
- templateID = actInfoDict.get(ShareDefine.ActKey_TemplateID, 0)
+ errStateActID = 0
+ if state and actFlowID: # 有活动流程ID的，实际状态按取活动流程对应状态
+ errStateActID = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ActFlowStateError % (actName, zoneID))
+ # 已经是不同活动了，强制重置异常状态标记，防止影响新活动
+ if errStateActID and (errStateActID != actID or not dbState):
+ GameWorld.Log("按流程走的活动流程上次异常，新活动重置状态! %s,zoneID=%s,actID=%s,errStateActID=%s,dbState=%s" % (actName, zoneID, actID, errStateActID, dbState))
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ActFlowStateError % (actName, zoneID), 0)
+ errStateActID = 0
+
+ flowStateIndex, flowState, flowStatePre = GetActTimeFlowState(actFlowID, actStartDataTime, curDateTime)
+ # 非第一个流程状态变更的时候，要验证流程是否正确，如果异常，则流程照走，标记异常，具体异常的处理由各活动自行处理
+ if flowStateIndex > 0 and flowState != dbState and flowStatePre != dbState and not errStateActID:
+ GameWorld.ErrLog("按流程走的活动流程已异常! %s,zoneID=%s,actID=%s,flowStatePre=%s,dbState=%s" % (actName, zoneID, actID, flowStatePre, dbState))
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ActFlowStateError % (actName, zoneID), actID)
+ errStateActID = actID
+ state = flowState
+
+ # 全服广播提示信息
+ if curDateTime in notifyDict and not flowState and not errStateActID:
+ if serverIDRangeList != None:
+ notifyKey, paramList = notifyDict[curDateTime]
+ country = 0
+ serverGroupIDList = []
+ crossNotifyList = []
+ crossNotifyList.append([ShareDefine.CrossNotify_CrossAct, [country, notifyKey, paramList], serverIDRangeList])
+ PlayerControl.CrossNotifyEx(serverGroupIDList, crossNotifyList)
+
if not isReload and dbState == state and dbStateJoin == stateJoin and dbActID == actID and not forceReset:
#已经是这个状态了
continue
@@ -609,6 +668,9 @@
dbInfo = {ShareDefine.ActKey_ID:actID, ShareDefine.ActKey_State:state, ShareDefine.ActKey_TemplateID:templateID,
ShareDefine.ActKey_CfgID:cfgID, ShareDefine.ActKey_ServerIDRangeList:serverIDRangeList,
ShareDefine.ActKey_StateJoin:stateJoin}
+ if errStateActID:
+ actInfoDict[ShareDefine.ActKey_StateError] = errStateActID
+
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:
@@ -619,25 +681,56 @@
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 errStateActID:
+ flowStateErrorResetList.append((actName, zoneID))
+
if actName == ShareDefine.CrossActName_CTGBillboard:
CrossActCTGBillboard.OnActIDChange(cfgID, dbTemplateID, state)
- if actName == ShareDefine.CrossActName_BossTrial:
+ elif actName == ShareDefine.CrossActName_BossTrial:
PlayerActBossTrial.OnCrossActIDChange(cfgID, zoneID, ipyData, state)
+
+ elif actName == ShareDefine.CrossActName_XianXiaMJ:
+ PlayerActXianXiaMJ.OnCrossActIDChange(cfgID, zoneID, ipyData, state)
+
+ elif actName == ShareDefine.CrossActName_Gubao:
+ PlayerActGubao.OnCrossActIDChange(cfgID, zoneID, ipyData, state)
+
+ elif actName == ShareDefine.CrossActName_HorsePetTrain:
+ PlayerActHorsePetTrain.OnCrossActIDChange(cfgID, zoneID, ipyData, state)
+
+ elif actName == ShareDefine.CrossActName_Lianqi:
+ PlayerActLianqi.OnCrossActIDChange(cfgID, zoneID, ipyData, state)
+
+ elif actName == ShareDefine.CrossActName_FamilyGCZ:
+ CrossFamilyGCZ.OnCrossActIDChange(cfgID, zoneID, ipyData, state)
else:
actChangeList.append([actName, ipyData, state, cfgID, groupName, zoneID, dbActID, actID, forceReset, dbTemplateID])
# 活动ID变更强制视为状态变更，防止维护前后状态一样，但其实活动ID已经不同的情况会导致无法触发状态变更
actIDChange = True
- actStateChangeList.append([actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, dbTemplateID])
+ actStateChangeList.append([actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, actID, dbTemplateID])
elif dbState != state:
actIDChange = False
GameWorld.Log(" 活动状态变更: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbState=%s -> state=%s,actIDChange=%s,dbTemplateID=%s"
% (actName, cfgID, groupName, zoneID, dbState, state, actIDChange, dbTemplateID))
- actStateChangeList.append([actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, dbTemplateID])
+ actStateChangeList.append([actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, actID, dbTemplateID])
+ # 活动中刷新，每次都需要刷新的逻辑，包含重读配置等
+ if state:
+ if actName == ShareDefine.CrossActName_BossTrial:
+ PlayerActBossTrial.OnCrossActInStateRefresh(cfgID, zoneID, ipyData)
+ elif actName == ShareDefine.CrossActName_XianXiaMJ:
+ PlayerActXianXiaMJ.OnCrossActInStateRefresh(cfgID, zoneID, ipyData)
+ elif actName == ShareDefine.CrossActName_Gubao:
+ PlayerActGubao.OnCrossActInStateRefresh(cfgID, zoneID, ipyData)
+ elif actName == ShareDefine.CrossActName_HorsePetTrain:
+ PlayerActHorsePetTrain.OnCrossActInStateRefresh(cfgID, zoneID, ipyData)
+ elif actName == ShareDefine.CrossActName_Lianqi:
+ PlayerActLianqi.OnCrossActInStateRefresh(cfgID, zoneID, ipyData)
+
# 仅活动有配置参与时间段的会触发
if actID and dbActID == actID and dbStateJoin != stateJoin:
GameWorld.Log(" 参与状态变更: dbStateJoin=%s,stateJoin=%s" % (dbStateJoin, stateJoin))
@@ -648,6 +741,18 @@
elif stateJoin == ShareDefine.ActStateJoin_End:
if actName == ShareDefine.CrossActName_BossTrial:
PlayerActBossTrial.OnCrossActJoinEnd(cfgID, zoneID, ipyData)
+
+ elif actName == ShareDefine.CrossActName_XianXiaMJ:
+ PlayerActXianXiaMJ.OnCrossActJoinEnd(cfgID, zoneID, ipyData)
+
+ elif actName == ShareDefine.CrossActName_Gubao:
+ PlayerActGubao.OnCrossActJoinEnd(cfgID, zoneID, ipyData)
+
+ elif actName == ShareDefine.CrossActName_HorsePetTrain:
+ PlayerActHorsePetTrain.OnCrossActJoinEnd(cfgID, zoneID, ipyData)
+
+ elif actName == ShareDefine.CrossActName_Lianqi:
+ PlayerActLianqi.OnCrossActJoinEnd(cfgID, zoneID, ipyData)
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossActInfo % actName, crossActInfoDict[actName])
# 非活动中的处理完关闭后，最后删除
@@ -673,15 +778,67 @@
CrossActAllRecharge.OnActIDChange(ipyData, state)
for changeInfo in actStateChangeList:
- actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, dbTemplateID = changeInfo
+ actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, actID, dbTemplateID = changeInfo
GameWorld.Log(" 活动状态变更: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbState=%s -> state=%s,actIDChange=%s,dbTemplateID=%s"
% (actName, cfgID, groupName, zoneID, dbState, state, actIDChange, dbTemplateID))
if actName == ShareDefine.CrossActName_LuckyCloudBuy:
import CrossLuckyCloudBuy
CrossLuckyCloudBuy.OnLuckyCloudBuyStateChange(ipyData, actIDChange, state)
+ elif actName == ShareDefine.CrossActName_FamilyGCZ:
+ CrossFamilyGCZ.OnCrossActStateChange(ipyData, actID, dbState, state)
+ for actName, zoneID in flowStateErrorResetList:
+ GameWorld.Log("活动结束重置按流程走的活动流程异常状态! %s,zoneID=%s" % (actName, zoneID))
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ActFlowStateError % (actName, zoneID), 0)
+
return
+
+def IsActFlowStateError(actName, zoneID):
+ ## 流程状态是否已异常
+ errStateActID = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ActFlowStateError % (actName, zoneID))
+ if errStateActID:
+ GameWorld.ErrLog("活动流程状态已异常! %s,zoneID=%s,errStateActID=%s" % (actName, zoneID, errStateActID))
+ return True
+ return False
+
+def GetActTimeFlowState(actFlowID, actStartDataTime, curDateTime):
+ ## 获取活动流程ID对应当前状态
+ ipyDataList = IpyGameDataPY.GetIpyGameDataList("ActTimeFlow", actFlowID)
+ if not ipyDataList:
+ return 0
+
+ flowStatePre = 0
+ flowState = 0
+ flowStateIndex = -1
+ for index, timeIpyData in enumerate(ipyDataList):
+ #dataID = timeIpyData.GetID()
+ startDay, startHour, startMinute = timeIpyData.GetStartDay(), timeIpyData.GetStartHour(), timeIpyData.GetStartMinute()
+ endDay, endHour, endMinute = timeIpyData.GetEndDay(), timeIpyData.GetEndHour(), timeIpyData.GetEndMinute()
+
+ startSeconds = ((startDay - 1) * 24 + startHour) * 3600 + startMinute * 60
+ endSeconds = ((endDay - 1) * 24 + endHour) * 3600 + endMinute * 60
+ startDateTime = actStartDataTime + datetime.timedelta(seconds=startSeconds)
+ endDateTime = actStartDataTime + datetime.timedelta(seconds=endSeconds)
+ if curDateTime < startDateTime or curDateTime > endDateTime:
+ flowStatePre = timeIpyData.GetStateValue()
+ continue
+ flowState = timeIpyData.GetStateValue()
+ flowStateIndex = index
+ #notifyInfoDict = timeIpyData.GetNotifyInfo()
+ #if not stateError and notifyInfoDict:
+ # diffDateTime = curDateTime - startDateTime
+ # diffMinute = (diffDateTime.days * 24 * 3600 + diffDateTime.seconds) / 60 # 当前时间与开始时间相差分钟数
+ # GameWorld.DebugLog(" 广播判断: curDateTime=%s,startDateTime=%s,diffDays=%s,diffSeconds=%s,diffMinute=%s"
+ # % (curDateTime, startDateTime, diffDateTime.days, diffDateTime.seconds, diffMinute))
+ # if diffMinute in notifyInfoDict:
+ # notifyKey, paramList = notifyInfoDict[diffMinute]
+ # PlayerControl.WorldNotifyCross(serverGroupIDList, 0, notifyKey, paramList)
+ break
+
+ if not flowState:
+ flowStatePre = 0
+ return flowStateIndex, flowState, flowStatePre
def Sync_CrossActInfoToClientServer(serverGroupID=0):
''' 同步跨服运营活动信息到子服务器
@@ -721,6 +878,10 @@
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossActInfo % actName, syncActInfoDict)
+ # 以下需要等活动信息同步给地图后才处理
+ if actName == ShareDefine.CrossActName_FamilyGCZ:
+ CrossFamilyGCZ.ClientServer_CrossActInfo()
+
# 删除非活动中的
for actName, actInfoDict in PyGameData.g_crossActInfoDict.items():
for cfgID, actInfo in actInfoDict.items():
--
Gitblit v1.8.0