From dc7da4a58a8ad205f691930a86721e100db772ec Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 26 十二月 2018 16:37:40 +0800
Subject: [PATCH] 5603 1.3.20qudao分支开服活动 配置

---
 CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt     |    6 
 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt   |   31 ++--
 db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt  |   68 +++------
 db/PyMongoDataServer/PySysDB/tagActWishingWell.txt         |   31 ++--
 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt       |   23 +-
 CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt |   35 ----
 db/PyMongoDataServer/PySysDB/tagActFlashSale.txt           |    6 
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt           |    8 
 db/PyMongoDataServer/PySysDB/tagActExpRate.txt             |    7 
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt  |   66 ---------
 db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt       |   35 ----
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt        |   72 ---------
 12 files changed, 93 insertions(+), 295 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 4ce7432..8dcf743 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,12 +1,13 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	StartTime	EndTime	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	AddExpRate
-1	OpenServer	[]	[]	5	5	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-2	OpenServer	[]	[]	14	14	18:00	20:00	{ 0:["ExpActivity_Start", [3]]}	{-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}	[30, "ExpActivity_Goahead", [3]]	110	20000
-3	DoubleExp10	[]	[]	2018-11-10	2018-11-10	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-4	DoubleExp11	[]	[]	2018-11-11	2018-11-11	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-5	NovemberExp17	[]	[]	2018-11-17	2018-11-17	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-6	NovemberExp25	[]	[]	2018-11-25	2018-11-25	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-7	DecemberExp2	[]	[]	2018-12-2	2018-12-2	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-8	DecemberExp8	[]	[]	2018-12-8	2018-12-8	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-9	DecemberExp16	[]	[]	2018-12-16	2018-12-16	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-10	DecemberExp30	[]	[]	2018-12-30	2018-12-30	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
-11	JanuaryExp1	[]	[]	2019-1-2	2019-1-2	18:00	20:00	{ 0:["ExpActivity_Start", [3]]}	{-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}	[30, "ExpActivity_Goahead", [3]]	110	20000
+1	OpenServer1	[]	[]	2	2	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+2	OpenServer2	[]	[]	4	4	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+3	OpenServer3	[]	[]	7	7	18:00	20:00	{ 0:["ExpActivity_Start", [3]]}	{-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}	[30, "ExpActivity_Goahead", [3]]	110	20000
+4	DoubleExp10	[]	[]	2018-11-10	2018-11-10	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+5	DoubleExp11	[]	[]	2018-11-11	2018-11-11	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+6	NovemberExp17	[]	[]	2018-11-17	2018-11-17	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+7	NovemberExp25	[]	[]	2018-11-25	2018-11-25	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+8	DecemberExp2	[]	[]	2018-12-2	2018-12-2	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+9	DecemberExp8	[]	[]	2018-12-8	2018-12-8	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+10	DecemberExp16	[]	[]	2018-12-16	2018-12-16	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+11	DecemberExp30	[]	[]	2018-12-30	2018-12-30	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+12	JanuaryExp1	[]	[]	2019-1-2	2019-1-2	18:00	20:00	{ 0:["ExpActivity_Start", [3]]}	{-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}	[30, "ExpActivity_Goahead", [3]]	110	20000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 4367e49..bb007ba 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -2,68 +2,4 @@
 1	OpenServer01	[]	[]	1	2			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
 2	OpenServer02	[]	[]	3	4				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
 3	OpenServer03	[]	[]	5	6				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-4	OpenServer04	[]	[]	9	10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-5	OpenServer05	[]	[]	13	14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-6	NationalDay	[]	[]	2018-9-1	2018-9-1			120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
