From a6fb3fc9fdf49158dc86870d99f113460d66b9b6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 28 十二月 2020 10:38:00 +0800
Subject: [PATCH] 8681 【BT】【主干】【后端】宝箱展示支持多连开

---
 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py |  325 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 284 insertions(+), 41 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 4409089..1ea80b1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -229,7 +229,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("BYTE", "IsDayReset", 0),
@@ -280,7 +280,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("list", "StartTimeList", 0),
@@ -297,7 +297,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("list", "StartTimeList", 0),
@@ -308,6 +308,15 @@
                         ("list", "NotifyInfoLoop", 0),
                         ("WORD", "LVLimit", 0),
                         ("BYTE", "IsDayReset", 0),
+                        ),
+
+                "ActDailyGiftbag":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerGroupIDList", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
                         ),
 
                 "ActExpRate":(
@@ -329,13 +338,37 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("dict", "NotifyInfoStart", 0),
                         ("dict", "NotifyInfoEnd", 0),
                         ("list", "NotifyInfoLoop", 0),
                         ("BYTE", "IsDayReset", 0),
+                        ),
+
+                "ActCollectWords":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerGroupIDList", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("dict", "NotifyInfoStart", 0),
+                        ("dict", "NotifyInfoEnd", 0),
+                        ("list", "NotifyInfoLoop", 0),
+                        ),
+
+                "ActCollectWords2":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerGroupIDList", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("dict", "NotifyInfoStart", 0),
+                        ("dict", "NotifyInfoEnd", 0),
+                        ("list", "NotifyInfoLoop", 0),
                         ),
 
                 "ActBossReborn":(
@@ -355,7 +388,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("BYTE", "ResetType", 0),
@@ -374,7 +407,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("BYTE", "ResetType", 0),
@@ -389,7 +422,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("list", "StartTimeList", 0),
@@ -424,11 +457,49 @@
                         ("WORD", "LVLimit", 0),
                         ),
 
+                "ActRechargePrize":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerGroupIDList", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("dict", "NotifyInfoStart", 0),
+                        ("dict", "NotifyInfoEnd", 0),
+                        ("list", "NotifyInfoLoop", 0),
+                        ("BYTE", "IsDayReset", 0),
+                        ),
+
+                "ActGrowupBuy":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerGroupIDList", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("dict", "NotifyInfoStart", 0),
+                        ("dict", "NotifyInfoEnd", 0),
+                        ("list", "NotifyInfoLoop", 0),
+                        ),
+
                 "ActTotalRecharge":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("dict", "NotifyInfoStart", 0),
+                        ("dict", "NotifyInfoEnd", 0),
+                        ("list", "NotifyInfoLoop", 0),
+                        ("BYTE", "IsDayReset", 0),
+                        ),
+
+                "ActTotalRecharge2":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("dict", "NotifyInfoStart", 0),
@@ -478,7 +549,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("WORD", "AdvanceMinutes", 0),
@@ -493,7 +564,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("WORD", "AdvanceMinutes", 0),
@@ -509,7 +580,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("WORD", "AdvanceMinutes", 0),
@@ -524,7 +595,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("BYTE", "ResetType", 0),
@@ -543,7 +614,7 @@
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
                         ("list", "PlatformList", 0),
