From d4c6bbfc8665ad06e4a962c79c1ee9ebf180314d Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期五, 28 九月 2018 22:02:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

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

--
Gitblit v1.8.0