From 7d7da6a8246577a11c38219eaedb451178769ec8 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 14 九月 2018 17:15:52 +0800 Subject: [PATCH] 3494 【后端】开服前14天运营活动定制 3443 【后端】Boss复活活动,时间段支持日期跨天或日期支持重置时间点设置(如0点或5点) 1972 【后端】运营活动支持循环广播 --- ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 51 +++++++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py index 75e262c..1546ef5 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py @@ -183,32 +183,32 @@ ("DWORD", "CfgID", 1), ("char", "ActMark", 0), ("list", "ServerIDList", 0), - ("BYTE", "OpenServerDayLimit", 0), ("char", "StartDate", 0), ("char", "EndDate", 0), ("list", "StartTimeList", 0), ("list", "EndTimeList", 0), + ("WORD", "AdvanceMinutes", 0), ("dict", "NotifyInfoStart", 0), ("dict", "NotifyInfoEnd", 0), + ("list", "NotifyInfoLoop", 0), ("WORD", "LVLimit", 0), ("BYTE", "IsDayReset", 0), - ("list", "ShopTypeList", 0), ), "ActFlashGiftbag":( ("DWORD", "CfgID", 1), ("char", "ActMark", 0), ("list", "ServerIDList", 0), - ("BYTE", "OpenServerDayLimit", 0), ("char", "StartDate", 0), ("char", "EndDate", 0), ("list", "StartTimeList", 0), ("list", "EndTimeList", 0), + ("WORD", "AdvanceMinutes", 0), ("dict", "NotifyInfoStart", 0), ("dict", "NotifyInfoEnd", 0), + ("list", "NotifyInfoLoop", 0), ("WORD", "LVLimit", 0), ("BYTE", "IsDayReset", 0), - ("list", "GiftbagTypeList", 0), ), "ActExpRate":( @@ -233,9 +233,8 @@ ("char", "EndDate", 0), ("dict", "NotifyInfoStart", 0), ("dict", "NotifyInfoEnd", 0), - ("WORD", "LVLimit", 0), + ("list", "NotifyInfoLoop", 0), ("BYTE", "IsDayReset", 0), - ("list", "TemplateIDList", 0), ), "ActBossReborn":( @@ -244,6 +243,7 @@ ("list", "ServerIDList", 0), ("char", "StartDate", 0), ("char", "EndDate", 0), + ("BYTE", "ResetType", 0), ("dict", "NotifyInfoStart", 0), ("dict", "NotifyInfoEnd", 0), ("WORD", "LVLimit", 0), @@ -273,6 +273,7 @@ ("list", "ServerIDList", 0), ("char", "StartDate", 0), ("char", "EndDate", 0), + ("BYTE", "ResetType", 0), ("dict", "NotifyInfoStart", 0), ("dict", "NotifyInfoEnd", 0), ("WORD", "Multiple", 0), @@ -599,31 +600,31 @@ self.CfgID = 0 self.ActMark = "" self.ServerIDList = [] - self.OpenServerDayLimit = 0 self.StartDate = "" self.EndDate = "" self.StartTimeList = [] self.EndTimeList = [] + self.AdvanceMinutes = 0 self.NotifyInfoStart = {} self.NotifyInfoEnd = {} + self.NotifyInfoLoop = [] self.LVLimit = 0 - self.IsDayReset = 0 - self.ShopTypeList = [] + self.IsDayReset = 0 return def GetCfgID(self): return self.CfgID # 配置ID def GetActMark(self): return self.ActMark # 活动组标记 def GetServerIDList(self): return self.ServerIDList # 服务器ID列表 - def GetOpenServerDayLimit(self): return self.OpenServerDayLimit # 开服X天后有效 def GetStartDate(self): return self.StartDate # 开启日期 def GetEndDate(self): return self.EndDate # 结束日期 def GetStartTimeList(self): return self.StartTimeList # 开启时间列表, 支持多个时段 def GetEndTimeList(self): return self.EndTimeList # 结束时间列表, 支持多个时段 + def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动 def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间 def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间 + def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key] def GetLVLimit(self): return self.LVLimit # 限制等级 - def GetIsDayReset(self): return self.IsDayReset # 是否每天重置 - def GetShopTypeList(self): return self.ShopTypeList # 商店类型列表 + def GetIsDayReset(self): return self.IsDayReset # 是否每天重置 # 限时礼包表 class IPY_ActFlashGiftbag(): @@ -632,31 +633,31 @@ self.CfgID = 0 self.ActMark = "" self.ServerIDList = [] - self.OpenServerDayLimit = 0 self.StartDate = "" self.EndDate = "" self.StartTimeList = [] self.EndTimeList = [] + self.AdvanceMinutes = 0 self.NotifyInfoStart = {} self.NotifyInfoEnd = {} + self.NotifyInfoLoop = [] self.LVLimit = 0 - self.IsDayReset = 0 - self.GiftbagTypeList = [] + self.IsDayReset = 0 return def GetCfgID(self): return self.CfgID # 配置ID def GetActMark(self): return self.ActMark # 活动组标记 def GetServerIDList(self): return self.ServerIDList # 服务器ID列表 - def GetOpenServerDayLimit(self): return self.OpenServerDayLimit # 开服X天后有效 def GetStartDate(self): return self.StartDate # 开启日期 def GetEndDate(self): return self.EndDate # 结束日期 def GetStartTimeList(self): return self.StartTimeList # 开启时间列表, 支持多个时段 def GetEndTimeList(self): return self.EndTimeList # 结束时间列表, 支持多个时段 + def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动 def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间 def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间 + def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key] def GetLVLimit(self): return self.LVLimit # 限制等级 - def GetIsDayReset(self): return self.IsDayReset # 是否每天重置 - def GetGiftbagTypeList(self): return self.GiftbagTypeList # 礼包类型列表 + def GetIsDayReset(self): return self.IsDayReset # 是否每天重置 # 双倍经验活动表 class IPY_ActExpRate(): @@ -698,9 +699,8 @@ self.EndDate = "" self.NotifyInfoStart = {} self.NotifyInfoEnd = {} - self.LVLimit = 0 - self.IsDayReset = 0 - self.TemplateIDList = [] + self.NotifyInfoLoop = [] + self.IsDayReset = 0 return def GetCfgID(self): return self.CfgID # 配置ID @@ -710,9 +710,8 @@ def GetEndDate(self): return self.EndDate # 结束日期 def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间 def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间 - def GetLVLimit(self): return self.LVLimit # 限制等级 - def GetIsDayReset(self): return self.IsDayReset # 是否每天重置 - def GetTemplateIDList(self): return self.TemplateIDList # 模板ID列表 + def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key] + def GetIsDayReset(self): return self.IsDayReset # 是否每天重置 # BOSS复活活动时间表 class IPY_ActBossReborn(): @@ -723,6 +722,7 @@ self.ServerIDList = [] self.StartDate = "" self.EndDate = "" + self.ResetType = 0 self.NotifyInfoStart = {} self.NotifyInfoEnd = {} self.LVLimit = 0 @@ -734,6 +734,7 @@ def GetServerIDList(self): return self.ServerIDList # 服务器ID列表 def GetStartDate(self): return self.StartDate # 开启日期 def GetEndDate(self): return self.EndDate # 结束日期 + def GetResetType(self): return self.ResetType # 重置类型,0-0点重置;1-5点重置 def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间 def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间 def GetLVLimit(self): return self.LVLimit # 限制等级 @@ -784,6 +785,7 @@ self.ServerIDList = [] self.StartDate = "" self.EndDate = "" + self.ResetType = 0 self.NotifyInfoStart = {} self.NotifyInfoEnd = {} self.Multiple = 0 @@ -795,6 +797,7 @@ def GetServerIDList(self): return self.ServerIDList # 服务器ID列表 def GetStartDate(self): return self.StartDate # 开启日期 def GetEndDate(self): return self.EndDate # 结束日期 + def GetResetType(self): return self.ResetType # 重置类型,0-0点重置;1-5点重置 def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间 def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间 def GetMultiple(self): return self.Multiple # 倍数 -- Gitblit v1.8.0