-                        ("list", "ServerIDList", 0),
+                        ("list", "ServerGroupIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
                         ("BYTE", "ResetType", 0),
@@ -996,7 +1067,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.IsDayReset = 0
@@ -1008,7 +1079,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
@@ -1103,7 +1174,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.StartTimeList = []
@@ -1119,7 +1190,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetStartTimeList(self): return self.StartTimeList # 开启时间列表, 支持多个时段
@@ -1138,7 +1209,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.StartTimeList = []
@@ -1154,7 +1225,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetStartTimeList(self): return self.StartTimeList # 开启时间列表, 支持多个时段
@@ -1165,6 +1236,25 @@
     def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
     def GetLVLimit(self): return self.LVLimit # 限制等级
     def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+
+# 每日礼包表
+class IPY_ActDailyGiftbag():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.ActMark = ""
+        self.PlatformList = []
+        self.ServerGroupIDList = []
+        self.StartDate = ""
+        self.EndDate = ""
+        return
+        
+    def GetCfgID(self): return self.CfgID # 配置ID
+    def GetActMark(self): return self.ActMark # 活动组标记
+    def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
 
 # 双倍经验活动表
 class IPY_ActExpRate():
@@ -1204,7 +1294,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.NotifyInfoStart = {}
@@ -1216,13 +1306,63 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
     def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
     def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
     def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+
+# 集字活动时间表
+class IPY_ActCollectWords():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.ActMark = ""
+        self.PlatformList = []
+        self.ServerGroupIDList = []
+        self.StartDate = ""
+        self.EndDate = ""
+        self.NotifyInfoStart = {}
+        self.NotifyInfoEnd = {}
+        self.NotifyInfoLoop = []
+        return
+        
+    def GetCfgID(self): return self.CfgID # 配置ID
+    def GetActMark(self): return self.ActMark # 活动组标记
+    def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+    def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
+    def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+    def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
+
+# 集字活动时间表2
+class IPY_ActCollectWords2():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.ActMark = ""
+        self.PlatformList = []
+        self.ServerGroupIDList = []
+        self.StartDate = ""
+        self.EndDate = ""
+        self.NotifyInfoStart = {}
+        self.NotifyInfoEnd = {}
+        self.NotifyInfoLoop = []
+        return
+        
+    def GetCfgID(self): return self.CfgID # 配置ID
+    def GetActMark(self): return self.ActMark # 活动组标记
+    def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+    def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
+    def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+    def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
 
 # BOSS复活活动时间表
 class IPY_ActBossReborn():
@@ -1258,7 +1398,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.ResetType = 0
@@ -1270,7 +1410,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetResetType(self): return self.ResetType # 重置类型,0-0点重置;1-5点重置;2-5点开始0点结束
@@ -1298,7 +1438,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.ResetType = 0
@@ -1312,7 +1452,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetResetType(self): return self.ResetType # 重置类型,0-0点重置;1-5点重置
@@ -1329,7 +1469,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.StartTimeList = []
@@ -1346,7 +1486,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetStartTimeList(self): return self.StartTimeList # 开启时间列表, 支持多个时段
@@ -1403,14 +1543,14 @@
     def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
     def GetLVLimit(self): return self.LVLimit # 限制等级
 
-# 累计充值活动表
-class IPY_ActTotalRecharge():
+# 充值返利活动表
+class IPY_ActRechargePrize():
     
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.NotifyInfoStart = {}
@@ -1422,7 +1562,86 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+    def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
+    def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+    def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
+    def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+
+# 成长必买活动表
+class IPY_ActGrowupBuy():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.ActMark = ""
+        self.PlatformList = []
+        self.ServerGroupIDList = []
+        self.StartDate = ""
+        self.EndDate = ""
+        self.NotifyInfoStart = {}
+        self.NotifyInfoEnd = {}
+        self.NotifyInfoLoop = []
+        return
+        
+    def GetCfgID(self): return self.CfgID # 配置ID
+    def GetActMark(self): return self.ActMark # 活动组标记
+    def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+    def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
+    def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+    def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
+
+# 累计充值活动表
+class IPY_ActTotalRecharge():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.ActMark = ""
+        self.PlatformList = []
+        self.ServerGroupIDList = []
+        self.StartDate = ""
+        self.EndDate = ""
+        self.NotifyInfoStart = {}
+        self.NotifyInfoEnd = {}
+        self.NotifyInfoLoop = []
+        self.IsDayReset = 0
+        return
+        
+    def GetCfgID(self): return self.CfgID # 配置ID
+    def GetActMark(self): return self.ActMark # 活动组标记
+    def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+    def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
+    def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+    def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
+    def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+
+# 累计充值活动表2
+class IPY_ActTotalRecharge2():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.ActMark = ""
+        self.PlatformList = []
+        self.ServerGroupIDList = []
+        self.StartDate = ""
+        self.EndDate = ""
+        self.NotifyInfoStart = {}
+        self.NotifyInfoEnd = {}
+        self.NotifyInfoLoop = []
+        self.IsDayReset = 0
+        return
+        
+    def GetCfgID(self): return self.CfgID # 配置ID
+    def GetActMark(self): return self.ActMark # 活动组标记
+    def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
@@ -1516,7 +1735,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.AdvanceMinutes = 0
@@ -1530,7 +1749,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动
@@ -1547,7 +1766,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.AdvanceMinutes = 0
@@ -1562,7 +1781,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动
@@ -1580,7 +1799,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.AdvanceMinutes = 0
@@ -1594,7 +1813,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动
@@ -1611,7 +1830,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.ResetType = 0
@@ -1623,7 +1842,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetResetType(self): return self.ResetType # 重置类型,0-0点重置;1-5点重置;2-5点开始0点结束
@@ -1651,7 +1870,7 @@
         self.CfgID = 0
         self.ActMark = ""
         self.PlatformList = []
-        self.ServerIDList = []
+        self.ServerGroupIDList = []
         self.StartDate = ""
         self.EndDate = ""
         self.ResetType = 0
@@ -1664,7 +1883,7 @@
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetActMark(self): return self.ActMark # 活动组标记
     def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
-    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
     def GetResetType(self): return self.ResetType # 重置类型,0-0点重置;1-5点重置
@@ -1811,10 +2030,16 @@
         self.ipyActSpringSaleLen = len(self.ipyActSpringSaleCache)
         self.ipyActFlashGiftbagCache = self.__LoadFileData("ActFlashGiftbag", IPY_ActFlashGiftbag)
         self.ipyActFlashGiftbagLen = len(self.ipyActFlashGiftbagCache)
+        self.ipyActDailyGiftbagCache = self.__LoadFileData("ActDailyGiftbag", IPY_ActDailyGiftbag)
+        self.ipyActDailyGiftbagLen = len(self.ipyActDailyGiftbagCache)
         self.ipyActExpRateCache = self.__LoadFileData("ActExpRate", IPY_ActExpRate)
         self.ipyActExpRateLen = len(self.ipyActExpRateCache)
         self.ipyActCostRebateCache = self.__LoadFileData("ActCostRebate", IPY_ActCostRebate)
         self.ipyActCostRebateLen = len(self.ipyActCostRebateCache)
+        self.ipyActCollectWordsCache = self.__LoadFileData("ActCollectWords", IPY_ActCollectWords)
+        self.ipyActCollectWordsLen = len(self.ipyActCollectWordsCache)
+        self.ipyActCollectWords2Cache = self.__LoadFileData("ActCollectWords2", IPY_ActCollectWords2)
+        self.ipyActCollectWords2Len = len(self.ipyActCollectWords2Cache)
         self.ipyActBossRebornCache = self.__LoadFileData("ActBossReborn", IPY_ActBossReborn)
         self.ipyActBossRebornLen = len(self.ipyActBossRebornCache)
         self.ipyActFairyCeremonyCache = self.__LoadFileData("ActFairyCeremony", IPY_ActFairyCeremony)
@@ -1829,8 +2054,14 @@
         self.ipyStoreLen = len(self.ipyStoreCache)
         self.ipyActWishingWellCache = self.__LoadFileData("ActWishingWell", IPY_ActWishingWell)
         self.ipyActWishingWellLen = len(self.ipyActWishingWellCache)
+        self.ipyActRechargePrizeCache = self.__LoadFileData("ActRechargePrize", IPY_ActRechargePrize)
+        self.ipyActRechargePrizeLen = len(self.ipyActRechargePrizeCache)
+        self.ipyActGrowupBuyCache = self.__LoadFileData("ActGrowupBuy", IPY_ActGrowupBuy)
+        self.ipyActGrowupBuyLen = len(self.ipyActGrowupBuyCache)
         self.ipyActTotalRechargeCache = self.__LoadFileData("ActTotalRecharge", IPY_ActTotalRecharge)
         self.ipyActTotalRechargeLen = len(self.ipyActTotalRechargeCache)
+        self.ipyActTotalRecharge2Cache = self.__LoadFileData("ActTotalRecharge2", IPY_ActTotalRecharge2)
+        self.ipyActTotalRecharge2Len = len(self.ipyActTotalRecharge2Cache)
         self.ipyCrossZoneCommCache = self.__LoadFileData("CrossZoneComm", IPY_CrossZoneComm)
         self.ipyCrossZoneCommLen = len(self.ipyCrossZoneCommCache)
         self.ipyCrossZonePKCache = self.__LoadFileData("CrossZonePK", IPY_CrossZonePK)
@@ -2083,10 +2314,16 @@
     def GetActSpringSaleByIndex(self, index): return self.ipyActSpringSaleCache[index]
     def GetActFlashGiftbagCount(self): return self.ipyActFlashGiftbagLen
     def GetActFlashGiftbagByIndex(self, index): return self.ipyActFlashGiftbagCache[index]
+    def GetActDailyGiftbagCount(self): return self.ipyActDailyGiftbagLen
+    def GetActDailyGiftbagByIndex(self, index): return self.ipyActDailyGiftbagCache[index]
     def GetActExpRateCount(self): return self.ipyActExpRateLen
     def GetActExpRateByIndex(self, index): return self.ipyActExpRateCache[index]
     def GetActCostRebateCount(self): return self.ipyActCostRebateLen
     def GetActCostRebateByIndex(self, index): return self.ipyActCostRebateCache[index]
+    def GetActCollectWordsCount(self): return self.ipyActCollectWordsLen
+    def GetActCollectWordsByIndex(self, index): return self.ipyActCollectWordsCache[index]
+    def GetActCollectWords2Count(self): return self.ipyActCollectWords2Len
+    def GetActCollectWords2ByIndex(self, index): return self.ipyActCollectWords2Cache[index]
     def GetActBossRebornCount(self): return self.ipyActBossRebornLen
     def GetActBossRebornByIndex(self, index): return self.ipyActBossRebornCache[index]
     def GetActFairyCeremonyCount(self): return self.ipyActFairyCeremonyLen
@@ -2101,8 +2338,14 @@
     def GetStoreByIndex(self, index): return self.ipyStoreCache[index]
     def GetActWishingWellCount(self): return self.ipyActWishingWellLen
     def GetActWishingWellByIndex(self, index): return self.ipyActWishingWellCache[index]
+    def GetActRechargePrizeCount(self): return self.ipyActRechargePrizeLen
+    def GetActRechargePrizeByIndex(self, index): return self.ipyActRechargePrizeCache[index]
+    def GetActGrowupBuyCount(self): return self.ipyActGrowupBuyLen
+    def GetActGrowupBuyByIndex(self, index): return self.ipyActGrowupBuyCache[index]
     def GetActTotalRechargeCount(self): return self.ipyActTotalRechargeLen
     def GetActTotalRechargeByIndex(self, index): return self.ipyActTotalRechargeCache[index]
+    def GetActTotalRecharge2Count(self): return self.ipyActTotalRecharge2Len
+    def GetActTotalRecharge2ByIndex(self, index): return self.ipyActTotalRecharge2Cache[index]
     def GetCrossZoneCommCount(self): return self.ipyCrossZoneCommLen
     def GetCrossZoneCommByIndex(self, index): return self.ipyCrossZoneCommCache[index]
     def GetCrossZonePKCount(self): return self.ipyCrossZonePKLen

--
Gitblit v1.8.0