From f6798e937d12e2e4ccb9c2bc4a6625cd1ace6557 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期四, 08 十一月 2018 11:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt |   50 ++++++++++++++++++++++++++++++++------------------
 1 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 2c338f7..ce98f00 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,19 +1,33 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	GiftbagList	MailKey	MailItemPrize
-1	7	12	12:00|18:00	13:00|19:00	1440	50	1	[[1,2],[2,3]]	SellMail4	[[13,2,1],[2,2,1]]
-2	2018-9-1	2018-9-3			1440	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
-3	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	1440	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-4	2018-9-7	2018-9-7			0	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-5	2018-9-9	2018-9-9			0	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-6	2018-9-11	2018-9-11			0	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-7	2018-9-12	2018-9-12			0	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-8	2018-9-15	2018-9-15			0	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-9	2018-9-8	2018-9-8			0	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-10	2018-9-10	2018-9-10			0	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-11	2018-9-12	2018-9-12			0	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-12	2018-9-13	2018-9-13			0	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-13	2018-9-16	2018-9-16			0	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-14	2018-9-12	2018-9-12			0	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-15	2018-9-14	2018-9-14			0	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-16	2018-9-16	2018-9-16			0	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-17	2018-9-17	2018-9-17			0	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-18	2018-9-20	2018-9-20			0	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+1	2	2			120	50	0	[[15]]	SellMail4	
+2	3	3			0	50	0	[[16]]	SellMail4	
+3	4	4			0	50	0	[[17]]	SellMail4	
+4	5	5			0	50	0	[[18]]	SellMail4	
+5	6	6			0	50	0	[[19]]	SellMail4	
+6	7	7			0	50	0	[[20]]	SellMail4	
+7	8	9			0	50	0	[[21]]	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