From ebf0c525597f65830be5975ec91a157793cba1e9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 23 五月 2022 17:00:25 +0800
Subject: [PATCH] 9415 【BT】【后端】古神战场（优化玩家在战场结算前掉线后逻辑：结算后强制设置玩家为非跨服状态，防止玩家重连导致还会进入跨服地图然后再被踢出去的无效流程）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 169 ++++++++++++++++++++-----------------------------------
1 files changed, 62 insertions(+), 107 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index bf74fe8..bc415ec 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -33,6 +33,7 @@
import PlayerFamilyRedPacket
import PlayerFairyCeremony
import PlayerNewFairyCeremony
+import PlayerActGarbageSorting
import PlayerUniversalGameRec
import GameWorldAverageLv
import PlayerFamilyBoss
@@ -64,7 +65,10 @@
# 跨服不处理运营活动
return
- isReload, OperationActionInfo = __GetOperationActionInfo()
+ # 玩家登录的不触发重载活动，不然刚好在0点服务器处理OnDay之前登录的时候会有问题
+ isReload, OperationActionInfo = __GetOperationActionInfo(needReload=False)
+ if not OperationActionInfo:
+ return
operationActionDict = OperationActionInfo[OperationAction_TodayInfo]
if isReload:
@@ -188,7 +192,7 @@
% (actName, cfgID, recStartDateStr, recEndDateStr, recLimitWorldLV, recWorldLV))
return actWorldLVLimitInfo
-def __GetOperationActionInfo(isRefreshState=True):
+def __GetOperationActionInfo(isRefreshState=True, needReload=True):
# @return: isReload, OperationActionInfo
key = "OperationActionInfo"
@@ -202,6 +206,9 @@
reloadSign = [openServerDay, isMixServer, mixServerDay, reloadSignHour]
if OperationActionInfo and OperationActionInfo[OperationAction_ReloadSign] == reloadSign:
#GameWorld.DebugLog("已经加载过本日运营活动处理信息！openServerDay=%s" % openServerDay)
+ return False, OperationActionInfo
+
+ if not needReload:
return False, OperationActionInfo
# 因为后面的时间判断都是精确到分的，而处理此逻辑的时候可能不是0秒，所以这里的datetime取当前时间精确到分的
@@ -234,7 +241,7 @@
GameWorld.Log("加载运营活动: actName=%s,platform=%s,serverGroupID=%s" % (actName, platform, serverGroupID))
curServerActIpyDataList = __GetOperationActionServerIpyDataList(ipyDataMgr, platform, serverGroupID, actName)
GameWorld.Log(" 可处理条数=%s" % (len(curServerActIpyDataList)))
- actNumDisableWeekIpyDataInfo = __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList)
+ actNumDisableWeekIpyDataInfo, disableWeekCfgIDDict = __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList)
for ipyData in curServerActIpyDataList:
@@ -268,7 +275,7 @@
# 开服常规： 开服天 > 日期 > 周x （不受合服天影响，合服活动新增一套独立的活动，还是走运营活动配置）
if actType == ShareDefine.ActType_OpenComm:
actByWeek = (startDateStr.startswith("W") and endDateStr.startswith("W")) # 按周x开
- actByDate = (startDateStr.count("-") == 2 and endDateStr.count("-") == 2) # 按日期开
+ actByDate = (not actByWeek and startDateStr.count("-") == 2 and endDateStr.count("-") == 2) # 按日期开
# 开服天的
if startDateStr.isdigit() and endDateStr.isdigit():
@@ -296,13 +303,13 @@
% (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]))
+ continue
+
if actByWeek:
- 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)
+ startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
GameWorld.Log(" 星期X转化为日期: %s ~ %s" % (startDateStr, endDateStr))
curServerOpenDateTime = curDateTime + datetime.timedelta(days=(1 - openServerDay)) # 开服第一天的日期
@@ -401,6 +408,12 @@
## 防止未真正开始的活动需要提前预告，而导致覆盖掉了实际正在进行中的活动，一般是活动时间配置连续的时候可能出现该情况
GameWorld.Log(" 已经存在需要处理的配置ID(%s)！ 当前需要提前通知或广播的活动未达到活动开始时间，不处理！cfgID=%s,advanceMinutes=%s,minNotifyStartMinute=%s,startDayDateJudge=%s"
% (activityIpyData.GetCfgID(), cfgID, advanceMinutes, minNotifyStartMinute, startDayDateJudge))
+ continue
+
+ #注：刚好是结束的时间点，防范已经有需要处理的配置被覆盖
+ if curActTodayInfo and curDateTime == endDayDate:
+ activityIpyData = curActTodayInfo[0]
+ GameWorld.Log(" 已经存在需要处理的配置ID(%s)！ 当前刚好结束的时间点，不处理！cfgID=%s" % (activityIpyData.GetCfgID(), cfgID))
continue
# 在需要处理的时间内附加世界等级开启限制，未达到最低世界等级要求的不开，活动时间从未达到到达到也不开
@@ -594,10 +607,15 @@
def __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList):
## 获取不可用的按星期X开启的配置数据信息，按星期X开启的 活动优先级小于按日期的，当有重叠时以日期的为准
- curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1
+ #curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1
actNumWeekYMDIpyDataInfo = {} # {actNum:[weekIpyDataList, ymdIpyDatList], ...}
+ disableWeekCfgIDDict = {} # {cfgID:[startDateStr, endDateStr], ...}
+
+ curDateTimeYmdStr = "%d-%d-%d" % (curDateTime.year, curDateTime.month, curDateTime.day)
+ curDateTimeYmd = GameWorld.ChangeStrToDatetime(curDateTimeYmdStr, ChConfig.TYPE_Time_YmdFormat)
for ipyData in curServerActIpyDataList:
+ cfgID = ipyData.GetCfgID()
startDateStr = ipyData.GetStartDate()
endDateStr = ipyData.GetEndDate()
actNum = GetOperationActNum(actName, ipyData)
@@ -613,11 +631,14 @@
# 按星期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])
+ 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])
+
# 按日期的
elif startDateStr.count("-") == 2:
ymdIpyData = ipyData
@@ -641,89 +662,7 @@
ymdCfgID = ymdIpyData.GetCfgID()
actNumDisableWeekIpyDataInfo[actNum][cfgID] = [startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate]
- return actNumDisableWeekIpyDataInfo
-
-def TransferOperationActDBKeyValue():
- ''' 服务器启动时调用
- 支持多活动的数据转移，旧版本db活动数据转移到新版本，分两种情况
- 1. 原已支持多活动的： 手动根据原编号规则进行指定转移，这个维护一次后代码可删除
- 2. 原不支持多活动的，自动根据原活动类型进行适配转移即可，由于合服相关的独立出来了，所以只需要处理常规的及节日类型
- 这个代码可以一直放着，后续增加支持多活动类型的配置到 MultiActNumOperationActNameList 即可
-
- 注：不支持多活动的，暂还是用旧的key记录数据
- '''
- GameWorld.Log("=== 转移运营活动旧版本数据到新版本 ===")
-
- # 1. 原已支持的 - 维护后过一次后可删除或注释掉，目前只有累计充值、集字，线上版本分支 gt_1.100.4
- transferDict = {
- ShareDefine.OperationActionName_TotalRecharge:[
- # 原常规每日累充 转移 到 10
- [PlayerDBGSEvent.Def_OperationActID % ShareDefine.OperationActionName_TotalRecharge,
- PlayerDBGSEvent.Def_OperationActID % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 10,
- ],
- [PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_TotalRecharge,
- PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 10,
- ],
-
- # 原常规多日累充2 转移 到 11
- [PlayerDBGSEvent.Def_OperationActID % (ShareDefine.OperationActionName_TotalRecharge + "2"),
- PlayerDBGSEvent.Def_OperationActID % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 11,
- ],
- [PlayerDBGSEvent.Def_OActWorldLV % (ShareDefine.OperationActionName_TotalRecharge + "2"),
- PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 11,
- ],
-
- # 原节日多日累充3 转移 到 31
- [PlayerDBGSEvent.Def_OperationActID % (ShareDefine.OperationActionName_TotalRecharge + "3"),
- PlayerDBGSEvent.Def_OperationActID % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 31,
- ],
- [PlayerDBGSEvent.Def_OActWorldLV % (ShareDefine.OperationActionName_TotalRecharge + "3"),
- PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 31,
- ],
- ],
- ShareDefine.OperationActionName_CollectWords:[
- # 只配置了常规日期的，可不处理
- ],
- }
- for actName, transferKeyList in transferDict.items():
- for oldKey, newKey in transferKeyList:
- value = PlayerDBGSEvent.GetDBGSTrig_ByKey(oldKey)
- if not value:
- continue
- GameWorld.Log(" 转移旧运营活动dbKey值到新key: actName=%s,oldKey=%s,newKey=%s,value=%s" % (actName, oldKey, newKey, value))
- PlayerDBGSEvent.SetDBGSTrig_ByKey(newKey, value)
- PlayerDBGSEvent.DelDBGSTrig_ByKey(oldKey)
-
- # 2. 新增支持的 - 可当做常规代码一直留着
- for actName in ShareDefine.MultiActNumOperationActNameList:
- if actName in transferDict:
- # 特殊处理转化的活动不进行常规处理
- continue
-
- actIDKeyOld = PlayerDBGSEvent.Def_OperationActID % actName
- worldLVKeyOld = PlayerDBGSEvent.Def_OActWorldLV % actName
-
- actNum = GetOperationActNum(actName)
- actIDKeyNew = actIDKeyOld + "_%s" % actNum
- worldLVKeyNew = worldLVKeyOld + "_%s" % actNum
-
- dbActID = PlayerDBGSEvent.GetDBGSTrig_ByKey(actIDKeyOld)
- dbWorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(worldLVKeyOld)
- if not dbActID:
- continue
-
- GameWorld.Log(" 转移旧运营活动dbKey值到新key: actName=%s" % actName)
- PlayerDBGSEvent.SetDBGSTrig_ByKey(actIDKeyNew, dbActID)
- PlayerDBGSEvent.DelDBGSTrig_ByKey(actIDKeyOld)
- GameWorld.Log(" actIDKeyOld=%s,actIDKeyNew=%s,dbActID=%s" % (actIDKeyOld, actIDKeyNew, dbActID))
-
- if dbWorldLV:
- PlayerDBGSEvent.SetDBGSTrig_ByKey(worldLVKeyNew, dbWorldLV)
- PlayerDBGSEvent.DelDBGSTrig_ByKey(worldLVKeyOld)
- GameWorld.Log(" worldLVKeyOld=%s,worldLVKeyNew=%s,dbWorldLV=%s" % (worldLVKeyOld, worldLVKeyNew, dbWorldLV))
-
- GameWorld.Log("===================================")
- return
+ return actNumDisableWeekIpyDataInfo, disableWeekCfgIDDict
def Dispose_OperationActionState(reloadRefresh=False):
# 运营活动状态处理, 每天0点会强制同步当天的运营活动详情到地图服务器
@@ -838,10 +777,16 @@
#限时抢购重置购买次数 本次活动每场不能重复
#dayIndex = sendMapServerMsgDict.get(ShareDefine.ActKey_DayIndex, 0)
PlayerStore.ResetFlashSaleBuyCnt(ipyData)
+ elif actName == ShareDefine.OperationActionName_GarbageSorting:
+ PlayerActGarbageSorting.OnActStart(actNum)
+ else:
+ if actName == ShareDefine.OperationActionName_GarbageSorting:
+ PlayerActGarbageSorting.OnActEnd(actNum)
+
else:
GameWorld.Log(" dbActID不变: dbActID=%s,curActID=%s" % (dbActID, curActID))
- if state and actName in ShareDefine.NeedWorldLVOperationActNameList:
+ if ipyData and actName in ShareDefine.NeedWorldLVOperationActNameList:
actWorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(dbOperationActWorldLVKey)
sendMapServerMsgDict[ShareDefine.ActKey_WorldLV] = actWorldLV
GameWorld.Log(" 活动世界等级: actWorldLV=%s" % (actWorldLV))
@@ -853,7 +798,13 @@
elif actName == ShareDefine.OperationActionName_BossReborn:
if isReload and ipyData:
GameWorldBoss.SetBossRebornNeedPoint(True)
-
+
+ elif actName == ShareDefine.OperationActionName_HorsePetFeast:
+ if preState != state and state:
+ relatedID = "%s|%s" % (actName, actNum)
+ GameWorld.Log(" 骑宠盛宴开始: relatedID=%s" % (relatedID))
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ActionBossRebornSign % relatedID, int(time.time()))
+
elif actName == ShareDefine.OperationActionName_FairyCeremony:
if isReload and ipyData:
PlayerFairyCeremony.Sync_OperationAction_FairyCeremony(ipyData)
@@ -891,11 +842,11 @@
return
if len(ipyData.GetStartTimeList()) != len(ipyData.GetEndTimeList()):
return
- openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
+ startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
multiExpRateInfo = ChPyNetSendPack.tagGCMultiExpRateInfo()
multiExpRateInfo.Clear()
- multiExpRateInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)
- multiExpRateInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
+ multiExpRateInfo.StartDate = startDateStr
+ multiExpRateInfo.EndtDate = endDateStr
multiExpRateInfo.ActivityTime = []
for i, startTime in enumerate(ipyData.GetStartTimeList()):
endTime = ipyData.GetEndTimeList()[i]
@@ -924,11 +875,11 @@
##多倍修行点活动信息通知
if not ipyData:
return
- openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
+ startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
multiRealmPointInfo = ChPyNetSendPack.tagGCMultiRealmPointInfo()
multiRealmPointInfo.Clear()
- multiRealmPointInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)
- multiRealmPointInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
+ multiRealmPointInfo.StartDate = startDateStr
+ multiRealmPointInfo.EndtDate = endDateStr
multiRealmPointInfo.Multiple = ipyData.GetMultiple()
multiRealmPointInfo.LimitLV = ipyData.GetLVLimit()
multiRealmPointInfo.LimitPoint = ipyData.GetPointLimit()
@@ -1024,6 +975,10 @@
dailyIpyData = ipyDataMgr.GetDailyActionByIndex(i)
dailyID = dailyIpyData.GetDailyID()
+ if dailyID in [ShareDefine.DailyActionID_CrossBattlefield]:
+ GameWorld.Log(" 不需要处理的日常活动! dailyID=%s" % dailyID)
+ continue
+
# 是当天开服天定制活动的不处理常规活动
if dailyID in customDailyIDList:
GameWorld.Log(" 常规活动ID配置是今天的定制活动ID，不处理！: dailyID=%s" % dailyID)
--
Gitblit v1.8.0