From f8afdf2b5358829706746834fc6540eb137cb44c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 11 三月 2020 18:42:20 +0800
Subject: [PATCH] 8399 每日灵石礼包修改(增加每日礼包表、每日礼包模板表)

---
 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py                      |   32 ++++++++++++++++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |   52 ++++++++++++++++++++++++++
 PySysDB/PySysDBPY.h                                                                  |   20 ++++++++++
 PySysDB/PySysDBG.h                                                                   |   12 ++++++
 4 files changed, 116 insertions(+), 0 deletions(-)

diff --git a/PySysDB/PySysDBG.h b/PySysDB/PySysDBG.h
index d7f1f7c..9cc9204 100644
--- a/PySysDB/PySysDBG.h
+++ b/PySysDB/PySysDBG.h
@@ -361,6 +361,18 @@
 	BYTE		IsDayReset;	//是否每天重置
 };
 
+//每日礼包表
+
+struct tagActDailyGiftbag
+{
+	DWORD		_CfgID;	//配置ID
+	char		ActMark;	//活动组标记
+	list		PlatformList;	//活动平台列表["平台A", "平台A", ...],配[]代表所有
+	list		ServerIDList;	//服务器ID列表
+	char		StartDate;	//开启日期
+	char		EndDate;	//结束日期
+};
+
 //双倍经验活动表
 
 struct tagActExpRate
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 0ca8ce8..0f546fb 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1338,6 +1338,26 @@
 	char		NotifyKey;		//全服广播key,默认两个参数(玩家名, 档位额度)
 };
 
+//每日礼包活动表
+
+struct tagActDailyGiftbag
+{
+	DWORD		_CfgID;	//配置ID
+	char		StartDate;	//开启日期
+	char		EndDate;	//结束日期
+	WORD		GiftbagType;	//礼包模板类型
+};
+
+//每日礼包模板表
+
+struct tagDailyGiftbag
+{
+	WORD		_GiftbagType;	//礼包模板类型
+	DWORD		_GiftbagID;	//礼包编号
+	WORD		BuyCountLimit;		//限购次数,0不限购
+	list		GiftItemList;	//礼包物品信息列表 [(物品ID,个数,是否绑定),...]
+};
+
 //双倍经验活动表
 
 struct tagActExpRate
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 4409089..9c95488 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -310,6 +310,15 @@
                         ("BYTE", "IsDayReset", 0),
                         ),
 
+                "ActDailyGiftbag":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerIDList", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ),
+
                 "ActExpRate":(
                         ("DWORD", "CfgID", 1),
                         ("list", "ServerGroupIDList", 0),
@@ -1166,6 +1175,25 @@
     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.ServerIDList = []
+        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 GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+
 # 双倍经验活动表
 class IPY_ActExpRate():
     
@@ -1811,6 +1839,8 @@
         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)
@@ -2083,6 +2113,8 @@
     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
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 3567740..af5f9a8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1073,6 +1073,20 @@
                         ("char", "NotifyKey", 0),
                         ),
 
+                "ActDailyGiftbag":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("WORD", "GiftbagType", 0),
+                        ),
+
+                "DailyGiftbag":(
+                        ("WORD", "GiftbagType", 1),
+                        ("DWORD", "GiftbagID", 1),
+                        ("WORD", "BuyCountLimit", 0),
+                        ("list", "GiftItemList", 0),
+                        ),
+
                 "ActExpRate":(
                         ("DWORD", "CfgID", 1),
                         ("WORD", "LVLimit", 0),
@@ -3761,6 +3775,36 @@
     def GetMainItemID(self): return self.MainItemID # 标的物品ID
     def GetNotifyKey(self): return self.NotifyKey # 全服广播key,默认两个参数(玩家名, 档位额度)
 
+# 每日礼包活动表
+class IPY_ActDailyGiftbag():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.StartDate = ""
+        self.EndDate = ""
+        self.GiftbagType = 0
+        return
+        
+    def GetCfgID(self): return self.CfgID # 配置ID
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+    def GetGiftbagType(self): return self.GiftbagType # 礼包模板类型
+
+# 每日礼包模板表
+class IPY_DailyGiftbag():
+    
+    def __init__(self):
+        self.GiftbagType = 0
+        self.GiftbagID = 0
+        self.BuyCountLimit = 0
+        self.GiftItemList = []
+        return
+        
+    def GetGiftbagType(self): return self.GiftbagType # 礼包模板类型
+    def GetGiftbagID(self): return self.GiftbagID # 礼包编号
+    def GetBuyCountLimit(self): return self.BuyCountLimit # 限购次数,0不限购
+    def GetGiftItemList(self): return self.GiftItemList # 礼包物品信息列表 [(物品ID,个数,是否绑定),...]
+
 # 双倍经验活动表
 class IPY_ActExpRate():
     
@@ -5056,6 +5100,10 @@
         self.ipyActFlashGiftbagLen = len(self.ipyActFlashGiftbagCache)
         self.ipyFlashGiftbagCache = self.__LoadFileData("FlashGiftbag", IPY_FlashGiftbag)
         self.ipyFlashGiftbagLen = len(self.ipyFlashGiftbagCache)
+        self.ipyActDailyGiftbagCache = self.__LoadFileData("ActDailyGiftbag", IPY_ActDailyGiftbag)
+        self.ipyActDailyGiftbagLen = len(self.ipyActDailyGiftbagCache)
+        self.ipyDailyGiftbagCache = self.__LoadFileData("DailyGiftbag", IPY_DailyGiftbag)
+        self.ipyDailyGiftbagLen = len(self.ipyDailyGiftbagCache)
         self.ipyActExpRateCache = self.__LoadFileData("ActExpRate", IPY_ActExpRate)
         self.ipyActExpRateLen = len(self.ipyActExpRateCache)
         self.ipyActCostRebateCache = self.__LoadFileData("ActCostRebate", IPY_ActCostRebate)
@@ -5538,6 +5586,10 @@
     def GetActFlashGiftbagByIndex(self, index): return self.ipyActFlashGiftbagCache[index]
     def GetFlashGiftbagCount(self): return self.ipyFlashGiftbagLen
     def GetFlashGiftbagByIndex(self, index): return self.ipyFlashGiftbagCache[index]
+    def GetActDailyGiftbagCount(self): return self.ipyActDailyGiftbagLen
+    def GetActDailyGiftbagByIndex(self, index): return self.ipyActDailyGiftbagCache[index]
+    def GetDailyGiftbagCount(self): return self.ipyDailyGiftbagLen
+    def GetDailyGiftbagByIndex(self, index): return self.ipyDailyGiftbagCache[index]
     def GetActExpRateCount(self): return self.ipyActExpRateLen
     def GetActExpRateByIndex(self, index): return self.ipyActExpRateCache[index]
     def GetActCostRebateCount(self): return self.ipyActCostRebateLen

--
Gitblit v1.8.0