-7	NationalDay	[]	[(1,10), (100, 110), 120]	2018-9-2	2018-9-2	12:00|18:00	13:00|19:00	120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
-8	NationalDay	[]	[]	2018-9-3	2018-9-3			120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
-9	NationalDay	[]	[(1,10), (100, 110), 120]	2018-9-4	2018-9-4	12:00|18:00	13:00|19:00	120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
-10	NationalDay	[]	[(1,10), (100, 110), 120]	2018-9-5	2018-9-5	12:00|18:00	13:00|19:00	120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
-11	1OpenServer01	[]	[7001]	2018-9-7	2018-9-7			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-12	1OpenServer02	[]	[7001]	2018-9-9	2018-9-9			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-13	1OpenServer03	[]	[7001]	2018-9-11	2018-9-11			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-14	1OpenServer04	[]	[7001]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-15	1OpenServer05	[]	[7001]	2018-9-15	2018-9-15			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-16	2OpenServer01	[]	[7002]	2018-9-8	2018-9-8			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-17	2OpenServer02	[]	[7002]	2018-9-10	2018-9-10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-18	2OpenServer03	[]	[7002]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-19	2OpenServer04	[]	[7002]	2018-9-13	2018-9-13			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-20	2OpenServer05	[]	[7002]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-21	3OpenServer01	[]	[7003]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-22	3OpenServer02	[]	[7003]	2018-9-14	2018-9-14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-23	3OpenServer03	[]	[7003]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-24	3OpenServer04	[]	[7003]	2018-9-17	2018-9-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-25	3OpenServer05	[]	[7003]	2018-9-20	2018-9-20			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-26	NationalDay01	[]	[(7001,7003), (8002, 8004)]	2018-10-1	2018-10-1			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-27	NationalDay02	[]	[(7001,7003), (8002, 8004)]	2018-10-2	2018-10-2				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-28	NationalDay03	[]	[(7001,7003), (8002, 8004)]	2018-10-3	2018-10-3				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-29	NationalDay04	[]	[(7001,7003), (8002, 8004)]	2018-10-4	2018-10-4				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-30	NationalDay05	[]	[(7001,7003), (8002, 8004)]	2018-10-5	2018-10-5				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-31	NationalDay06	[]	[(7001,7003), (8002, 8004)]	2018-10-6	2018-10-6				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-32	NationalDay07	[]	[(7001,7003), (8002, 8004)]	2018-10-7	2018-10-7				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-33	NationalDay08	[]	[(7001,7003), (8002, 8004)]	2018-10-8	2018-10-8				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-34	Double11	[]	[]	2018-11-9	2018-11-9			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-35	Double11	[]	[]	2018-11-10	2018-11-10				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-36	Double11	[]	[]	2018-11-11	2018-11-11				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-37	Double11	[]	[]	2018-11-12	2018-11-12				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-38	WooliesSection1	[]	[]	2018-11-14	2018-11-14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-39	WooliesSection2	[]	[]	2018-11-15	2018-11-15				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-40	WooliesSection3	[]	[]	2018-11-17	2018-11-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-41	WooliesSection4	[]	[]	2018-11-18	2018-11-18				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-42	WooliesSection5	[]	[]	2018-11-19	2018-11-19				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-43	WooliesSection6	[]	[]	2018-11-21	2018-11-21			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-44	WooliesSection7	[]	[]	2018-11-22	2018-11-22				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-45	WooliesSection8	[]	[]	2018-11-23	2018-11-23				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-46	WooliesSection9	[]	[]	2018-11-25	2018-11-25			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-47	WooliesSection10	[]	[]	2018-11-26	2018-11-26				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-48	December1	[]	[]	2018-11-29	2018-11-29			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-49	December2	[]	[]	2018-11-30	2018-11-30				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-50	December3	[]	[]	2018-12-1	2018-12-1			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-51	December4	[]	[]	2018-12-2	2018-12-2				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-52	December5	[]	[]	2018-12-3	2018-12-3				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-53	December6	[]	[]	2018-12-4	2018-12-4				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-54	December7	[]	[]	2018-12-5	2018-12-5				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-55	December8	[]	[]	2018-12-6	2018-12-6				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-56	December9	[]	[]	2018-12-7	2018-12-7				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-57	December10	[]	[]	2018-12-8	2018-12-8				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-58	December11	[]	[]	2018-12-9	2018-12-9				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-59	December12	[]	[]	2018-12-10	2018-12-10				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-60	December13	[]	[]	2018-12-11	2018-12-11				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-61	December14	[]	[]	2018-12-12	2018-12-12				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-62	December15	[]	[]	2018-12-15	2018-12-15				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-63	December16	[]	[]	2018-12-16	2018-12-16				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-64	December17	[]	[]	2018-12-17	2018-12-17				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-65	December18	[]	[]	2018-12-18	2018-12-18				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-66	Dec27	[]	[]	2018-12-27	2018-12-27				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-67	Dec31	[]	[]	2018-12-31	2018-12-31				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
-68	Jan2	[]	[]	2019-1-2	2019-1-2				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+4	OpenServer04	[]	[]	7	8			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index 331ab13..cfa9fd7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -1,5 +1,3 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset	ShopTypeList
-1	OpenServer	[]	[]	5	5	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[200,201,202,203,204]]
-2	New1	[]	[]	2018-11-16	2018-11-16	12:00|16:00|20:00|22:00	13:30|17:30|21:30|23:30	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[205,206,207,208]]
-3	December12	[]	[]	2018-12-12	2018-12-12	12:00|16:00|20:00|22:00	13:30|17:30|21:30|23:30	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[205,206,207,208]]
-4	December25	[]	[]	2018-12-25	2018-12-25	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[205,206,207,208,209]]
+1	OpenServer1	[]	[]	3	2	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[200,201,202,203,204]]
+2	OpenServer2	[]	[]	5	5	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[205,206,207,208,209]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 4dd0e56..59bfb52 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -1,32 +1,5 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	IsDayReset
-1	OpenServer1	[]	[]	1	1	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-2	OpenServer2	[]	[]	2	2	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-3	OpenServer3	[]	[]	3	3	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-4	OpenServer4	[]	[]	4	4	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-5	OpenServer5	[]	[]	5	5	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-6	OpenServer6	[]	[]	6	6	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-7	OpenServer7	[]	[]	7	7	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-8	OpenServer8	[]	[]	8	8	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-9	OpenServer9	[]	[]	9	9	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-10	OpenServer10	[]	[]	10	10	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-11	OpenServer11	[]	[]	11	11	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-12	OpenServer12	[]	[]	12	12	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-13	OpenServer13	[]	[]	13	13	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-14	OpenServer14	[]	[]	14	14	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-15	New1	[]	[]	2018-11-16	2018-11-16	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-16	New2	[]	[]	2018-11-17	2018-11-17	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-17	New3	[]	[]	2018-11-18	2018-11-18	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-18	New4	[]	[]	2018-11-19	2018-11-19	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-19	New5	[]	[]	2018-11-20	2018-11-20	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-20	New6	[]	[]	2018-11-21	2018-11-21	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-21	New7	[]	[]	2018-11-22	2018-11-22	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-22	New8	[]	[]	2018-12-1	2018-12-1	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-23	New9	[]	[]	2018-12-2	2018-12-2	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-24	December5	[]	[]	2018-12-5	2018-12-5	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-25	December6	[]	[]	2018-12-6	2018-12-6	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-26	December7	[]	[]	2018-12-7	2018-12-7	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-27	December10	[]	[]	2018-12-10	2018-12-10	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-28	December11	[]	[]	2018-12-11	2018-12-11	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-29	December14	[]	[]	2018-12-14	2018-12-14	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-30	December29	[]	[]	2018-12-29	2018-12-29	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-31	December30	[]	[]	2018-12-30	2018-12-30	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
+1	OpenServer1	[]	[]	1	2	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
+2	OpenServer2	[]	[]	3	4	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
+3	OpenServer3	[]	[]	5	6	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
+4	OpenServer4	[]	[]	7	8	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 069b096..0b62cb9 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -1,17 +1,18 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	IsDayReset	ResetType	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV
 1	kaifu1	[]	[]	2	3	1	0	{0:["XYCOpen", []]}	{}	[]	110
