From 3242673eb09da924c0c6cf39c68d482dc4481b30 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期一, 22 十月 2018 11:46:32 +0800
Subject: [PATCH] 4272 开服运营活动修改

---
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt |   53 +++++++++++++-------------
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt       |   53 +++++++++++++-------------
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index f204b1d..362c3d7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -4,29 +4,30 @@
 3	OpenServer03	[]	5	5			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
 4	OpenServer04	[]	6	6			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
 5	OpenServer05	[]	7	7			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-6	OpenServer06	[]	9	10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-7	NationalDay1	[]	2018-9-1	2018-9-3			120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
-8	NationalDay2	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
-9	1OpenServer01	[7001]	2018-9-7	2018-9-7			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-10	1OpenServer02	[7001]	2018-9-9	2018-9-9			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-11	1OpenServer03	[7001]	2018-9-11	2018-9-11			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-12	1OpenServer04	[7001]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-13	1OpenServer05	[7001]	2018-9-15	2018-9-15			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-14	2OpenServer01	[7002]	2018-9-8	2018-9-8			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-15	2OpenServer02	[7002]	2018-9-10	2018-9-10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-16	2OpenServer03	[7002]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-17	2OpenServer04	[7002]	2018-9-13	2018-9-13			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-18	2OpenServer05	[7002]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-19	3OpenServer01	[7003]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-20	3OpenServer02	[7003]	2018-9-14	2018-9-14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-21	3OpenServer03	[7003]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-22	3OpenServer04	[7003]	2018-9-17	2018-9-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-23	3OpenServer05	[7003]	2018-9-20	2018-9-20			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-24	NationalDay01	[(7001,7003), (8002, 8004)]	2018-10-1	2018-10-1			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-25	NationalDay02	[(7001,7003), (8002, 8004)]	2018-10-2	2018-10-2				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-26	NationalDay03	[(7001,7003), (8002, 8004)]	2018-10-3	2018-10-3				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-27	NationalDay04	[(7001,7003), (8002, 8004)]	2018-10-4	2018-10-4				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-28	NationalDay05	[(7001,7003), (8002, 8004)]	2018-10-5	2018-10-5				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-29	NationalDay06	[(7001,7003), (8002, 8004)]	2018-10-6	2018-10-6				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-30	NationalDay07	[(7001,7003), (8002, 8004)]	2018-10-7	2018-10-7				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-31	NationalDay08	[(7001,7003), (8002, 8004)]	2018-10-8	2018-10-8				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+6	OpenServer06	[]	9	10			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+7	OpenServer07	[]	13	14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+8	NationalDay1	[]	2018-9-1	2018-9-3			120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
+9	NationalDay2	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
+10	1OpenServer01	[7001]	2018-9-7	2018-9-7			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+11	1OpenServer02	[7001]	2018-9-9	2018-9-9			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+12	1OpenServer03	[7001]	2018-9-11	2018-9-11			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+13	1OpenServer04	[7001]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+14	1OpenServer05	[7001]	2018-9-15	2018-9-15			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+15	2OpenServer01	[7002]	2018-9-8	2018-9-8			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+16	2OpenServer02	[7002]	2018-9-10	2018-9-10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+17	2OpenServer03	[7002]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+18	2OpenServer04	[7002]	2018-9-13	2018-9-13			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+19	2OpenServer05	[7002]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+20	3OpenServer01	[7003]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+21	3OpenServer02	[7003]	2018-9-14	2018-9-14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+22	3OpenServer03	[7003]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+23	3OpenServer04	[7003]	2018-9-17	2018-9-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+24	3OpenServer05	[7003]	2018-9-20	2018-9-20			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+25	NationalDay01	[(7001,7003), (8002, 8004)]	2018-10-1	2018-10-1			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+26	NationalDay02	[(7001,7003), (8002, 8004)]	2018-10-2	2018-10-2				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+27	NationalDay03	[(7001,7003), (8002, 8004)]	2018-10-3	2018-10-3				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+28	NationalDay04	[(7001,7003), (8002, 8004)]	2018-10-4	2018-10-4				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+29	NationalDay05	[(7001,7003), (8002, 8004)]	2018-10-5	2018-10-5				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+30	NationalDay06	[(7001,7003), (8002, 8004)]	2018-10-6	2018-10-6				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+31	NationalDay07	[(7001,7003), (8002, 8004)]	2018-10-7	2018-10-7				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+32	NationalDay08	[(7001,7003), (8002, 8004)]	2018-10-8	2018-10-8				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index b708665..7c7d926 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -4,29 +4,30 @@
 3	5	5			0	50	0	[[17]]	SellMail4	
 4	6	6			0	50	0	[[18]]	SellMail4	
 5	7	7			0	50	0	[[19]]	SellMail4	
