From f4c96f50734c9afe6f8e69a232df73812c1b8f96 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 21 九月 2018 17:19:43 +0800
Subject: [PATCH] 1994 【BUG】【主干】开服限时活动错误（日常及副本）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 113 ++++++++++++++++++++++++++++++-------
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 4
PySysDB/PySysDBG.h | 4
3 files changed, 94 insertions(+), 27 deletions(-)
diff --git a/PySysDB/PySysDBG.h b/PySysDB/PySysDBG.h
index 33f408c..7e919ba 100644
--- a/PySysDB/PySysDBG.h
+++ b/PySysDB/PySysDBG.h
@@ -75,7 +75,7 @@
{
DWORD ID; //ID
BYTE _OpenServerWeek; //开服是周几
- DWORD _OpenServerDay; //开服第几天
+ DWORD OpenServerDay; //开服第几天
BYTE DailyID; //日常活动ID
list OpenTimeList; //开启时间列表
DWORD Duration; //持续时间, 0为不限制
@@ -104,7 +104,7 @@
{
DWORD ID; //ID
BYTE _OpenServerWeek; //开服是周几
- DWORD _OpenServerDay; //开服第几天
+ DWORD OpenServerDay; //开服第几天
DWORD DataMapID; //所属的玩法数据地图ID
BYTE StartHour; //开始时
BYTE StartMinute; //开始分
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 46d63f1..2da65a4 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -48,6 +48,8 @@
import time
#---------------------------------------------------------------------
+MaxCustomServerDay = 14 # 最大定制开服天数
+
#年月日时间格式
Time_YmdFormat = ChConfig.TYPE_Time_YmdFormat
@@ -125,7 +127,7 @@
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)
- customMaxServerDay = 14 # 定制运营活动最大开服天
+ customMaxServerDay = MaxCustomServerDay # 定制运营活动最大开服天
operationActionDict = {}
mapServerOperationActionDict = {}
serverID = GameWorld.GetServerID()
@@ -544,22 +546,37 @@
curDateStr = GameWorld.ChangeTimeNumToStr(curTime, ChConfig.TYPE_Time_YmdFormat) # 当天日期
openServerWeekday = GameWorldProcess.GetOpenServerWeekday() # 服务器开服时是星期几
- GameWorld.Log("加载本日日常活动信息: %s, 当前星期%s,开服第%s天,开服是星期%s" % (curDateStr, weekDay, openServerDay, openServerWeekday))
+ curMaxCustomServerDay = MaxCustomServerDay - openServerWeekday + 1 # 最大有效定制开服天
+ GameWorld.Log("===== 加载今天日常活动信息 =====")
+ GameWorld.Log(" 开服是星期%s, 开服第%s天, 当前星期%s" % (openServerWeekday, openServerDay, weekDay))
+ GameWorld.Log(" 最大有效定制开服天: %s" % (curMaxCustomServerDay))
customDailyIDList = []
dailyTimeInfoList = []
- customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("DailyActionCustom", openServerWeekday, openServerDay)
- if customIpyDataList:
+ # 暂固定前2周定制有效, 为方便GM命令测试，这里用开服天做判断，不用开服周
+ if openServerDay <= curMaxCustomServerDay:
+ customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("DailyActionCustom", openServerWeekday)
+ GameWorld.Log(" 本周定制的日常活动条数: %s" % len(customIpyDataList))
customIDList = []
+ todayCustomIDList = []
for customIpyData in customIpyDataList:
dataID = customIpyData.GetID()
dailyID = customIpyData.GetDailyID()
if dailyID not in customDailyIDList:
customDailyIDList.append(dailyID)
- dailyTimeInfoList.append([True, customIpyData.GetOpenTimeList(), customIpyData])
customIDList.append(dataID)
- GameWorld.Log(" 本地定制日常活动条数: %s, 配置表ID列表=%s, 定制活动ID列表=%s" % (len(customIpyDataList), customIDList, customDailyIDList))
+ if customIpyData.GetOpenServerDay() == openServerDay:
+ todayCustomIDList.append(dataID)
+ isCustom = True
+ dailyTimeInfoList.append([isCustom, customIpyData.GetOpenTimeList(), customIpyData])
+ GameWorld.Log(" 增加本日日常活动信息: isCustom=%s,dailyID=%s,dataID=%s" % (isCustom, dailyID, dataID))
+ GameWorld.Log(" 本周定制的日常配置表ID列表: %s" % (customIDList))
+ GameWorld.Log(" 本周定制的日常活动ID列表: %s" % (customDailyIDList))
+ GameWorld.Log(" 今天定制的日常表ID列表=%s" % (todayCustomIDList))
+ else:
+ GameWorld.Log(" 超过最大定制开服天，不定制，走常规日常配置！")
+ GameWorld.Log(" 处理常规日常活动配置")
ipyDataMgr = IpyGameDataPY.IPY_Data()
dailyActionCount = ipyDataMgr.GetDailyActionCount()
for i in xrange(dailyActionCount):
@@ -626,6 +643,7 @@
TodayDailyActionInfo = IpyGameDataPY.SetConfigEx(key, [openServerDay, todayActionInfo])
GameWorld.Log("本日日常活动信息加载完毕!")
+ GameWorld.Log("=============================================================")
return TodayDailyActionInfo[1]
def Dispose_DailyActionState():
@@ -763,53 +781,102 @@
GameWorld.Log(" 不需要重置的定制ID: %s" % FBStateEndTimeNotResetCustomIDList)
return notResetIDList
-def Dispose_FBStateTime():
- ## 副本状态时间表状态处理, 支持 goon作用，开关服状态不受影响，服务器重新启动会自动变更为所有时间段的状态值
+def __GetTodayFBStateTimeInfo():
+ key = "TodayFBStateTimeInfo"
+ openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
+ TodayFBStateTimeInfo = IpyGameDataPY.GetConfigEx(key)
+ if TodayFBStateTimeInfo and TodayFBStateTimeInfo[0] == openServerDay:
+ #GameWorld.DebugLog("已经加载过本日副本状态处理信息！openServerDay=%s" % openServerDay)
+ return TodayFBStateTimeInfo[1]
- FBStateEndTimeNotResetIDList, FBStateEndTimeNotResetCustomIDList = __GetFBStateEndTimeNotResetIDList()
openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
curDateTime = GameWorld.GetServerTime()
curWeekDay, curHour, curMinute = curDateTime.weekday() + 1, curDateTime.hour, curDateTime.minute
- curTimeWHM = curWeekDay * 10000 + curHour * 100 + curMinute
openServerWeekday = GameWorldProcess.GetOpenServerWeekday() # 服务器开服时是星期几
- GameWorld.DebugLog("副本状态时间表状态处理...开服是星期%s,开服第%s天, 当前星期%s,%s点%s分"
- % (openServerWeekday, openServerDay, curWeekDay, curHour, curMinute))
- GameWorld.DebugLog(" FBStateEndTimeNotResetIDList=%s" % (FBStateEndTimeNotResetIDList))
- GameWorld.DebugLog(" FBStateEndTimeNotResetCustomIDList=%s" % (FBStateEndTimeNotResetCustomIDList))
+ if openServerWeekday <= 0:
+ GameWorld.ErrLog("获取开服是星期几数据错误！openServerWeekday=%s" % openServerWeekday)
+ return []
- gameWorld = GameWorld.GetGameWorld()
+ curMaxCustomServerDay = MaxCustomServerDay - openServerWeekday + 1 # 最大有效定制开服天
+ GameWorld.Log("===== 加载今天副本状态时间表 =====")
+ GameWorld.Log(" 开服是星期%s, 开服第%s天, 当前星期%s,%s点%s分 ！" % (openServerWeekday, openServerDay, curWeekDay, curHour, curMinute))
+ GameWorld.Log(" 最大有效定制开服天: %s" % (curMaxCustomServerDay))
+
ipyDataMgr = IpyGameDataPY.IPY_Data()
- customMapIDList = []
+ customMapIDList = [] # 本周有定制的副本数据地图ID列表
fbStateTimeInfoList = []
- customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("FBStateTimeCustom", openServerWeekday, openServerDay)
- if customIpyDataList:
- customIDList = []
+ # 暂固定前2周定制有效, 为方便GM命令测试，这里用开服天做判断，不用开服周
+ if openServerDay <= curMaxCustomServerDay:
+ customIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("FBStateTimeCustom", openServerWeekday)
+ GameWorld.Log(" 本周定制的副本活动条数: %s" % len(customIpyDataList))
+ customIDList = [] # 本周定制的数据表ID
+ todayCustomIDList = [] # 今天定制的数据表ID
for customIpyData in customIpyDataList:
dataID = customIpyData.GetID()
dataMapID = customIpyData.GetDataMapID()
if dataMapID not in customMapIDList:
customMapIDList.append(dataMapID)
- isCustom, startWeekDay, endWeekDay = True, curWeekDay, curWeekDay
- fbStateTimeInfoList.append([isCustom, startWeekDay, endWeekDay, customIpyData])
customIDList.append(dataID)
- GameWorld.DebugLog(" 定制副本活动条数: %s, 配置表ID列表=%s" % (len(customIpyDataList), customIDList))
+ if customIpyData.GetOpenServerDay() == openServerDay:
+ todayCustomIDList.append(dataID)
+ isCustom, startWeekDay, endWeekDay = True, curWeekDay, curWeekDay
+ fbStateTimeInfoList.append([isCustom, startWeekDay, endWeekDay, customIpyData])
+ GameWorld.Log(" 今天要处理的副本状态配置: 是否定制=%s,dataID=%s" % (isCustom, dataID))
+ GameWorld.Log(" 本周定制的配置表ID列表: %s" % (customIDList))
+ GameWorld.Log(" 本周定制的副本地图列表: %s" % (customMapIDList))
+ GameWorld.Log(" 今天定制的表ID列表=%s" % (todayCustomIDList))
+ else:
+ GameWorld.Log(" 超过最大定制开服天，不定制，走常规副本状态时间！")
+ GameWorld.Log(" 处理常规副本状态时间配置")
for i in xrange(ipyDataMgr.GetFBStateTimeCount()):
fbStateTimeIpyData = ipyDataMgr.GetFBStateTimeByIndex(i)
dataID = fbStateTimeIpyData.GetID()
dataMapID = fbStateTimeIpyData.GetDataMapID()
# 是当天开服天定制活动的不处理常规活动
if dataMapID in customMapIDList:
+ GameWorld.Log(" dataID=%s,dataMapID=%s, 在本周定制的副本地图列表里,不处理！" % (dataID, dataMapID))
continue
+ # 暂不支持跨天的活动
isCustom, startWeekDay, endWeekDay = False, fbStateTimeIpyData.GetStartWeekday(), fbStateTimeIpyData.GetStartWeekday()
+ if curWeekDay != startWeekDay:
+ GameWorld.Log(" dataID=%s,dataMapID=%s, 不是本天的副本活动,不处理！curWeekDay=%s,startWeekDay=%s"
+ % (dataID, dataMapID, curWeekDay, startWeekDay))
+ continue
fbStateTimeInfoList.append([isCustom, startWeekDay, endWeekDay, fbStateTimeIpyData])
+ GameWorld.Log(" 今天要处理的副本状态配置: 是否定制=%s,dataID=%s" % (isCustom, dataID))
+ TodayFBStateTimeInfo = IpyGameDataPY.SetConfigEx(key, [openServerDay, fbStateTimeInfoList])
+ GameWorld.Log("本日副本活动状态信息加载完毕!")
+ GameWorld.Log("=============================================================")
+ return TodayFBStateTimeInfo[1]
+
+def Dispose_FBStateTime():
+ ## 副本状态时间表状态处理, 支持 goon作用，开关服状态不受影响，服务器重新启动会自动变更为所有时间段的状态值
+
+
+ FBStateEndTimeNotResetIDList, FBStateEndTimeNotResetCustomIDList = __GetFBStateEndTimeNotResetIDList()
+ openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
+ curDateTime = GameWorld.GetServerTime()
+ curWeekDay, curHour, curMinute = curDateTime.weekday() + 1, curDateTime.hour, curDateTime.minute
+
+ curTimeWHM = curWeekDay * 10000 + curHour * 100 + curMinute
+
+ openServerWeekday = GameWorldProcess.GetOpenServerWeekday() # 服务器开服时是星期几
+ GameWorld.DebugLog("副本状态时间表状态处理...开服是星期%s, 开服第%s天, 当前星期%s,%s点%s分"
+ % (openServerWeekday, openServerDay, curWeekDay, curHour, curMinute))
+ GameWorld.DebugLog(" FBStateEndTimeNotResetIDList=%s" % (FBStateEndTimeNotResetIDList))
+ GameWorld.DebugLog(" FBStateEndTimeNotResetCustomIDList=%s" % (FBStateEndTimeNotResetCustomIDList))
+
+ gameWorld = GameWorld.GetGameWorld()
+ fbStateTimeInfoList = __GetTodayFBStateTimeInfo()
+
for isCustom, startWeekDay, endWeekDay, ipyData in fbStateTimeInfoList:
dataID = ipyData.GetID()
dataMapID = ipyData.GetDataMapID()
-
+ GameWorld.DebugLog(" isCustom=%s,dataID=%s,dataMapID=%s" % (isCustom, dataID, dataMapID))
startHour, startMinute = ipyData.GetStartHour(), ipyData.GetStartMinute()
endHour, endMinute = ipyData.GetEndHour(), ipyData.GetEndMinute()
# 星期配置0代表每天
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 1546ef5..4ae0037 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -88,7 +88,7 @@
"DailyActionCustom":(
("DWORD", "ID", 0),
("BYTE", "OpenServerWeek", 1),
- ("DWORD", "OpenServerDay", 1),
+ ("DWORD", "OpenServerDay", 0),
("BYTE", "DailyID", 0),
("list", "OpenTimeList", 0),
("DWORD", "Duration", 0),
@@ -111,7 +111,7 @@
"FBStateTimeCustom":(
("DWORD", "ID", 0),
("BYTE", "OpenServerWeek", 1),
- ("DWORD", "OpenServerDay", 1),
+ ("DWORD", "OpenServerDay", 0),
("DWORD", "DataMapID", 0),
("BYTE", "StartHour", 0),
("BYTE", "StartMinute", 0),
--
Gitblit v1.8.0