-2	kaifu2	[]	[]	6	7	1	0	{0:["XYCOpen", []]}	{}	[]	110
-3	ceshi1	[]	[]	2018-11-16	2018-11-18	1	0	{0:["XYCOpen", []]}	{}	[]	110
-4	yunying1	[]	[]	2018-11-23	2018-11-24	1	0	{0:["XYCOpen", []]}	{}	[]	110
-5	yunying2	[]	[]	2018-11-26	2018-11-26	1	0	{0:["XYCOpen", []]}	{}	[]	110
-6	xiaoxuexy18	[]	[]	2018-12-3	2018-12-3	1	0	{0:["XYCOpen", []]}	{}	[]	110
-7	kaifu3	[]	[]	12	13	1	0	{0:["XYCOpen", []]}	{}	[]	110
-8	daxuexy1	[]	[]	2018-12-7	2018-12-7	1	0	{0:["XYCOpen", []]}	{}	[]	110
-9	daxuexy2	[]	[]	2018-12-11	2018-12-11	1	0	{0:["XYCOpen", []]}	{}	[]	110
-10	sdq1215	[]	[]	2018-12-15	2018-12-15	1	0	{0:["XYCOpen", []]}	{}	[]	110
-11	sdq1217	[]	[]	2018-12-17	2018-12-17	1	0	{0:["XYCOpen", []]}	{}	[]	110
-12	sdq1220	[]	[]	2018-12-20	2018-12-20	1	0	{0:["XYCOpen", []]}	{}	[]	110
-13	sdq1224	[]	[]	2018-12-24	2018-12-24	1	0	{0:["XYCOpen", []]}	{}	[]	110
-14	sdq1226	[]	[]	2018-12-26	2018-12-26	1	0	{0:["XYCOpen", []]}	{}	[]	110
-15	sdq1231	[]	[]	2018-12-31	2018-12-31	1	0	{0:["XYCOpen", []]}	{}	[]	110
-16	sdq0104	[]	[]	2019-1-4	2019-1-4	1	0	{0:["XYCOpen", []]}	{}	[]	110
+2	kaifu2	[]	[]	3	4	1	0	{0:["XYCOpen", []]}	{}	[]	110
+3	kaifu3	[]	[]	5	6	1	0	{0:["XYCOpen", []]}	{}	[]	110
+4	kaifu4	[]	[]	6	7	1	0	{0:["XYCOpen", []]}	{}	[]	110
+5	ceshi1	[]	[]	2018-11-16	2018-11-18	1	0	{0:["XYCOpen", []]}	{}	[]	110
+6	yunying1	[]	[]	2018-11-23	2018-11-24	1	0	{0:["XYCOpen", []]}	{}	[]	110
+7	yunying2	[]	[]	2018-11-26	2018-11-26	1	0	{0:["XYCOpen", []]}	{}	[]	110
+8	xiaoxuexy18	[]	[]	2018-12-3	2018-12-3	1	0	{0:["XYCOpen", []]}	{}	[]	110
+9	daxuexy1	[]	[]	2018-12-7	2018-12-7	1	0	{0:["XYCOpen", []]}	{}	[]	110
+10	daxuexy2	[]	[]	2018-12-11	2018-12-11	1	0	{0:["XYCOpen", []]}	{}	[]	110
+11	sdq1215	[]	[]	2018-12-15	2018-12-15	1	0	{0:["XYCOpen", []]}	{}	[]	110
+12	sdq1217	[]	[]	2018-12-17	2018-12-17	1	0	{0:["XYCOpen", []]}	{}	[]	110
+13	sdq1220	[]	[]	2018-12-20	2018-12-20	1	0	{0:["XYCOpen", []]}	{}	[]	110
+14	sdq1224	[]	[]	2018-12-24	2018-12-24	1	0	{0:["XYCOpen", []]}	{}	[]	110
+15	sdq1226	[]	[]	2018-12-26	2018-12-26	1	0	{0:["XYCOpen", []]}	{}	[]	110
+16	sdq1231	[]	[]	2018-12-31	2018-12-31	1	0	{0:["XYCOpen", []]}	{}	[]	110
+17	sdq0104	[]	[]	2019-1-4	2019-1-4	1	0	{0:["XYCOpen", []]}	{}	[]	110
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index 781551a..fcafa70 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -1,7 +1,7 @@
 CfgID	LimitLV	AddExpRate
 1	110	10000
