From 9e5dea78e20bcac704edf373f07484ea74353f90 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 08 十一月 2018 15:41:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt          |   15 ++++++++-------
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt |   14 +++++++-------
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt       |   10 +++++-----
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 96ddd1b..e48989f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,11 +1,11 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset
-1	OpenServer01	[]	2	2			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-2	OpenServer02	[]	3	3			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-3	OpenServer03	[]	4	4			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-4	OpenServer04	[]	5	5			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-5	OpenServer05	[]	6	6			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-6	OpenServer06	[]	7	7			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-7	OpenServer07	[]	8	9			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+1	OpenServer	[]	2	2			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+2	OpenServer	[]	3	3			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+3												
+4	OpenServer	[]	5	5			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+5	OpenServer	[]	6	6			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+6	OpenServer	[]	9	10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+7												
 8	NationalDay	[]	2018-9-1	2018-9-3			120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
 9	NationalDay	[(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
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index ce98f00..d09a552 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,11 +1,11 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	GiftbagList	MailKey	MailItemPrize
-1	2	2			120	50	0	[[15]]	SellMail4	
+1	2	2			120	50	0	[[22]]	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	
+3										
+4	5	5			120	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	
+6	9	10			120	50	0	[[15]]	SellMail4	
+7										
 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]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 7c8f939..b5d9f58 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -13,10 +13,11 @@
 2	12	25	1	[(8353,2,1),(2213,3,1),(143,30,1)]	8353	LimitGift3
 4	13	50	1	[(30,310,1),(2389,1,1)]	2389	LimitGift3
 4	14	50	1	[(2213,10,1),(2389,1,1)]	2389	LimitGift3
-8	15	440	1	[(262,1,1),(181,240,1)]	262	LimitGift3
-4	16	110	1	[(4215,1,1),(4151,80,1)]	4215	LimitGift3
-7	17	268	1	[(7002,1,1),(2346,4,1)]	7002	LimitGift3
-5	18	190	1	[(263,1,1),(181,100,1)]	263	LimitGift3
-5	19	180	1	[(4220,1,1),(4151,100,1)]	4220	LimitGift3
-4	20	150	1	[(913,1,1),(181,100,1)]	913	LimitGift3
-7	21	360	1	[(4214,1,1),(4151,200,1)]	4214	LimitGift3
+8	15	400	1	[(262,1,1),(181,100,1)]	262	LimitGift3
+4	16	60	1	[(4215,1,1),(4151,30,1)]	4215	LimitGift3
+5	17	180	1	[(7002,1,1),(195,1,1)]	7002	LimitGift3
+5	18	140	1	[(263,1,1),(181,50,1)]	263	LimitGift3
+5	19	130	1	[(4220,1,1),(4151,50,1)]	4220	LimitGift3
+4	20	80	1	[(913,1,1),(181,30,1)]	913	LimitGift3
+7	21	260	1	[(4214,1,1),(4151,100,1)]	4214	LimitGift3
+4	22	60	1	[(265,1,1),(181,30,1)]	265	LimitGift3

--
Gitblit v1.8.0