From 72eada98fa7f73574286cb26bad8f1adbb63822e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 09 十一月 2018 15:49:44 +0800
Subject: [PATCH] 4675 【后端】【1.2】新增运营活动针对不同平台的配置(多倍经验、消费返利、限时特惠、BOSS复活、限时礼包、仙界盛典、多倍修行点、限时抢购、许愿池、累计充值)

---
 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt                    |    4 
 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc                         |    0 
 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt                        |   10 +-
 db/PyMongoDataServer/PySysDB/tagActFlashSale.txt                            |    2 
 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt                     |   10 +-
 CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt                     |    6 +-
 CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt                  |   18 +++---
 CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt                      |    4 
 CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt                  |   10 +-
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt                     |   10 +-
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt                     |   38 ++++++------
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt                   |   66 +++++++++++-----------
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc |    0 
 13 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 1865eaf..a0a0a9d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,5 +1,5 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV	TemplateID
-1	OpenSever1	[]	4	6	1	{0:["BossFHOpen", []]}	{}	110	1
-2	OpenSever2	[]	9	11	1	{0:["BossFHOpen", []]}	{}	110	1
-3	Guoqing1	[7001,7002,7003,8002,8003,8004]	2018-10-1	2018-10-3	1	{0:["BossFHOpen", []]}	{}	110	1
-4	Guoqing2	[7001,7002,7003,8002,8003,8004]	2018-10-5	2018-10-7	1	{0:["BossFHOpen", []]}	{}	110	1
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV	TemplateID
+1	OpenSever1	[]	[]	4	6	1	{0:["BossFHOpen", []]}	{}	110	1
+2	OpenSever2	[]	[]	9	11	1	{0:["BossFHOpen", []]}	{}	110	1
+3	Guoqing1	[]	[7001,7002,7003,8002,8003,8004]	2018-10-1	2018-10-3	1	{0:["BossFHOpen", []]}	{}	110	1
+4	Guoqing2	[]	[7001,7002,7003,8002,8003,8004]	2018-10-5	2018-10-7	1	{0:["BossFHOpen", []]}	{}	110	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index d6d9839..5813b99 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,5 +1,5 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	IsDayReset
-1	test1	[]	2018-5-29	2018-5-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-2	test2	[]	2018-5-31	2018-5-1	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-3	test3	[]	2018-5-2	2018-5-3	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-4	tast4	[7001,7002,7003,8002,8003,8004]	2018-9-29	2018-9-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	IsDayReset
+1	test1	[]	[]	2018-5-29	2018-5-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+2	test2	[]	[]	2018-5-31	2018-5-1	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+3	test3	[]	[]	2018-5-2	2018-5-3	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+4	tast4	[]	[7001,7002,7003,8002,8003,8004]	2018-9-29	2018-9-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 3598031..cfe9dd1 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,5 +1,5 @@
-CfgID	ActMark	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	[]	12	12	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
+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	[]	[]	12	12	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
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index c89aa33..c29a9a6 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,9 +1,9 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV
-1	test1	[]	2018-9-30	2018-10-1	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
-2	test2	[]	2018-10-6	2018-10-7	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
-3	test3	[1]	10	11	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
-4	test4	[2]	9	10	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
-5	test5	[3]	8	9	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
-6	test6	[4]	7	8	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
-8	test8	[8002,8003,8004,7001,7002,7003,7004]	2018-10-29	2018-10-30	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
-9	test9	[]	2018-11-11	2018-11-12	2	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV
+1	test1	[]	[]	2018-9-30	2018-10-1	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+2	test2	[]	[]	2018-10-6	2018-10-7	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+3	test3	[]	[1]	10	11	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+4	test4	[]	[2]	9	10	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+5	test5	[]	[3]	8	9	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+6	test6	[]	[4]	7	8	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+8	test8	[]	[8002,8003,8004,7001,7002,7003,7004]	2018-10-29	2018-10-30	1	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+9	test9	[]	[]	2018-11-11	2018-11-12	2	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 304a3ba..94074a4 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,33 +1,33 @@
-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	[]	5	5			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-4	OpenServer04	[]	6	6			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-5	OpenServer05	[]	9	10			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	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
+CfgID	ActMark	PlatformList	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	[]	[]	5	5			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+4	OpenServer04	[]	[]	6	6			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+5	OpenServer05	[]	[]	9	10			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	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/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index 2e7976d..421241f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -1,2 +1,2 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset	ShopTypeList
-1	test1	[]	2018-5-1	2018-5-3	12:00|14:00|16:00|18:00|20:00	13:00|15:00|17:00|19:00|21:00	120	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[38,39,38,39,38],[39,38,39,39,39],[39,38,39,38,39]]
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset	ShopTypeList
+1	test1	[]	[]	2018-5-1	2018-5-3	12:00|14:00|16:00|18:00|20:00	13:00|15:00|17:00|19:00|21:00	1440	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[38,39,38,39,38],[39,38,39,39,39],[39,38,39,38,39]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index f4ce7cc..ca8d300 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,3 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	Multiple	LimitLV
-1	opensever	[]	7	8	1	{0:["MultipleXXDOpen", []]}	{}	2	110
-2	guoqing11	[7001,7002,7003,8002,8003,8004]	2018-10-4	2018-10-5	1	{0:["MultipleXXDOpen", []]}	{}	2	110
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	Multiple	LimitLV
+1	opensever	[]	[]	7	8	1	{0:["MultipleXXDOpen", []]}	{}	2	110
+2	guoqing11	[]	[7001,7002,7003,8002,8003,8004]	2018-10-4	2018-10-5	1	{0:["MultipleXXDOpen", []]}	{}	2	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index 7fb37c5..8eb8bc1 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -1,19 +1,19 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset
-1	OpenServer01	[]	2018-8-1	2018-8-1			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
-2	OpenServer02	[]	2018-8-2	2018-8-2				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
-3	OpenServer03	[]	2018-8-3	2018-8-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
-4	OpenServer04	[]	2018-8-4	2018-8-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
-5	OpenServer05	[]	2018-8-5	2018-8-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
-6	OpenServer06	[]	2018-8-6	2018-8-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
-7	OpenServer07	[]	2018-8-7	2018-8-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
-8	OpenServer08	[]	2018-8-8	2018-8-8				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
-9	New4	[]	2018-8-11	2018-8-11			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
-10	New5	[]	2018-8-13	2018-8-13			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
-11	NationalDay01	[(7001,7003), (8002, 8004)]	2018-10-1	2018-10-1			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-12	NationalDay02	[(7001,7003), (8002, 8004)]	2018-10-2	2018-10-2				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-13	NationalDay03	[(7001,7003), (8002, 8004)]	2018-10-3	2018-10-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-14	NationalDay04	[(7001,7003), (8002, 8004)]	2018-10-4	2018-10-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-15	NationalDay05	[(7001,7003), (8002, 8004)]	2018-10-5	2018-10-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-16	NationalDay06	[(7001,7003), (8002, 8004)]	2018-10-6	2018-10-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-17	NationalDay07	[(7001,7003), (8002, 8004)]	2018-10-7	2018-10-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-18	NationalDay08	[(7001,7003), (8002, 8004)]	2018-10-8	2018-10-8				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset
+1	OpenServer01	[]	[]	2018-8-1	2018-8-1			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
+2	OpenServer02	[]	[]	2018-8-2	2018-8-2				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
+3	OpenServer03	[]	[]	2018-8-3	2018-8-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
+4	OpenServer04	[]	[]	2018-8-4	2018-8-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
+5	OpenServer05	[]	[]	2018-8-5	2018-8-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	0
+6	OpenServer06	[]	[]	2018-8-6	2018-8-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+7	OpenServer07	[]	[]	2018-8-7	2018-8-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+8	OpenServer08	[]	[]	2018-8-8	2018-8-8				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+9	New4	[]	[]	2018-8-11	2018-8-11			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+10	New5	[]	[]	2018-8-13	2018-8-13			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+11	NationalDay01	[]	[(7001,7003), (8002, 8004)]	2018-10-1	2018-10-1			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+12	NationalDay02	[]	[(7001,7003), (8002, 8004)]	2018-10-2	2018-10-2				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+13	NationalDay03	[]	[(7001,7003), (8002, 8004)]	2018-10-3	2018-10-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+14	NationalDay04	[]	[(7001,7003), (8002, 8004)]	2018-10-4	2018-10-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+15	NationalDay05	[]	[(7001,7003), (8002, 8004)]	2018-10-5	2018-10-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+16	NationalDay06	[]	[(7001,7003), (8002, 8004)]	2018-10-6	2018-10-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+17	NationalDay07	[]	[(7001,7003), (8002, 8004)]	2018-10-7	2018-10-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+18	NationalDay08	[]	[(7001,7003), (8002, 8004)]	2018-10-8	2018-10-8				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index d6d9839..5813b99 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -1,5 +1,5 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	IsDayReset
-1	test1	[]	2018-5-29	2018-5-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-2	test2	[]	2018-5-31	2018-5-1	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-3	test3	[]	2018-5-2	2018-5-3	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-4	tast4	[7001,7002,7003,8002,8003,8004]	2018-9-29	2018-9-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	IsDayReset
+1	test1	[]	[]	2018-5-29	2018-5-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+2	test2	[]	[]	2018-5-31	2018-5-1	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+3	test3	[]	[]	2018-5-2	2018-5-3	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+4	tast4	[]	[7001,7002,7003,8002,8003,8004]	2018-9-29	2018-9-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index a4c2973..be068c8 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -1,2 +1,2 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	IsDayReset	ResetType	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV
-1	test1	[]	2018-10-1	2018-10-3	1	1	{0:["XYCOpen", []]}	{}	[]	110
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	IsDayReset	ResetType	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV
+1	test1	[]	[]	2018-10-1	2018-10-3	1	1	{0:["XYCOpen", []]}	{}	[]	110
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index fee4d7f..bf8eb36 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 9f77482..6ed295d 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index 74e1a06..fd02298 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -1,2 +1,2 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	ShopTypeList	MailKey	MailItemPrize
-1	2018-5-1	2018-5-3	12:00|14:00|16:00|18:00|20:00	13:00|15:00|17:00|19:00|21:00	120	100	1	[[38,39,38,39,38],[39,38,39,39,39],[39,38,39,38,39]]	SellMail5	
+1	2018-5-1	2018-5-3	12:00|14:00|16:00|18:00|20:00	13:00|15:00|17:00|19:00|21:00	1440	100	1	[[38,39,38,39,38],[39,38,39,39,39],[39,38,39,38,39]]	SellMail5	

--
Gitblit v1.8.0