-2	110	20000
-3	110	10000
+2	110	10000
+3	110	20000
 4	110	10000
 5	110	10000
 6	110	10000
@@ -9,4 +9,5 @@
 8	110	10000
 9	110	10000
 10	110	10000
-11	110	20000
+11	110	10000
+12	110	20000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index f55c47c..1bc5a2a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,69 +1,5 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	GiftbagList	MailKey	MailItemPrize
-1	1	2			120	50	0	[[22]]	SellMail4	
-2	3	4				50	0	[[19]]	SellMail4	
-3	5	6				50	0	[[18]]	SellMail4	
-4	9	10			120	50	0	[[15]]	SellMail4	
-5	13	14			120	50	0	[[21]]	SellMail4	
-6	2018-9-1	2018-9-1			120	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
-7	2018-9-2	2018-9-2	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-8	2018-9-3	2018-9-3			120	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
-9	2018-9-4	2018-9-4	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-10	2018-9-5	2018-9-5	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-11	2018-9-7	2018-9-7			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-12	2018-9-9	2018-9-9			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-13	2018-9-11	2018-9-11			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-14	2018-9-12	2018-9-12			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-15	2018-9-15	2018-9-15			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-16	2018-9-8	2018-9-8			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-17	2018-9-10	2018-9-10			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-18	2018-9-12	2018-9-12			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-19	2018-9-13	2018-9-13			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-20	2018-9-16	2018-9-16			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-21	2018-9-12	2018-9-12			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-22	2018-9-14	2018-9-14			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-23	2018-9-16	2018-9-16			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-24	2018-9-17	2018-9-17			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-25	2018-9-20	2018-9-20			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-26	2018-10-1	2018-10-1			120	110	0	[[9]]	SellMail4	
-27	2018-10-2	2018-10-2				110	0	[[10]]	SellMail4	
-28	2018-10-3	2018-10-3				110	0	[[13]]	SellMail4	
-29	2018-10-4	2018-10-4				110	0	[[10]]	SellMail4	
-30	2018-10-5	2018-10-5				110	0	[[8]]	SellMail4	
-31	2018-10-6	2018-10-6				110	0	[[11]]	SellMail4	
-32	2018-10-7	2018-10-7				110	0	[[14]]	SellMail4	
-33	2018-10-8	2018-10-8				110	0	[[12]]	SellMail4	
-34	2018-11-9	2018-11-9			120	50	0	[[22]]	SellMail4	
-35	2018-11-10	2018-11-10				50	0	[[23]]	SellMail4	
-36	2018-11-11	2018-11-11				50	0	[[24]]	SellMail4	
-37	2018-11-12	2018-11-12				50	0	[[25]]	SellMail4	
-38	2018-11-14	2018-11-14			120	50	0	[[27]]	SellMail4	
-39	2018-11-15	2018-11-15				50	0	[[28]]	SellMail4	
-40	2018-11-17	2018-11-17			120	50	0	[[29]]	SellMail4	
-41	2018-11-18	2018-11-18				50	0	[[30]]	SellMail4	
-42	2018-11-19	2018-11-19				50	0	[[31]]	SellMail4	
-43	2018-11-21	2018-11-21			120	50	0	[[32]]	SellMail4	
-44	2018-11-22	2018-11-22				50	0	[[33]]	SellMail4	
-45	2018-11-23	2018-11-23				50	0	[[34]]	SellMail4	
-46	2018-11-25	2018-11-25			120	50	0	[[35]]	SellMail4	
-47	2018-11-26	2018-11-26				50	0	[[36]]	SellMail4	
-48	2018-11-29	2018-11-29			120	50	0	[[37]]	SellMail4	
-49	2018-11-30	2018-11-30				50	0	[[38]]	SellMail4	
-50	2018-12-1	2018-12-1			120	50	0	[[39]]	SellMail4	
-51	2018-12-2	2018-12-2				50	0	[[40]]	SellMail4	
-52	2018-12-3	2018-12-3				50	0	[[41]]	SellMail4	
-53	2018-12-4	2018-12-4				50	0	[[42]]	SellMail4	
-54	2018-12-5	2018-12-5				110	0	[[43]]	SellMail4	
-55	2018-12-6	2018-12-6				110	0	[[44]]	SellMail4	
-56	2018-12-7	2018-12-7				110	0	[[45]]	SellMail4	
-57	2018-12-8	2018-12-8				110	0	[[46]]	SellMail4	
-58	2018-12-9	2018-12-9				110	0	[[47]]	SellMail4	
-59	2018-12-10	2018-12-10				110	0	[[48]]	SellMail4	
-60	2018-12-11	2018-12-11				110	0	[[49]]	SellMail4	
-61	2018-12-12	2018-12-12				110	0	[[50]]	SellMail4	
-62	2018-12-15	2018-12-15				110	0	[[51]]	SellMail4	
-63	2018-12-16	2018-12-16				110	0	[[52]]	SellMail4	
-64	2018-12-17	2018-12-17				110	0	[[53]]	SellMail4	
-65	2018-12-18	2018-12-18				110	0	[[54]]	SellMail4	
-66	2018-12-27	2018-12-27				110	0	[[55]]	SellMail4	
-67	2018-12-31	2018-12-31				110	0	[[56]]	SellMail4	
-68	2019-1-2	2019-1-2				110	0	[[57]]	SellMail4	
+1	1	2			120	50	0	[[15]]	SellMail4	
+2	3	4				50	0	[[16]]	SellMail4	
+3	5	6				50	0	[[17]]	SellMail4	
+4	7	8			120	50	0	[[18]]	SellMail4	
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index adab672..046c752 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -1,5 +1,3 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	ShopTypeList	MailKey	MailItemPrize
-1	5	5	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	900	100	1	[[200,201,202,203,204]]	SellMail5	
-2	2018-11-16	2018-11-16	12:00|16:00|20:00|22:00	13:30|17:30|21:30|23:30	900	100	0	[[205,206,207,208]]	SellMail5	
-3	2018-12-12	2018-12-12	12:00|16:00|20:00|22:00	13:30|17:30|21:30|23:30	900	100	0	[[205,206,207,208]]	SellMail5	
-4	2018-12-25	2018-12-25	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	900	100	0	[[205,206,207,208,209]]	SellMail5	
+1	3	2	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	900	100	1	[[200,201,202,203,204]]	SellMail5	
+2	5	5	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	900	100	1	[[205,206,207,208,209]]	SellMail5	
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index b901acd..0bd0e79 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -1,32 +1,5 @@
 CfgID	StartDate	EndDate	LimitLV	IsDayReset	TemplateIDList
