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 | 315 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 228 insertions(+), 87 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 4f1976e..e8956af 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -35,6 +35,8 @@
import PlayerNewFairyCeremony
import PlayerUniversalGameRec
import GameWorldAverageLv
+import PlayerFamilyBoss
+import PlayerHorsePetBoss
import GameWorldProcess
import ChPyNetSendPack
import NetPackCommon
@@ -56,6 +58,10 @@
) = range(3)
def OnPlayerLogin(curPlayer):
+
+ if GameWorld.IsCrossServer():
+ # 跨服不处理运营活动
+ return
isReload, OperationActionInfo = __GetOperationActionInfo()
operationActionDict = OperationActionInfo[OperationAction_TodayInfo]
@@ -97,6 +103,10 @@
def SendMapServerOperationActionState():
# 地图启动成功时通知本日运行活动相关状态
+ if GameWorld.IsCrossServer():
+ # 跨服不处理运营活动
+ return
+
isReload, OperationActionInfo = __GetOperationActionInfo()
mapServerInfoDict = OperationActionInfo[OperationAction_MapServerInfo]
@@ -120,11 +130,13 @@
key = "OperationActionInfo"
openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
+ isMixServer = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer)
+ mixServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay) + 1
OperationActionInfo = IpyGameDataPY.GetConfigEx(key)
serverTime = GameWorld.GetServerTime()
curHour = serverTime.hour
reloadSignHour = 0 if curHour < 5 else 5
- reloadSign = "%s_%s" % (openServerDay, reloadSignHour)
+ reloadSign = [openServerDay, isMixServer, mixServerDay, reloadSignHour]
if OperationActionInfo and OperationActionInfo[OperationAction_ReloadSign] == reloadSign:
#GameWorld.DebugLog("已经加载过本日运营活动处理信息！openServerDay=%s" % openServerDay)
return False, OperationActionInfo
@@ -133,20 +145,26 @@
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 = {}
- serverID = GameWorld.GetServerID()
+ serverGroupID = GameWorld.GetServerGroupID()
ipyDataMgr = IpyGameDataPY.IPY_Data()
+ curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1
- GameWorld.Log("===== 加载本日运营活动信息: %s, serverID=%s,openServerDay=%s,customMaxServerDay=%s,reloadSign=%s ====="
- % (curDateTime, serverID, openServerDay, customMaxServerDay, reloadSign))
+ 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:
# 取出本活动所属本服ID的所有配置
- curServerActIpyDataList = __GetOperationActionServerIpyDataList(ipyDataMgr, serverID, actName)
- GameWorld.Log("加载运营活动: actName=%s,可处理条数=%s" % (actName, len(curServerActIpyDataList)))
+ 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, [参数]], ...}
@@ -154,11 +172,25 @@
# 注意：每个活动配置会有多个活动时间点，但是有且只能生效一条活动配置，换句话说就是每个活动配置时间不允许交叉
for ipyData in curServerActIpyDataList:
+ serverGroupIDList = [] if not hasattr(ipyData, "ServerGroupIDList") else ipyData.GetServerGroupIDList()
+ serverGroupIDListExcept = [] if not hasattr(ipyData, "ServerGroupIDListExcept") else ipyData.GetServerGroupIDListExcept()
cfgID = ipyData.GetCfgID()
startDateStr = ipyData.GetStartDate()
endDateStr = ipyData.GetEndDate()
- GameWorld.Log(" cfgID=%s,mark=%s,serverIDList=%s,startDateStr=%s,endDateStr=%s,openServerDay=%s,curDateTime=%s"
- % (cfgID, ipyData.GetActMark(), ipyData.GetServerIDList(), startDateStr, endDateStr, openServerDay, curDateTime))
+ 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)
@@ -171,17 +203,56 @@
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))
+ elif startDateStr.startswith("Mix") and endDateStr.startswith("Mix"):
+ if not isMixServer:
+ GameWorld.Log(" 非合服服务器，不处理! cfgID=%s,%s ~ %s" % (cfgID, startDateStr, endDateStr))
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))
+ startMixServerDay, endMixServerDay = int(startDateStr[3:]), int(endDateStr[3:])
+ #结束日可能还需要处理广播之类，所以这里需要+1
+ if mixServerDay > endMixServerDay + 1:
+ GameWorld.Log(" 当前合服天超过活动结束合服天，不处理! cfgID=%s,%s ~ %s < mixServerDay(%s)" % (cfgID, startDateStr, endDateStr, mixServerDay))
continue
-
+ openServerDateTime = curDateTime + datetime.timedelta(days=(startMixServerDay-mixServerDay))
+ endServerDateTime = curDateTime + datetime.timedelta(days=(endMixServerDay-mixServerDay))
+ 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))
+ 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
+ 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 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()
endHMStrList = ipyData.GetEndTimeList()
@@ -237,9 +308,9 @@
isEnd = (curDateTime == endDayDate)
# 每天按时段开启的，支持多时段
- else:
- if startDayDate <= curDateTime <= endDayDate:
- isEnd = (curDateTime == endDayDate)
+ elif startDayDate <= curDateTime <= endDayDate:
+ isEnd = (curDateTime == endDayDate)
+ if not isEnd:
for hmIndex, startHMStr in enumerate(startHMStrList):
endHMStr = endHMStrList[hmIndex]
# 每天开的, 实际开关时间只取今天的日期； 这里有个问题，全服广播的时间不是今天的, 暂不做支持，之后真有这种需求再说
@@ -351,54 +422,86 @@
return True, OperationActionInfo
-def __GetOperationActionServerIpyDataList(ipyDataMgr, serverID, actName):
+def __GetOperationActionServerIpyDataList(ipyDataMgr, serverGroupID, actName):
## 获取运营活动本服务器对应的配置数据列表
if not hasattr(ipyDataMgr, "Get%sCount" % actName):
GameWorld.ErrLog("没有该运营活动类型对应活动时间表! actName=%s" % actName)
return []
- # 所有配置先按活动标识归组
- platform = GameWorld.GetPlatform()
- actGroupDict = {} # {ActMark:{ServerIDTuple:[ipyData, ...], ...}, ...}
+ curServerActIpyDataList = []
actCfgCount = getattr(ipyDataMgr, "Get%sCount" % actName)()
for cfgIndex in xrange(actCfgCount):
- ipyData = getattr(ipyDataMgr, "Get%sByIndex" % actName)(cfgIndex)
- actMark = ipyData.GetActMark()
- platformList = [] if not hasattr(ipyData, "GetPlatformList") else ipyData.GetPlatformList()
- if platformList and platform not in platformList:
- GameWorld.Log("非本平台活动，不取！platform=%s,platformList=%s,actName=%s,cfgID=%s" % (platform, platformList, actName, ipyData.GetCfgID()))
- continue
- serverIDTuple = tuple(ipyData.GetServerIDList())
+ ipyData = getattr(ipyDataMgr, "Get%sByIndex" % actName)(cfgIndex)
+ serverGroupIDList = [] if not hasattr(ipyData, "ServerGroupIDList") else ipyData.GetServerGroupIDList()
+ serverGroupIDListExcept = [] if not hasattr(ipyData, "ServerGroupIDListExcept") else ipyData.GetServerGroupIDListExcept()
- serverIpyDataDict = actGroupDict.get(actMark, {})
- ipyDataList = serverIpyDataDict.get(serverIDTuple, [])
- ipyDataList.append(ipyData)
- serverIpyDataDict[serverIDTuple] = ipyDataList
- actGroupDict[actMark] = serverIpyDataDict
-
- # 取出所属本服ID的所有配置
- curServerActIpyDataList = []
- for actMark, serverIpyDataDict in actGroupDict.items():
- generalIpyDataList = []
- isGeneral = True
- for serverIDTuple, ipyDataList in serverIpyDataDict.items():
- if not serverIDTuple:
- generalIpyDataList = ipyDataList
- continue
- for serverIDInfo in serverIDTuple:
- if (isinstance(serverIDInfo, int) and serverIDInfo == serverID) \
- or ((isinstance(serverIDInfo, list) or isinstance(serverIDInfo, tuple)) \
- and len(serverIDInfo) == 2 and serverIDInfo[0] <= serverID <= serverIDInfo[1]):
- curServerActIpyDataList += ipyDataList
- isGeneral = False
+ # 排除的服务器组ID列表
+ if serverGroupIDListExcept:
+ isExcept = False
+ for serverGroupIDInfo in serverGroupIDListExcept:
+ if (isinstance(serverGroupIDInfo, int) and serverGroupIDInfo == serverGroupID) \
+ or ((isinstance(serverGroupIDInfo, list) or isinstance(serverGroupIDInfo, tuple)) \
+ and len(serverGroupIDInfo) == 2 and serverGroupIDInfo[0] <= serverGroupID <= serverGroupIDInfo[1]):
+ isExcept = True
break
- if isGeneral:
- curServerActIpyDataList += generalIpyDataList
+ if isExcept:
+ continue
+
+ if not serverGroupIDList:
+ curServerActIpyDataList.append(ipyData)
+ else:
+ for serverGroupIDInfo in serverGroupIDList:
+ if (isinstance(serverGroupIDInfo, int) and serverGroupIDInfo == serverGroupID) \
+ or ((isinstance(serverGroupIDInfo, list) or isinstance(serverGroupIDInfo, tuple)) \
+ and len(serverGroupIDInfo) == 2 and serverGroupIDInfo[0] <= serverGroupID <= serverGroupIDInfo[1]):
+ curServerActIpyDataList.append(ipyData)
+ 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点会强制同步当天的运营活动详情到地图服务器
+
+ if GameWorld.IsCrossServer():
+ # 跨服不处理运营活动
+ return
isReload, OperationActionInfo = __GetOperationActionInfo(False) # 这里必须传False
isReload = isReload or reloadRefresh
@@ -412,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 # 默认关闭
@@ -424,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:
@@ -636,19 +762,21 @@
GameWorld.Log(" 本周定制的开服日常活动ID列表: %s" % (customDailyIDList))
GameWorld.Log(" 今天定制的开服日常表ID列表=%s" % (todayCustomIDList))
elif isMixServer and mixServerDay <= maxCustomServerDayMix:
- customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("DailyActionCustomMix", mixServerDay)
- if not customIpyDataList:
- customIpyDataList = []
- GameWorld.Log(" 今天定制的合服日常活动条数: %s" % len(customIpyDataList))
- for customIpyData in customIpyDataList:
+ todayCustomIDList = [] # 今天定制的数据表ID
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for i in xrange(ipyDataMgr.GetDailyActionCustomMixCount()):
+ customIpyData = ipyDataMgr.GetDailyActionCustomMixByIndex(i)
dataID = customIpyData.GetID()
dailyID = customIpyData.GetDailyID()
if dailyID not in customDailyIDList:
customDailyIDList.append(dailyID)
- customType = 2
- dailyTimeInfoList.append([customType, customIpyData.GetOpenTimeList(), customIpyData])
- GameWorld.Log(" 增加本日合服日常活动信息: customType=%s,dailyID=%s,dataID=%s" % (customType, dailyID, dataID))
- GameWorld.Log(" 今天定制的合服日常活动ID列表: %s" % (customDailyIDList))
+ if customIpyData.GetMixServerDay() == mixServerDay:
+ todayCustomIDList.append(dataID)
+ customType = 2
+ dailyTimeInfoList.append([customType, customIpyData.GetOpenTimeList(), customIpyData])
+ GameWorld.Log(" 增加本日合服日常活动信息: customType=%s,dailyID=%s,dataID=%s" % (customType, dailyID, dataID))
+ GameWorld.Log(" 定制的合服日常活动ID列表: %s" % (customDailyIDList))
+ GameWorld.Log(" 今天定制的合服日常表ID列表=%s" % (todayCustomIDList))
else:
GameWorld.Log(" 超过最大定制开服天，不定制，走常规日常配置！")
@@ -768,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
@@ -776,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
@@ -936,19 +1066,21 @@
GameWorld.Log(" 本周定制的开服副本地图列表: %s" % (customMapIDList))
GameWorld.Log(" 今天定制的开服副本表ID列表=%s" % (todayCustomIDList))
elif isMixServer and mixServerDay <= maxCustomServerDayMix:
- customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("FBStateTimeCustomMix", mixServerDay)
- if not customIpyDataList:
- customIpyDataList = []
- GameWorld.Log(" 本日定制的合服副本活动条数: %s" % len(customIpyDataList))
- for customIpyData in customIpyDataList:
+ todayCustomIDList = [] # 今天定制的数据表ID
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for i in xrange(ipyDataMgr.GetFBStateTimeCustomMixCount()):
+ customIpyData = ipyDataMgr.GetFBStateTimeCustomMixByIndex(i)
dataID = customIpyData.GetID()
dataMapID = customIpyData.GetDataMapID()
if dataMapID not in customMapIDList:
customMapIDList.append(dataMapID)
- customType, startWeekDay, endWeekDay = 2, curWeekDay, curWeekDay
- fbStateTimeInfoList.append([customType, startWeekDay, endWeekDay, customIpyData])
- GameWorld.Log(" 今天要处理的合服副本状态配置: customType=%s,dataID=%s" % (customType, dataID))
- GameWorld.Log(" 本日定制的合服副本地图列表: %s" % (customMapIDList))
+ if customIpyData.GetMixServerDay() == mixServerDay:
+ todayCustomIDList.append(dataID)
+ customType, startWeekDay, endWeekDay = 2, curWeekDay, curWeekDay
+ fbStateTimeInfoList.append([customType, startWeekDay, endWeekDay, customIpyData])
+ GameWorld.Log(" 今天要处理的合服副本状态配置: customType=%s,dataID=%s" % (customType, dataID))
+ GameWorld.Log(" 定制的合服副本地图列表: %s" % (customMapIDList))
+ GameWorld.Log(" 今天定制的合服副本表ID列表=%s" % (todayCustomIDList))
else:
GameWorld.Log(" 超过最大定制开服天，不定制，走常规副本状态时间！")
@@ -1065,11 +1197,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))
@@ -1215,12 +1348,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)
@@ -1236,6 +1370,13 @@
#跨服PK
elif dictName == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_CrossReamPK:
CrossRealmPK.OnCrossRealmPKDailyActionStateChange(isOpen)
+ #仙盟BOSS
+ elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1]:
+ PlayerFamilyBoss.OnAllFamilyBossStateChange(isOpen)
+ #骑宠BOSS
+ elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_HorsePetBoss]:
+ PlayerHorsePetBoss.OnHorsePetBossStateChange(isOpen)
+
return
#-------------------------------------------------------------------------------
--
Gitblit v1.8.0