From c6a58632ea948d2cd125a799fe6af023e53f5fd9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 29 一月 2019 14:39:52 +0800
Subject: [PATCH] 6087 【后端】【1.5.200】春节红包雨活动(增加是否每天重置)

---
 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py                      |    3 +++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py   |    4 ++++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |    2 +-
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py                        |    4 ++++
 PySysDB/PySysDBG.h                                                                   |    1 +
 5 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/PySysDB/PySysDBG.h b/PySysDB/PySysDBG.h
index dbf0d7f..b89b279 100644
--- a/PySysDB/PySysDBG.h
+++ b/PySysDB/PySysDBG.h
@@ -201,6 +201,7 @@
 	list		ServerIDList;	//服务器ID列表
 	char		StartDate;	//开启日期
 	char		EndDate;	//结束日期
+	BYTE		IsDayReset;	//是否每天重置
 	BYTE		ResetType;	//重置类型,0-0点重置;1-5点重置
 	list		RedPacketIDList;	//每日对应红包ID列表[[第一天红包ID列表], ...]
 	WORD		LVLimit;	//限制等级
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index e4000d5..ecae682 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -184,6 +184,7 @@
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
+                        ("BYTE", "IsDayReset", 0),
                         ("BYTE", "ResetType", 0),
                         ("list", "RedPacketIDList", 0),
                         ("WORD", "LVLimit", 0),
@@ -801,6 +802,7 @@
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
+        self.IsDayReset = 0
         self.ResetType = 0
         self.RedPacketIDList = []
         self.LVLimit = 0
@@ -812,6 +814,7 @@
     def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
     def GetStartDate(self): return self.StartDate # 开启日期
     def GetEndDate(self): return self.EndDate # 结束日期
+    def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
     def GetResetType(self): return self.ResetType # 重置类型,0-0点重置;1-5点重置
     def GetRedPacketIDList(self): return self.RedPacketIDList # 每日对应红包ID列表[[第一天红包ID列表], ...]
     def GetLVLimit(self): return self.LVLimit # 限制等级
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 6b79d94..a91cb04 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -1871,4 +1871,8 @@
 RedPackType_FeastSucc = 33 # 节日成就红包
 # 节日红包类型
 FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
+# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
+RedPackMaxCountDict = {1:[RedPackType_OpenServer],
+                       2:[RedPackType_FeastSysBig, RedPackType_FeastSysSmall],
+                       }
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 5880196..87e5e86 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -2915,7 +2915,7 @@
         return
         
     def GetFeastDay(self): return self.FeastDay # 节日第几天
-    def GetFeastSuccIDList(self): return self.FeastSuccIDList # 成就ID列表
+    def GetFeastSuccIDList(self): return self.FeastSuccIDList # 节日成就ID列表
 
 # NPC秀表
 class IPY_NPCShow():
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 6b79d94..a91cb04 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -1871,4 +1871,8 @@
 RedPackType_FeastSucc = 33 # 节日成就红包
 # 节日红包类型
 FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
+# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
+RedPackMaxCountDict = {1:[RedPackType_OpenServer],
+                       2:[RedPackType_FeastSysBig, RedPackType_FeastSysSmall],
+                       }
 

--
Gitblit v1.8.0