-1	1	1	5	0	1
-2	2	2	5	0	1
-3	3	3	5	0	2
-4	4	4	5	0	2
-5	5	5	5	0	3
-6	6	6	5	0	3
-7	7	7	5	0	4
-8	8	8	5	0	4
-9	9	9	5	0	4
-10	10	10	5	0	4
-11	11	11	5	0	8
-12	12	12	5	0	8
-13	13	13	5	0	9
-14	14	14	5	0	9
-15	2018-11-16	2018-11-16	5	0	5
-16	2018-11-17	2018-11-17	5	0	5
-17	2018-11-18	2018-11-18	5	0	5
-18	2018-11-19	2018-11-19	5	0	5
-19	2018-11-20	2018-11-20	5	0	5
-20	2018-11-21	2018-11-21	5	0	5
-21	2018-11-22	2018-11-22	5	0	5
-22	2018-12-1	2018-12-1	5	0	6
-23	2018-12-2	2018-12-2	5	0	7
-24	2018-12-5	2018-12-5	5	0	10
-25	2018-12-6	2018-12-6	5	0	10
-26	2018-12-7	2018-12-7	5	0	11
-27	2018-12-10	2018-12-10	5	0	12
-28	2018-12-11	2018-12-11	5	0	13
-29	2018-12-14	2018-12-14	5	0	14
-30	2018-12-29	2018-12-29	5	0	15
-31	2018-12-30	2018-12-30	5	0	16
+1	1	2	5	0	1
+2	3	4	5	0	2
+3	5	6	5	0	3
+4	7	8	5	0	4
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 7752ed2..94631ce 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -1,17 +1,18 @@
 CfgID	StartDate	EndDate	IsDayReset	ResetType	LimitLV	TemplateID
 1	2	3	1	0	110	1
