From 263d7d4d71e2d0dc4469bac249fdd980012cde1a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 14 九月 2018 17:19:34 +0800
Subject: [PATCH] 3494 【后端】开服前14天运营活动定制 3443 【后端】Boss复活活动,时间段支持日期跨天或日期支持重置时间点设置(如0点或5点) 1972 【后端】运营活动支持循环广播

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc            |    0 
 db/PyMongoDataServer/PySysDB/tagActBossReborn.txt                                           |    3 +
 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt                                           |   22 +++---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc                    |    0 
 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc                                         |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                      |    0 
 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt                                        |    4 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc |    0 
 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt                                     |    6 +-
 db/PyMongoDataServer/PySysDB/tagActExpRate.txt                                              |    4 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc          |    0 
 CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt                                     |    6 +-
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                                           |    0 
 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt                                           |    5 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc        |    0 
 db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt                                           |    3 +
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt                                     |   10 +-
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt                                     |   22 +++---
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt                                   |   33 ++++++----
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc                 |    0 
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt                                         |   33 ++++++----
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc          |    0 
 24 files changed, 89 insertions(+), 62 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index ddb5f5c..15e3cb8 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,3 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	LimitLV	TemplateID
-1	test1	[]	2018-7-16	2018-7-18	{0:["BossFHOpen", []]}	{}	110	1
-2	test2	[]	2018-7-13	2018-7-15	{0:["BossFHOpen", []]}	{}	110	2
+CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV	TemplateID
+1	test1	[]	2018-7-16	2018-7-18	1	{0:["BossFHOpen", []]}	{}	110	1
+2	test2	[]	2018-9-13	2018-9-15	1	{0:["BossFHOpen", []]}	{}	110	2
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 5cf1e3a..4f2b592 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,5 +1,5 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	LimitLV	IsDayReset	TemplateIDList
-1	test1	[]	2018-8-30	2018-8-31	{0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}	{-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}	50	0	1
-2	test2	[24,30]	2018-7-13	2018-7-15	{0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}	{-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}	50	1	3
-3	NationalDay	[24]	2018-10-1	2018-10-3	{0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}	{-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}	50	1	1|2|3
-4	NationalDay1	[24]	2018-10-9	2018-10-15	{0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}	{-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}	50	1	1
+CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	IsDayReset
+1	test1	[]	2018-8-30	2018-8-31	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[240, "ConsumptionRebate4"]	0
+2	test2	[24,30]	2018-7-13	2018-7-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[240, "ConsumptionRebate4"]	1
+3	NationalDay	[]	2018-9-13	2018-9-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[240, "ConsumptionRebate4"]	1
+4	NationalDay1	[24]	2018-9-13	2018-9-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[240, "ConsumptionRebate4"]	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index f215e3f..39526a6 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,2 +1,4 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	StartTime	EndTime	NotifyInfoStart	NotifyInfoEnd	LimitLV	AddExpRate
-1	test2	[]	2018-7-10	2018-7-12	12:00|18:00	13:00|19:00	{ 0:["ExpActivity_Start", [3]]}	{-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}	110	20000
+1	test1	[]	2018-7-14	2018-7-15	12:00|18:00	13:00|19:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	110	10000
+2	test2	[]	2018-9-13	2018-9-15	12:00|18:00	13:00|19:00	{ 0:["ExpActivity_Start", [3]]}	{-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}	110	20000
+3	NationalDay	[]	2018-7-18	2018-7-18	12:00	13:00	{ 0:["ExpActivity_Start", [5]]}	{-5:["ExpActivity_End", [5]], 0:["ExpActivity_Close", [5]]}	110	40000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index fccf8fa..5a240e9 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,14 +1,19 @@
-CfgID	ActMark	ServerIDList	OpenServerDayLimit	StartDate	EndDate	StartTime	EndTime	NotifyInfoStart	NotifyInfoEnd	LimitLV	IsDayReset	GiftbagList
-1	test1	[3]	7	2018-5-1	2018-5-2	12:00|18:00	13:00|19:00	{}	{}	50	1	[[1,2],[2,3]]
-2	NationalDay	[]	7	2018-10-1	2018-10-3			{}	{}	50	1	[[1,2,3]]
-3	NationalDay	[(1,10), (100, 110), 120]	7	2018-10-1	2018-10-3			{}	{}	50	0	[[3]]
-4	1OpenServer01	[7001]	7	2018-9-7	2018-9-7			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	50	1	[[2]]
-5	1OpenServer02	[7001]	7	2018-9-9	2018-9-9			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	50	1	[[4]]
-6	1OpenServer03	[7001]	7	2018-9-11	2018-9-11			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	50	1	[[1]]
-7	1OpenServer04	[7001]	7	2018-9-12	2018-9-12			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	180	1	[[3]]
-8	1OpenServer05	[7001]	7	2018-9-15	2018-9-15			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	280	1	[[5]]
-9	2OpenServer01	[7002]	7	2018-9-8	2018-9-8			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	50	1	[[2]]
-10	2OpenServer02	[7002]	7	2018-9-10	2018-9-10			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	50	1	[[4]]
-11	2OpenServer03	[7002]	7	2018-9-12	2018-9-12			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	50	1	[[1]]
-12	2OpenServer04	[7002]	7	2018-9-13	2018-9-13			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	180	1	[[3]]
-13	2OpenServer05	[7002]	7	2018-9-16	2018-9-16			{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	280	1	[[5]]
+CfgID	ActMark	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset
+1	test1	[3]	7	12	12:00|18:00	13:00|19:00	1440	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
+2	NationalDay	[]	2018-9-1	2018-9-3			1440	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
+3	NationalDay	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3			1440	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
+4	1OpenServer01	[7001]	2018-9-7	2018-9-7			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+5	1OpenServer02	[7001]	2018-9-9	2018-9-9			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+6	1OpenServer03	[7001]	2018-9-11	2018-9-11			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+7	1OpenServer04	[7001]	2018-9-12	2018-9-12			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+8	1OpenServer05	[7001]	2018-9-15	2018-9-15			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+9	2OpenServer01	[7002]	2018-9-8	2018-9-8			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+10	2OpenServer02	[7002]	2018-9-10	2018-9-10			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+11	2OpenServer03	[7002]	2018-9-12	2018-9-12			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+12	2OpenServer04	[7002]	2018-9-13	2018-9-13			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+13	2OpenServer05	[7002]	2018-9-16	2018-9-16			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+14	3OpenServer01	[7003]	2018-9-12	2018-9-12			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+15	3OpenServer02	[7003]	2018-9-14	2018-9-14			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+16	3OpenServer03	[7003]	2018-9-16	2018-9-16			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+17	3OpenServer04	[7003]	2018-9-17	2018-9-17			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+18	3OpenServer05	[7003]	2018-9-20	2018-9-20			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index 883d287..f0508ab 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,3 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	Multiple	LimitLV
-1	test1	[]	2018-7-31	2018-8-3	{}	{}	3	110
-2	test2	[]	2018-7-13	2018-7-15	{}	{}	3	110
+CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	Multiple	LimitLV
+1	test1	[]	2018-7-31	2018-8-3	1	{}	{}	3	110
+2	test2	[]	2018-9-13	2018-9-15	1	{}	{}	3	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index 86ccb7c..60d56cd 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -1,11 +1,11 @@
-CfgID	ActMark	ServerIDList	OpenServerDayLimit	StartDate	EndDate	StartTime	EndTime	NotifyInfoStart	NotifyInfoEnd	LimitLV	IsDayReset	ShopTypeList
-1	test1	[]	7	2018-7-24	2018-7-31			{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	50	1	[[16],[17],[18],[20],[21],[22],[23],[24]]
-2	test2	[]	7	2018-5-1	2018-5-3	12:00|18:00	13:00|19:00	{}	{}	50	1	[[16,17],[16,17],[16,17]]
-3	NationalDay	[]	7	2018-10-1	2018-10-7			{}	{}	50	1	[[16],[17],[18]]
-4	NationalDay	[(1,10), (100, 110), 120]	7	2018-10-1	2018-10-7			{}	{}	50	1	[[16],[17],[18]]
-5	NationalDay	[(200, 210)]	7	2018-10-1	2018-10-7			{}	{}	50	1	[[16],[17],[18]]
-6	New1	[]	7	2018-8-5	2018-8-5			{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	100	1	[[25]]
-7	New2	[]	7	2018-8-7	2018-8-7			{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	100	1	[[26]]
-8	New3	[]	7	2018-8-9	2018-8-9			{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	100	1	[[27]]
-9	New4	[]	7	2018-8-11	2018-8-11			{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	100	1	[[28]]
-10	New5	[]	7	2018-8-13	2018-8-13			{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	100	1	[[29]]
+CfgID	ActMark	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset
+1	test1	[]	2018-7-24	2018-7-31			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[]	50	1
+2	test2	[]	2018-5-1	2018-5-3	12:00|18:00	13:00|19:00	0	{}	{}	[]	50	1
+3	NationalDay	[]	2018-9-1	2018-9-3			0	{}	{}	[]	50	1
+4	NationalDay	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3			0	{}	{}	[]	50	1
+5	NationalDay	[(200, 210)]	2018-9-1	2018-9-3			0	{}	{}	[]	50	1
+6	New1	[]	2018-8-5	2018-8-5			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[]	100	1
+7	New2	[]	2018-8-7	2018-8-7			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[]	100	1
+8	New3	[]	2018-8-9	2018-8-9			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[]	100	1
+9	New4	[]	2018-8-11	2018-8-11			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[]	100	1
+10	New5	[]	2018-8-13	2018-8-13			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[]	100	1
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index b91f137..af77ebf 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 78e009c..927e62d 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index c95b1e3..447d404 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
index c02d136..f081b7d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index e82b7e4..8b21216 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
index 0c4c94f..a196b7f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
index 8c469d5..3f36910 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index cbb2161..8549d32 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc
index 34d71ce..1b7f5d3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc
index 0bf55ee..254c609 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc
index 737a603..e118914 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 6fb90f5..b1475dd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
new file mode 100644
index 0000000..37f67e2
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -0,0 +1,3 @@
+CfgID	StartDate	EndDate	LimitLV	TemplateID
+1	2018-7-16	2018-7-18	110	1
+2	2018-9-13	2018-9-15	110	2
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
new file mode 100644
index 0000000..5c0e8f0
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -0,0 +1,5 @@
+CfgID	StartDate	EndDate	LimitLV	IsDayReset	TemplateIDList
+1	2018-8-30	2018-8-31	50	0	1
+2	2018-7-13	2018-7-15	50	1	3
+3	2018-9-13	2018-9-15	50	1	1|2|3
+4	2018-9-13	2018-9-15	50	1	1
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
new file mode 100644
index 0000000..e1bd45e
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -0,0 +1,4 @@
+CfgID	LimitLV	AddExpRate
+1	110	10000
+2	110	20000
+3	110	40000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 10c806e..962ad66 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,14 +1,19 @@
-CfgID	StartDate	EndDate	StartTime	EndTime	LimitLV	IsDayReset	GiftbagList
-1	2018-5-1	2018-5-2	12:00|18:00	13:00|19:00	50	1	[[1,2],[2,3]]
-2	2018-10-1	2018-10-3			50	1	[[1,2,3]]
-3	2018-10-1	2018-10-3			50	0	[[3]]
-4	2018-9-7	2018-9-7			50	1	[[2]]
-5	2018-9-9	2018-9-9			50	1	[[4]]
-6	2018-9-11	2018-9-11			50	1	[[1]]
-7	2018-9-12	2018-9-12			180	1	[[3]]
-8	2018-9-15	2018-9-15			280	1	[[5]]
-9	2018-9-8	2018-9-8			50	1	[[2]]
-10	2018-9-10	2018-9-10			50	1	[[4]]
-11	2018-9-12	2018-9-12			50	1	[[1]]
-12	2018-9-13	2018-9-13			180	1	[[3]]
-13	2018-9-16	2018-9-16			280	1	[[5]]
+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]]
diff --git a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
new file mode 100644
index 0000000..43370bb
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
@@ -0,0 +1,3 @@
+CfgID	Multiple	LimitLV
+1	3	110
+2	3	110
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 5a4ef77..2733fbc 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -1,11 +1,11 @@
-CfgID	StartDate	EndDate	StartTime	EndTime	LimitLV	IsDayReset	ShopTypeList
-1	2018-7-24	2018-7-31			50	1	[[16],[17],[18],[20],[21],[22],[23],[24]]
-2	2018-5-1	2018-5-3	12:00|18:00	13:00|19:00	50	1	[[16,17],[16,17],[16,17]]
-3	2018-10-1	2018-10-7			50	1	[[16],[17],[18]]
-4	2018-10-1	2018-10-7			50	1	[[16],[17],[18]]
-5	2018-10-1	2018-10-7			50	1	[[16],[17],[18]]
-6	2018-8-5	2018-8-5			100	1	[[25]]
-7	2018-8-7	2018-8-7			100	1	[[26]]
-8	2018-8-9	2018-8-9			100	1	[[27]]
-9	2018-8-11	2018-8-11			100	1	[[28]]
-10	2018-8-13	2018-8-13			100	1	[[29]]
+CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	ShopTypeList
+1	2018-7-24	2018-7-31			0	50	1	[[16],[17],[18],[20],[21],[22],[23],[24]]
+2	2018-5-1	2018-5-3	12:00|18:00	13:00|19:00	0	50	1	[[16,17],[16,17],[16,17]]
+3	2018-9-1	2018-9-3			0	50	1	[[16],[17],[18]]
+4	2018-9-1	2018-9-3			0	50	1	[[16],[17],[18]]
+5	2018-9-1	2018-9-3			0	50	1	[[16],[17],[18]]
+6	2018-8-5	2018-8-5			0	100	1	[[25]]
+7	2018-8-7	2018-8-7			0	100	1	[[26]]
+8	2018-8-9	2018-8-9			0	100	1	[[27]]
+9	2018-8-11	2018-8-11			0	100	1	[[28]]
+10	2018-8-13	2018-8-13			0	100	1	[[29]]

--
Gitblit v1.8.0