-6	9	10			120	50	0	[[20]]	SellMail4	
-7	2018-9-1	2018-9-3			120	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
-8	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-9	2018-9-7	2018-9-7			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-10	2018-9-9	2018-9-9			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-11	2018-9-11	2018-9-11			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-12	2018-9-12	2018-9-12			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-13	2018-9-15	2018-9-15			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-14	2018-9-8	2018-9-8			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-15	2018-9-10	2018-9-10			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-16	2018-9-12	2018-9-12			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-17	2018-9-13	2018-9-13			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-18	2018-9-16	2018-9-16			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-19	2018-9-12	2018-9-12			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-20	2018-9-14	2018-9-14			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-21	2018-9-16	2018-9-16			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-22	2018-9-17	2018-9-17			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-23	2018-9-20	2018-9-20			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-24	2018-10-1	2018-10-1			120	110	0	[[9]]	SellMail4	
-25	2018-10-2	2018-10-2				110	0	[[10]]	SellMail4	
-26	2018-10-3	2018-10-3				110	0	[[13]]	SellMail4	
-27	2018-10-4	2018-10-4				110	0	[[10]]	SellMail4	
-28	2018-10-5	2018-10-5				110	0	[[8]]	SellMail4	
-29	2018-10-6	2018-10-6				110	0	[[11]]	SellMail4	
-30	2018-10-7	2018-10-7				110	0	[[14]]	SellMail4	
-31	2018-10-8	2018-10-8				110	0	[[12]]	SellMail4	
+6	9	10			0	50	0	[[20]]	SellMail4	
+7	13	14			120	50	0	[[15]]	SellMail4	
+8	2018-9-1	2018-9-3			120	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
+9	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+10	2018-9-7	2018-9-7			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+11	2018-9-9	2018-9-9			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+12	2018-9-11	2018-9-11			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+13	2018-9-12	2018-9-12			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+14	2018-9-15	2018-9-15			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+15	2018-9-8	2018-9-8			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+16	2018-9-10	2018-9-10			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+17	2018-9-12	2018-9-12			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+18	2018-9-13	2018-9-13			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+19	2018-9-16	2018-9-16			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+20	2018-9-12	2018-9-12			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+21	2018-9-14	2018-9-14			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+22	2018-9-16	2018-9-16			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+23	2018-9-17	2018-9-17			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+24	2018-9-20	2018-9-20			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+25	2018-10-1	2018-10-1			120	110	0	[[9]]	SellMail4	
+26	2018-10-2	2018-10-2				110	0	[[10]]	SellMail4	
+27	2018-10-3	2018-10-3				110	0	[[13]]	SellMail4	
+28	2018-10-4	2018-10-4				110	0	[[10]]	SellMail4	
+29	2018-10-5	2018-10-5				110	0	[[8]]	SellMail4	
+30	2018-10-6	2018-10-6				110	0	[[11]]	SellMail4	
+31	2018-10-7	2018-10-7				110	0	[[14]]	SellMail4	
+32	2018-10-8	2018-10-8				110	0	[[12]]	SellMail4	

--
Gitblit v1.8.0