-2	6	7	1	0	110	1
-3	2018-11-16	2018-11-18	1	0	110	1
-4	2018-11-23	2018-11-24	1	0	110	1
-5	2018-11-26	2018-11-26	1	0	110	1
-6	2018-12-3	2018-12-3	1	0	110	1
-7	12	13	1	0	110	1
-8	2018-12-7	2018-12-7	1	0	110	1
-9	2018-12-11	2018-12-11	1	0	110	1
-10	2018-12-15	2018-12-15	1	0	110	1
-11	2018-12-17	2018-12-17	1	0	110	1
-12	2018-12-20	2018-12-20	1	0	110	1
-13	2018-12-24	2018-12-24	1	0	110	1
-14	2018-12-26	2018-12-26	1	0	110	1
-15	2018-12-31	2018-12-31	1	0	110	1
-16	2019-1-4	2019-1-4	1	0	110	1
+2	3	4	1	0	110	1
+3	5	6	1	0	110	1
+4	6	7	1	0	110	1
+5	2018-11-16	2018-11-18	1	0	110	1
+6	2018-11-23	2018-11-24	1	0	110	1
+7	2018-11-26	2018-11-26	1	0	110	1
+8	2018-12-3	2018-12-3	1	0	110	1
+9	2018-12-7	2018-12-7	1	0	110	1
+10	2018-12-11	2018-12-11	1	0	110	1
+11	2018-12-15	2018-12-15	1	0	110	1
+12	2018-12-17	2018-12-17	1	0	110	1
+13	2018-12-20	2018-12-20	1	0	110	1
+14	2018-12-24	2018-12-24	1	0	110	1
+15	2018-12-26	2018-12-26	1	0	110	1
+16	2018-12-31	2018-12-31	1	0	110	1
+17	2019-1-4	2019-1-4	1	0	110	1
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 3da7170..05d2225 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -13,10 +13,10 @@
 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	400	1	[(262,1,1),(181,25,1)]	262	LimitGift3
-3	16	50	1	[(4215,1,1),(4151,10,1)]	4215	LimitGift3
-5	17	180	1	[(7002,1,1),(195,1,1)]	7002	LimitGift3
-5	18	180	1	[(263,1,1),(181,25,1)]	263	LimitGift3
+5	15	136	1	[(263,2,1),(30,1100,1)]	262	LimitGift3
+8	16	336	1	[(4223,2,1),(30,2500,1)]	4215	LimitGift3
+8	17	336	1	[(4214,2,1),(30,2500,1)]	7002	LimitGift3
+8	18	336	1	[(4222,2,1),(30,2500,1)]	263	LimitGift3
 5	19	180	1	[(4220,1,1),(4151,20,1)]	4220	LimitGift3
 4	20	80	1	[(913,1,1),(181,30,1)]	913	LimitGift3
 8	21	400	1	[(4214,1,1),(4151,20,1)]	4214	LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 9cf65fa..d60a83e 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -1,45 +1,25 @@
 TemplateID	NeedRechargeGold	AwardIndex	AwardItem	NotifyKey
