From c82ca7ce4eaa66b71a9df0e7f54434530ac59c9d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 02 十一月 2020 16:28:03 +0800
Subject: [PATCH] 8469 【BT】【后端】个人BOSS，获得S评级的BOSS可进行扫荡
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 92 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 1dfac90..410b063 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -143,9 +143,11 @@
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,9 +155,11 @@
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, [参数]], ...}
+ isCustomDay = False
activityIpyData = None # 活动中的的配置，取需要处理的配置中开始时间最晚的，反之开关时间头尾相连的时候无法开启后面的活动
# 注意：每个活动配置会有多个活动时间点，但是有且只能生效一条活动配置，换句话说就是每个活动配置时间不允许交叉
for ipyData in curServerActIpyDataList:
@@ -167,9 +171,23 @@
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)
+ if not isCustomDay:
+ isCustomDay = startServerDay == openServerDay
#结束日可能还需要处理广播之类，所以这里需要+1
if openServerDay > endServerDay + 1:
GameWorld.Log(" 当前开服天超过活动结束开服天，不处理! cfgID=%s,%s ~ %s < openServerDay(%s)" % (cfgID, startDateStr, endDateStr, openServerDay))
@@ -184,6 +202,8 @@
GameWorld.Log(" 非合服服务器，不处理! cfgID=%s,%s ~ %s" % (cfgID, startDateStr, endDateStr))
continue
startMixServerDay, endMixServerDay = int(startDateStr[3:]), int(endDateStr[3:])
+ if not isCustomDay:
+ isCustomDay = startMixServerDay == mixServerDay
#结束日可能还需要处理广播之类，所以这里需要+1
if mixServerDay > endMixServerDay + 1:
GameWorld.Log(" 当前合服天超过活动结束合服天，不处理! cfgID=%s,%s ~ %s < mixServerDay(%s)" % (cfgID, startDateStr, endDateStr, mixServerDay))
@@ -193,15 +213,27 @@
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 startDateStr.startswith("W") and endDateStr.startswith("W"):
+ if isCustomDay:
+ GameWorld.Log(" 当前开服合服天存在的定制天，周循环开启的不处理! cfgID=%s,%s ~ %s" % (cfgID, startDateStr, endDateStr))
+ continue
+ 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))
elif actName not in ShareDefine.FeastOperationActionNameList:
if openServerDay <= customMaxServerDay:
GameWorld.Log(" 按日期开的在开服定制限制天内，不处理! cfgID=%s,%s ~ %s,openServerDay=%s" % (cfgID, startDateStr, endDateStr, openServerDay))
continue
+ 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 curStartDateTime <= customMaxServerDateTime:
- GameWorld.Log(" 按日期开的开始日期在开服定制限制天内，不处理! cfgID=%s,curStartDateTime=%s,customMaxServerDateTime=%s" % (cfgID, curStartDateTime, customMaxServerDateTime))
+ if curServerOpenDateTime <= curStartDateTime <= customMaxServerDateTime:
+ GameWorld.Log(" 按日期开的开始日期在开服定制限制天内，不处理! cfgID=%s,curServerOpenDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, curServerOpenDateTime, curStartDateTime, customMaxServerDateTime))
continue
if isMixServer:
@@ -213,7 +245,7 @@
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))
+ GameWorld.Log(" 按日期开的开始日期在合服定制限制天内，不处理! cfgID=%s,mixStartServerDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, mixStartServerDateTime, curStartDateTime, customMaxServerDateTime))
continue
if hasattr(ipyData, "GetStartTimeList") and hasattr(ipyData, "GetEndTimeList"):
@@ -422,6 +454,42 @@
break
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点会强制同步当天的运营活动详情到地图服务器
@@ -796,7 +864,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 +873,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
@@ -1095,11 +1165,12 @@
# GameWorld.DebugLog(" 副本可否进入已经是该值: dataMapID=%s,updCanEnter=%s,canEnterKey=%s" % (dataMapID, updCanEnter, canEnterKey))
fbFuncStateKey = ShareDefine.Def_Notify_WorldKey_FBFuncState % dataMapID
- if gameWorld.GetDictByKey(fbFuncStateKey) != updStateValue:
+ beforeState = gameWorld.GetDictByKey(fbFuncStateKey)
+ if beforeState != updStateValue:
GameWorld.SendMapServerMsgEx(fbFuncStateKey, updStateValue) #通知Mapserver,设置字典
gameWorld.SetDict(fbFuncStateKey, updStateValue) #更新字典值
GameWorld.Log("副本状态变更: dataMapID=%s,updStateValue=%s,fbFuncStateKey=%s" % (dataMapID, updStateValue, fbFuncStateKey))
- __DoLogic_GameServer_ActionState(fbFuncStateKey, updStateValue)
+ __DoLogic_GameServer_ActionState(fbFuncStateKey, updStateValue, beforeState)
#else:
# GameWorld.DebugLog(" 副本状态已经是该值: dataMapID=%s,updStateValue=%s,fbFuncStateKey=%s" % (dataMapID, updStateValue, fbFuncStateKey))
@@ -1245,12 +1316,13 @@
##处理GameServer活动状态
# @param dictName 字典名
# @param isOpen 是否开启
+# @param beforeState 状态变更前的值，部分判断处理
# @return 返回值无意义
# @remarks
-def __DoLogic_GameServer_ActionState(dictName, isOpen):
+def __DoLogic_GameServer_ActionState(dictName, isOpen, beforeState=0):
#仙盟宴会
- if dictName == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty:
- PlayerFamilyParty.FamilyPartyStateChange(isOpen)
+ 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:
GameWorldFamilyWar.OnFamilyWarStateChange(isOpen)
--
Gitblit v1.8.0