-1	6	0	{"1":[[986,1,1],[181,10,1],[3,2,1]],"2":[[986,1,1],[181,10,1],[3,2,1]],"3":[[986,1,1],[181,10,1],[3,2,1]]}	AccumulatedTopUp2
-1	30	1	{"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]}	AccumulatedTopUp2
-1	300	2	{"1":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]],"2":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]],"3":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]]}	AccumulatedTopUp2
-2	6	0	{"1":[[983,1,1],[181,10,1],[3,2,1]],"2":[[983,1,1],[181,10,1],[3,2,1]],"3":[[983,1,1],[181,10,1],[3,2,1]]}	AccumulatedTopUp2
-2	30	1	{"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]}	AccumulatedTopUp2
-2	300	2	{"1":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]],"2":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]],"3":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]]}	AccumulatedTopUp2
-3	6	0	{"1":[[1128,1,1],[181,10,1],[3,2,1]],"2":[[1128,1,1],[181,10,1],[3,2,1]],"3":[[1128,1,1],[181,10,1],[3,2,1]]}	AccumulatedTopUp2
-3	30	1	{"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]}	AccumulatedTopUp2
-3	300	2	{"1":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]]}	AccumulatedTopUp2
-4	6	0	{"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]}	AccumulatedTopUp2
-4	30	1	{"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]}	AccumulatedTopUp2
-4	300	2	{"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]}	AccumulatedTopUp2
-5	6	0	{"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]}	AccumulatedTopUp2
-5	30	1	{"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]}	AccumulatedTopUp2
-5	100	2	{"1":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]}	AccumulatedTopUp2
-6	6	0	{"1":[[4181,2,1],[30,100,1]],"2":[[4181,2,1],[30,100,1]],"3":[[4181,2,1],[30,100,1]]}	AccumulatedTopUp2
-6	30	1	{"1":[[4681,1,1],[30,200,1]],"2":[[4681,1,1],[30,200,1]],"3":[[4681,1,1],[30,200,1]]}	AccumulatedTopUp2
-6	150	2	{"1":[[4010,6,1],[30,600,1]],"2":[[4010,6,1],[30,600,1]],"3":[[4010,6,1],[30,600,1]]}	AccumulatedTopUp2
-7	6	0	{"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]}	AccumulatedTopUp2
-7	30	1	{"1":[[1128,1,1],[30,200,1]],"2":[[1128,1,1],[30,200,1]],"3":[[1128,1,1],[30,200,1]]}	AccumulatedTopUp2
-7	150	2	{"1":[[4010,6,1],[30,600,1]],"2":[[4010,6,1],[30,600,1]],"3":[[4010,6,1],[30,600,1]]}	AccumulatedTopUp2
-8	6	0	{"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]}	
-8	30	1	{"1":[[881,1,1],[4151,10,1],[4306,50,1]],"2":[[881,1,1],[4151,10,1],[4306,50,1]],"3":[[881,1,1],[4151,10,1],[4306,50,1]]}	
-8	300	2	{"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]}	
-9	6	0	{"1":[[983,3,1],[181,10,1],[3,2,1]],"2":[[983,3,1],[181,10,1],[3,2,1]],"3":[[983,3,1],[181,10,1],[3,2,1]]}	
-9	30	1	{"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]}	
-9	300	2	{"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]}	
-10	6	0	{"1":[[1128,1,1],[5411,1,1]],"2":[[1128,1,1],[5411,1,1]],"3":[[1128,1,1],[5411,1,1]]}	AccumulatedTopUp2
-10	30	1	{"1":[[4681,1,1],[5411,3,1]],"2":[[4681,1,1],[5411,3,1]],"3":[[4681,1,1],[5411,3,1]]}	AccumulatedTopUp2
-11	6	0	{"1":[[4671,2,1],[4674,2,1]],"2":[[4671,2,1],[4674,2,1]],"3":[[4671,2,1],[4674,2,1]]}	AccumulatedTopUp2
-11	30	1	{"1":[[4182,3,1],[923,5,1]],"2":[[4182,3,1],[923,5,1]],"3":[[4182,3,1],[923,5,1]]}	AccumulatedTopUp2
-12	6	0	{"1":[[4695,1,1],[912,1,1]],"2":[[4695,1,1],[912,1,1]],"3":[[4695,1,1],[912,1,1]]}	AccumulatedTopUp2
-12	30	1	{"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]}	AccumulatedTopUp2
-13	6	0	{"1":[[4007,4,1]],"2":[[4007,4,1]],"3":[[4007,4,1]]}	AccumulatedTopUp2
-13	30	1	{"1":[[108,6,1],[109,2,1]],"2":[[108,6,1],[109,2,1]],"3":[[108,6,1],[109,2,1]]}	AccumulatedTopUp2
-14	6	0	{"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]}	AccumulatedTopUp2
-14	30	1	{"1":[[4681,1,1],[5411,2,1]],"2":[[4681,1,1],[5411,2,1]],"3":[[4681,1,1],[5411,2,1]]}	AccumulatedTopUp2
-14	198	2	{"1":[[4680,1,1],[5411,5,1]],"2":[[4681,1,1],[5411,5,1]],"3":[[4681,1,1],[5411,5,1]]}	AccumulatedTopUp2
-15	6	0	{"1":[[5412,30,1],[30,100,1]],"2":[[5412,30,1],[30,100,1]],"3":[[5412,30,1],[30,100,1]]}	AccumulatedTopUp2
-15	30	1	{"1":[[4681,1,1],[30,100,1]],"2":[[4681,1,1],[30,100,1]],"3":[[4681,1,1],[30,100,1]]}	AccumulatedTopUp2
-15	128	2	{"1":[[4680,1,1]],"2":[[4680,1,1]],"3":[[4680,1,1]]}	AccumulatedTopUp2
-16	6	0	{"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]}	AccumulatedTopUp2
-16	30	1	{"1":[[4694,2,1],[30,100,1]],"2":[[4694,2,1],[30,100,1]],"3":[[4694,2,1],[30,100,1]]}	AccumulatedTopUp2
-16	128	2	{"1":[[4694,3,1],[913,1,1]],"2":[[4694,3,1],[913,1,1]],"3":[[4694,3,1],[913,1,1]]}	AccumulatedTopUp2
+1	6	0	{"1":[[986,2,1],[181,10,1],[802,1,1]],"2":[[986,2,1],[181,10,1],[802,1,1]],"3":[[986,2,1],[181,10,1],[802,1,1]]}	AccumulatedTopUp2
+1	30	1	{"1":[[1128,1,1],[4151,10,1],[101,20,1]],"2":[[1128,1,1],[4151,10,1],[101,20,1]],"3":[[1128,1,1],[4151,10,1],[101,20,1]]}	AccumulatedTopUp2
+1	100	2	{"1":[[881,5,1],[4681,1,1],[4010,4,1]],"2":[[881,5,1],[4681,1,1],[4010,4,1]],"3":[[881,5,1],[4681,1,1],[4010,4,1]]}	AccumulatedTopUp2
+1	300	3	{"1":[[2346,2,1],[983,5,1],[7,1,1]],"2":[[2346,2,1],[983,5,1],[7,1,1]],"3":[[2346,2,1],[983,5,1],[7,1,1]]}	AccumulatedTopUp2
+1	600	4	{"1":[[264,30,1],[983,5,1],[4680,1,1]],"2":[[264,30,1],[983,5,1],[4680,1,1]],"3":[[264,30,1],[983,5,1],[4680,1,1]]}	AccumulatedTopUp2
+1	1000	5	{"1":[[103,2,1],[983,10,1],[200,1,1]],"2":[[103,2,1],[983,10,1],[200,1,1]],"3":[[103,2,1],[983,10,1],[200,1,1]]}	AccumulatedTopUp2
+2	6	0	{"1":[[5303,50,1],[181,10,1],[802,1,1]],"2":[[5303,50,1],[181,10,1],[802,1,1]],"3":[[5303,50,1],[181,10,1],[802,1,1]]}	AccumulatedTopUp2
+2	30	1	{"1":[[102,8,1],[4151,10,1],[1503,5,1]],"2":[[102,8,1],[4151,10,1],[1503,5,1]],"3":[[102,8,1],[4151,10,1],[1503,5,1]]}	AccumulatedTopUp2
+2	100	2	{"1":[[4505,500,1],[102,18,1],[4010,4,1]],"2":[[4505,500,1],[102,18,1],[4010,4,1]],"3":[[4505,500,1],[102,18,1],[4010,4,1]]}	AccumulatedTopUp2
+2	300	3	{"1":[[2346,2,1],[983,5,1],[7,1,1]],"2":[[2346,2,1],[983,5,1],[7,1,1]],"3":[[2346,2,1],[983,5,1],[7,1,1]]}	AccumulatedTopUp2
+2	600	4	{"1":[[4220,1,1],[5303,1000,1],[5412,150,1]],"2":[[4220,1,1],[5303,1000,1],[5412,150,1]],"3":[[4220,1,1],[5303,1000,1],[5412,150,1]]}	AccumulatedTopUp2
+2	1000	5	{"1":[[106,5,1],[982,10,1],[4187,1,1]],"2":[[106,5,1],[982,10,1],[4187,1,1]],"3":[[106,5,1],[982,10,1],[4187,1,1]]}	AccumulatedTopUp2
+3	6	0	{"1":[[1503,2,1],[181,10,1],[802,1,1]],"2":[[1503,2,1],[181,10,1],[802,1,1]],"3":[[1503,2,1],[181,10,1],[802,1,1]]}	AccumulatedTopUp2
+3	30	1	{"1":[[1128,1,1],[4151,10,1],[5410,2,1]],"2":[[1128,1,1],[4151,10,1],[5410,2,1]],"3":[[1128,1,1],[4151,10,1],[5410,2,1]]}	AccumulatedTopUp2
+3	100	2	{"1":[[5411,5,1],[4681,1,1],[4007,6,1]],"2":[[5411,5,1],[4681,1,1],[4007,6,1]],"3":[[5411,5,1],[4681,1,1],[4007,6,1]]}	AccumulatedTopUp2
+3	300	3	{"1":[[881,10,1],[4304,20,1],[4306,500,1]],"2":[[881,10,1],[4304,20,1],[4306,500,1]],"3":[[881,10,1],[4304,20,1],[4306,500,1]]}	AccumulatedTopUp2
+3	600	4	{"1":[[2347,1,1],[983,20,1],[4680,1,1]],"2":[[2347,1,1],[983,20,1],[4680,1,1]],"3":[[2347,1,1],[983,20,1],[4680,1,1]]}	AccumulatedTopUp2
+3	1000	5	{"1":[[2347,1,1],[982,10,1],[200,1,1]],"2":[[2347,1,1],[982,10,1],[200,1,1]],"3":[[2347,1,1],[982,10,1],[200,1,1]]}	AccumulatedTopUp2
+4	6	0	{"1":[[4622,2,1],[181,10,1],[802,1,1]],"2":[[4622,2,1],[181,10,1],[802,1,1]],"3":[[4622,2,1],[181,10,1],[802,1,1]]}	AccumulatedTopUp2
+4	30	1	{"1":[[4609,2,1],[1503,5,1],[2213,10,1]],"2":[[4609,2,1],[1503,5,1],[2213,10,1]],"3":[[4609,2,1],[1503,5,1],[2213,10,1]]}	AccumulatedTopUp2
+4	100	2	{"1":[[4610,2,1],[4681,1,1],[4007,6,1]],"2":[[4610,2,1],[4681,1,1],[4007,6,1]],"3":[[4610,2,1],[4681,1,1],[4007,6,1]]}	AccumulatedTopUp2
+4	300	3	{"1":[[881,10,1],[4608,2,1]],"2":[[881,10,1],[4608,2,1]],"3":[[881,10,1],[4608,2,1]]}	AccumulatedTopUp2
+4	600	4	{"1":[[4606,2,1],[2213,20,1]],"2":[[4606,2,1],[2213,20,1]],"3":[[4606,2,1],[2213,20,1]]}	AccumulatedTopUp2
+4	1000	5	{"1":[[4607,1,1],[4187,1,1]],"2":[[4607,1,1],[4187,1,1]],"3":[[4607,1,1],[4187,1,1]]}	AccumulatedTopUp2

--
Gitblit v1.8.0