From c104fb1f24255ec69b4f3963556f4d98e52dc42b Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 09 十一月 2018 15:52:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt                                         |    4 
 db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt                                             |    1 
 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc                                              |    0 
 db/PyMongoDataServer/PySysDB/tagStore.txt                                                        |    1 
 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt                                             |   10 
 db/PyMongoDataServer/PySysDB/tagActFlashSale.txt                                                 |    2 
 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt                                          |   10 
 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt                                                   |    2 
 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt                                             |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt |    2 
 CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt                                          |    6 
 CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt                                       |   18 +-
 CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt                                           |    4 
 db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt                                                 |   12 +-
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                      |   60 +++++-----
 CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt                                       |   10 
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt                                          |   10 
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt                                          |   38 +++---
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                        |   84 +++++++-------
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt                                        |   66 +++++-----
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc                      |    0 
 CoreServerGroup/GameServer/PySysDB/tagStore.txt                                                  |    1 
 22 files changed, 172 insertions(+), 171 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/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 6329d83..345cf22 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -15,7 +15,7 @@
 22	113	0	0
 23	113	0	0
 24	2	0	0
-28	280	0	0
+28	600	0	0
 34	70	0	0
 36	205	0	0
 40	2	0	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index de6c012..45f5312 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -12,6 +12,7 @@
 12	1	7	0
 13	1	7	0
 14	1	7	0
+15	1	7	0
 51	2	0	0
 52	2	0	0
 53	2	0	0
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/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index 047d96f..a7c55a2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -87,7 +87,7 @@
 	"EVE_1"	:"max(aMaxAtk-dDef,1)",
 	"PetVE_1":"max(((aMinAtk + aMaxAtk)/2.0-dDef)*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0),(aMinAtk+aMaxAtk)/2.0*0.05 + (aMinAtk+aMaxAtk)/2.0*0.1*rand)",
 	"PetVP_1":"max(max((aMinAtk+aMaxAtk)/2.0-dDef,0)*atkSkillPer*(1+aDamagePer/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand)",
-	
+
 	#世界小怪等级压制公式
 	"EVP_1_2"	:"max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV*min(max((aMinAtk+aMaxAtk)/2.0-dDef,0)+max(suppressLV-20,0),1))-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(min(suppressLV,1)*min(max((aMaxAtk+aMinAtk)/2.0-dDef,0),1)*aMaxAtk+aFinalHurt+suppressValueFP*dMaxHP-dFinalHurtReduce, 0)+min(suppressLV,1)*atkSkillValue*0.2+atkSkillValue*0.8)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05)",
 	
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	
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 5c6f8c1..e3c784c 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -15,7 +15,7 @@
 22	113	0	0	0	0
 23	113	0	0	0	0
 24	2	0	0	0	0
-28	280	0	0	0	0
+28	600	0	0	0	0
 34	70	0	0	104060	0
 36	205	0	0	0	0
 40	2	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
index d0e72e6..3d57e10 100644
--- a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
@@ -14,7 +14,6 @@
 145	
 93	{"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}
 138	{"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}
-28	{"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}
 103	
 140	
 141	
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index c64fa36..90d7fe5 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -12,6 +12,7 @@
 12	1	0	2325	1	1	[]	0		7	0	110	1	0	2	0	0	0		
 13	1	0	4741	1	1	[]	0		7	1	125	1	0	1	30	0	0		
 14	1	0	2389	1	1	[]	0		7	0	260	2	0	1	100	0	0		
+15	1	0	1129	1	1	[]	0		7	3	110	1	0	1	150	0	0		
 51	2	0	3796	1	0	[]	0		0	0	0	0	0	1	280	0	0		
 52	2	0	3797	1	0	[]	0		0	0	0	0	0	1	280	0	0		
 53	2	0	4101	1	0	[]	0		0	0	0	0	0	1	380	0	0		
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 11a2f4c..0afd8f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -6,27 +6,27 @@
 5	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
 6	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
 7	0	0	0	1	1	1	1	1	1	1	1	1	1	1	1	1
-8	0	0	0	0	0	0	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000
+8	0	0	0	0	0	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000
 9	0	0	0	0	0	0	0	1	1	1	1	1	1	1	1	1
 10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-11	0	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000
+11	0	0	0	0	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000
 12	0	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000
 13	3	4	5	6	10	11	12	15	16	17	20	20	22	24	26	28
 14	2	3	4	5	8	9	10	13	14	15	20	16	18	20	22	24
-15	0	0	0	1	2	3	3	4	4	4	4	9	10	11	12	12
-16	0	0	1	1	2	2	3	3	4	4	5	5	6	6	6	6
+15	0	0	0	1	2	2	3	3	4	4	4	9	10	11	12	12
+16	0	0	1	1	1	2	2	2	3	3	4	5	6	6	6	6
 17	1	1	2	2	3	3	4	4	4	4	4	4	4	4	4	4
 18	0	0	0	0	1	1	2	2	2	2	2	2	2	2	2	2
 19	0	0	1	1	3	3	5	5	7	7	9	11	11	13	13	15
 20	0	0	0	0	1	1	1	2	2	2	2	3	3	3	3	3
-21	1	1	1	2	2	3	3	3	3	3	3	3	3	3	3	3
+21	1	1	1	1	2	2	3	3	3	3	3	3	3	3	3	3
 22	0	0	0	0	0	1	1	1	1	1	2	2	2	2	2	2
 23	0	0	0	0	0	0	1	1	1	1	1	1	1	1	1	1
 24	0	0	0	0	1	1	1	1	1	1	1	1	1	1	1	1
 25	2	3	4	5	6	7	8	10	12	14	16	18	20	22	24	25
 26	0	0	0	0	1	1	1	1	1	1	1	1	1	1	1	1
 27	0	0	1	2	2	3	3	4	4	4	4	5	5	5	5	5
-28	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+28	0	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1
 29	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
 30	0	1	1	2	2	3	5	7	10	12	15	15	15	15	15	15
 31	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 4886751..8bf15cb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -329,8 +329,8 @@
 50105021	4	10002	变羊	1	0	3	3	3	1	0	0	3	3	3	0	0	0	0	0	0	0	0	3	3	0	0	2	6	23031	0	0	0	0	0	0	0	0	15	2	3	3	0	0	0	1	0	0	102	0	1
 50105022	3	0	道元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	55932	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50105023	3	0	剑元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	0	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
-50105024	7	0	火元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	50949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
-50105025	7	0	水元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	55949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
+50105024	4	0	火元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	50949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
+50105025	4	0	水元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	55949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50107001	3	0	召唤元素	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	100	0	10	0	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50107002	3	10002	治疗图腾	65	0	727	757	16	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	432	46	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	6395	0	0	0	0	0	0	0	62	1	1
 50108001	14	0	遗失物资(大)	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	0	0	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	214	0	1
@@ -659,14 +659,14 @@
 60103006	2	0	残暴凶狼	56	0	175	175	0	0	0	0	10000	705	0	0	0	0	0	0	32456	100	2500	408070	17	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	17267	0	0	0	0	3	0	0	180	1	1
 60103007	2	0	幽魂邪道	70	0	178	178	0	0	0	0	10000	795	0	0	0	0	0	0	51323	100	2500	453622	18	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	21440	0	0	0	0	3	0	0	180	1	1
 60103008	2	0	狂躁巨猿	80	0	181	181	0	0	0	0	10000	886	0	0	0	0	0	0	71242	100	2500	505817	19	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	30932	0	0	0	0	3	0	0	180	1	1
-60103009	2	0	守塔剑士	90	0	503	503	0	0	0	0	40000	914	0	0	0	0	0	0	98451	100	2500	556113	20	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	47772	0	0	0	0	3	0	0	180	1	1
-60103010	2	0	巨剑师	100	0	610	610	0	0	0	0	40000	1010	0	0	0	0	0	0	116886	100	2500	608308	22	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	66969	0	0	0	0	3	0	0	180	1	1
-60103011	2	0	符塔剑魂	110	0	896	896	0	0	0	0	40000	1060	0	0	0	0	0	0	145285	100	2500	659554	23	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	81872	0	0	0	0	3	0	0	180	1	1
-60103012	2	0	符塔剑尊	120	0	1096	1096	0	0	0	0	40000	1110	0	0	0	0	0	0	191114	100	2500	710800	24	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	109859	0	0	0	0	3	0	0	180	1	1
-60103013	2	0	守塔哨兵	125	0	1819	1819	0	0	0	0	40000	4260	0	0	0	0	0	0	240136	100	2500	372957	19	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	179772	0	0	0	0	3	0	0	180	1	1
-60103014	2	0	仙人掌球球	130	0	2093	2093	0	0	0	0	40000	4747	0	0	0	0	0	0	289867	100	2500	387192	19	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	197232	0	0	0	0	3	0	0	180	1	1
-60103015	2	0	封印花妖	135	0	2372	2372	0	0	0	0	40000	5196	0	0	0	0	0	0	333910	100	2500	401427	20	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	222663	0	0	0	0	3	0	0	180	1	1
-60103016	2	0	逍遥尊者	140	0	2619	2619	0	0	0	0	40000	5722	0	0	0	0	0	0	387192	100	2500	415662	21	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	251330	0	0	0	0	3	0	0	180	1	1
+60103009	2	0	守塔剑士	90	0	503	503	0	0	0	0	40000	914	0	0	0	0	0	0	98451	101	2500	556113	20	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	47772	0	0	0	0	3	0	0	180	1	1
+60103010	2	0	巨剑师	100	0	610	610	0	0	0	0	40000	1010	0	0	0	0	0	0	116886	101	2500	608308	22	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	66969	0	0	0	0	3	0	0	180	1	1
+60103011	2	0	符塔剑魂	110	0	896	896	0	0	0	0	40000	1060	0	0	0	0	0	0	145285	101	2500	659554	23	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	81872	0	0	0	0	3	0	0	180	1	1
+60103012	2	0	符塔剑尊	120	0	1096	1096	0	0	0	0	40000	1110	0	0	0	0	0	0	191114	101	2500	710800	24	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	109859	0	0	0	0	3	0	0	180	1	1
+60103013	2	0	守塔哨兵	125	0	1819	1819	0	0	0	0	40000	4260	0	0	0	0	0	0	240136	101	2500	372957	19	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	179772	0	0	0	0	3	0	0	180	1	1
+60103014	2	0	仙人掌球球	130	0	2093	2093	0	0	0	0	40000	4747	0	0	0	0	0	0	289867	101	2500	387192	19	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	197232	0	0	0	0	3	0	0	180	1	1
+60103015	2	0	封印花妖	135	0	2372	2372	0	0	0	0	40000	5196	0	0	0	0	0	0	333910	101	2500	401427	20	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	222663	0	0	0	0	3	0	0	180	1	1
+60103016	2	0	逍遥尊者	140	0	2619	2619	0	0	0	0	40000	5722	0	0	0	0	0	0	387192	101	2500	415662	21	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	251330	0	0	0	0	3	0	0	180	1	1
 60103017	2	0	符塔魔兵	142	0	2737	2737	0	0	0	0	40000	6500	0	0	0	0	0	0	389055	101	2500	421356	21	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	378689	0	0	0	0	3	0	0	180	1	1
 60103018	2	0	符塔蛮兽	144	0	2880	2880	0	0	0	0	40000	6660	0	0	0	0	0	0	400452	101	2500	427050	21	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	390914	0	0	0	0	3	0	0	180	1	1
 60103019	2	0	紫金炎龙	146	0	2704	2704	0	0	0	0	40000	5815	0	0	0	0	0	0	415259	101	2500	432744	22	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	405963	0	0	0	0	3	0	0	180	1	1
@@ -747,38 +747,38 @@
 60103094	2	0	幻灵师	334	0	54690	54690	0	0	0	0	40000	99727	0	0	0	0	0	0	10460225	101	2500	1445516	99	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	28112762	0	0	0	0	3	0	0	180	1	1
 60103095	2	0	疯鲛刺客	336	0	56684	56684	0	0	0	0	40000	101527	0	0	0	0	0	0	10717869	101	2500	1454019	100	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	29334030	0	0	0	0	3	0	0	180	1	1
 60103096	2	0	惑乱妖龙	340	0	58390	58390	0	0	0	0	40000	104906	0	0	0	0	0	0	11234080	101	2500	1484160	102	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	31737362	0	0	0	0	3	0	0	180	1	1
-60103097	2	0	极变魔兵	342	0	59342	59342	0	1	0	0	40000	106646	0	0	0	0	0	0	11508579	0	0	1492739	103	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	33121333	0	0	0	0	3	0	0	180	1	1
-60103098	2	0	怒焰巨虎	344	0	60393	60393	0	1	0	0	40000	108418	0	0	0	0	0	0	11793062	0	0	1501318	103	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	34421677	0	0	0	0	3	0	0	180	1	1
-60103099	2	0	斩心剑魔	346	0	59132	59132	0	1	0	0	40000	110200	0	0	0	0	0	0	12064046	0	0	1509896	104	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	35752263	0	0	0	0	3	0	0	180	1	1
-60103100	2	0	深海君王	350	0	66099	66099	0	1	0	0	40000	122174	0	0	0	0	0	0	12826608	0	0	1540568	107	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	38478983	0	0	0	0	3	0	0	180	1	1
-60103101	2	0	阴阳狐狸	352	0	68629	68629	0	1	0	0	40000	124702	0	0	0	0	0	0	13121088	0	0	1549223	107	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	39676876	0	0	0	0	3	0	0	180	1	1
-60103102	2	0	祥云之鹤	354	0	69629	69629	0	1	0	0	40000	126620	0	0	0	0	0	0	13401434	0	0	1557878	108	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	40933362	0	0	0	0	3	0	0	180	1	1
-60103103	2	0	莽荒狼妖	356	0	68198	68198	0	1	0	0	40000	128540	0	0	0	0	0	0	13696392	0	0	1566533	108	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	42125894	0	0	0	0	3	0	0	180	1	1
-60103104	2	0	狂怒暴君	360	0	71466	71466	0	1	0	0	40000	132499	0	0	0	0	0	0	14280236	0	0	1597736	111	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	44609525	0	0	0	0	3	0	0	180	1	1
-60103105	2	0	致死花蛇	362	0	74176	74176	0	1	0	0	40000	134592	0	0	0	0	0	0	14598343	0	0	1606467	112	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	45962791	0	0	0	0	3	0	0	180	1	1
-60103106	2	0	致死毒蝎	364	0	75979	75979	0	1	0	0	40000	136459	0	0	0	0	0	0	14915454	0	0	1615198	112	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	46790247	0	0	0	0	3	0	0	180	1	1
-60103107	2	0	凶残火牛	366	0	75253	75253	0	1	0	0	40000	138282	0	0	0	0	0	0	15211677	0	0	1623928	113	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	47626065	0	0	0	0	3	0	0	180	1	1
-60103108	2	0	深海之灵	370	0	80799	80799	0	1	0	0	40000	144542	0	0	0	0	0	0	15874102	0	0	1655663	116	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	49382419	0	0	0	0	3	0	0	180	1	1
-60103109	2	0	裂牙狂豹	372	0	84381	84381	0	1	0	0	40000	146602	0	0	0	0	0	0	16173606	0	0	1664470	116	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	50508649	0	0	0	0	3	0	0	180	1	1
-60103110	2	0	马拦坡匪徒	374	0	86567	86567	0	1	0	0	40000	148581	0	0	0	0	0	0	16468037	0	0	1673276	117	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	51584800	0	0	0	0	3	0	0	180	1	1
-60103111	2	0	绿洲之灵	376	0	86008	86008	0	1	0	0	40000	150557	0	0	0	0	0	0	16766168	0	0	1682083	117	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	52608976	0	0	0	0	3	0	0	180	1	1
-60103112	2	0	致命巴蛇	380	0	92116	92116	0	1	0	0	40000	154633	0	0	0	0	0	0	17384228	0	0	1714349	120	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	54914830	0	0	0	0	3	0	0	180	1	1
-60103113	2	0	若曦	382	0	95968	95968	0	1	0	0	40000	156678	0	0	0	0	0	0	17706558	0	0	1723232	121	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	55972858	0	0	0	0	3	0	0	180	1	1
-60103114	2	0	蓝月剑客	384	0	98542	98542	0	1	0	0	40000	158823	0	0	0	0	0	0	18032840	0	0	1732114	121	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	57148777	0	0	0	0	3	0	0	180	1	1
-60103115	2	0	睚眦之魂	386	0	98352	98352	0	1	0	0	40000	161088	0	0	0	0	0	0	18367961	0	0	1740997	122	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	58279802	0	0	0	0	3	0	0	180	1	1
-60103116	2	0	古阵巨石	390	0	105471	105471	0	1	0	0	40000	165582	0	0	0	0	0	0	19035430	0	0	1758762	123	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	60752770	0	0	0	0	3	0	0	180	1	1
-60103117	2	0	鹰眼	392	0	110159	110159	0	1	0	0	40000	167882	0	0	0	0	0	0	19372098	0	0	1782753	126	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	61894570	0	0	0	0	3	0	0	180	1	1
-60103118	2	0	球球兽	394	0	113450	113450	0	1	0	0	40000	170293	0	0	0	0	0	0	19705620	0	0	1791712	126	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	63077140	0	0	0	0	3	0	0	180	1	1
-60103119	2	0	灾厄花妖	396	0	113655	113655	0	1	0	0	40000	172609	0	0	0	0	0	0	20039512	0	0	1800670	127	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	64151398	0	0	0	0	3	0	0	180	1	1
-60103120	2	0	狂躁河神	400	0	122308	122308	0	1	0	0	40000	177353	0	0	0	0	0	0	20724634	0	0	1817094	128	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	66559375	0	0	0	0	3	0	0	180	1	1
-60103121	2	0	沐日角兽	402	0	127983	127983	0	1	0	0	40000	180229	0	0	0	0	0	0	21253481	0	0	1823066	128	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	67788270	0	0	0	0	3	0	0	180	1	1
-60103122	2	0	洪荒之灵	404	0	131980	131980	0	1	0	0	40000	182629	0	0	0	0	0	0	21780389	0	0	1844539	131	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	69376120	0	0	0	0	3	0	0	180	1	1
-60103123	2	0	嗜蛊之兽	406	0	131276	131276	0	1	0	0	40000	184896	0	0	0	0	0	0	22283536	0	0	1850562	131	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	71196320	0	0	0	0	3	0	0	180	1	1
-60103124	2	0	马栏坡首领	410	0	135900	135900	0	1	0	0	40000	189264	0	0	0	0	0	0	23204085	0	0	1862608	132	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	73940599	0	0	0	0	3	0	0	180	1	1
-60103125	2	0	食人之花	412	0	139085	139085	0	1	0	0	40000	191487	0	0	0	0	0	0	23667074	0	0	1868631	132	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	75377697	0	0	0	0	3	0	0	180	1	1
-60103126	2	0	不灭龙王	414	0	140539	140539	0	1	0	0	40000	193751	0	0	0	0	0	0	24128308	0	0	1890408	134	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	76608130	0	0	0	0	3	0	0	180	1	1
-60103127	2	0	恒古之灵	416	0	138353	138353	0	1	0	0	40000	195877	0	0	0	0	0	0	24584319	0	0	1896481	135	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	77919677	0	0	0	0	3	0	0	180	1	1
-60103128	2	0	燃世麒麟	420	0	143099	143099	0	1	0	0	40000	200366	0	0	0	0	0	0	25513532	0	0	1908628	136	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	80454872	0	0	0	0	3	0	0	180	1	1
+60103097	2	0	极变魔兵	342	0	59342	59342	0	1	0	0	40000	106646	0	0	0	0	0	0	11508579	101	2500	1492739	103	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	33121333	0	0	0	0	3	0	0	180	1	1
+60103098	2	0	怒焰巨虎	344	0	60393	60393	0	1	0	0	40000	108418	0	0	0	0	0	0	11793062	101	2500	1501318	103	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	34421677	0	0	0	0	3	0	0	180	1	1
+60103099	2	0	斩心剑魔	346	0	59132	59132	0	1	0	0	40000	110200	0	0	0	0	0	0	12064046	101	2500	1509896	104	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	35752263	0	0	0	0	3	0	0	180	1	1
+60103100	2	0	深海君王	350	0	66099	66099	0	1	0	0	40000	122174	0	0	0	0	0	0	12826608	101	2500	1540568	107	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	38478983	0	0	0	0	3	0	0	180	1	1
+60103101	2	0	阴阳狐狸	352	0	68629	68629	0	1	0	0	40000	124702	0	0	0	0	0	0	13121088	101	2500	1549223	107	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	39676876	0	0	0	0	3	0	0	180	1	1
+60103102	2	0	祥云之鹤	354	0	69629	69629	0	1	0	0	40000	126620	0	0	0	0	0	0	13401434	101	2500	1557878	108	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	40933362	0	0	0	0	3	0	0	180	1	1
+60103103	2	0	莽荒狼妖	356	0	68198	68198	0	1	0	0	40000	128540	0	0	0	0	0	0	13696392	101	2500	1566533	108	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	42125894	0	0	0	0	3	0	0	180	1	1
+60103104	2	0	狂怒暴君	360	0	71466	71466	0	1	0	0	40000	132499	0	0	0	0	0	0	14280236	101	2500	1597736	111	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	44609525	0	0	0	0	3	0	0	180	1	1
+60103105	2	0	致死花蛇	362	0	74176	74176	0	1	0	0	40000	134592	0	0	0	0	0	0	14598343	101	2500	1606467	112	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	45962791	0	0	0	0	3	0	0	180	1	1
+60103106	2	0	致死毒蝎	364	0	75979	75979	0	1	0	0	40000	136459	0	0	0	0	0	0	14915454	101	2500	1615198	112	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	46790247	0	0	0	0	3	0	0	180	1	1
+60103107	2	0	凶残火牛	366	0	75253	75253	0	1	0	0	40000	138282	0	0	0	0	0	0	15211677	101	2500	1623928	113	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	47626065	0	0	0	0	3	0	0	180	1	1
+60103108	2	0	深海之灵	370	0	80799	80799	0	1	0	0	40000	144542	0	0	0	0	0	0	15874102	101	2500	1655663	116	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	49382419	0	0	0	0	3	0	0	180	1	1
+60103109	2	0	裂牙狂豹	372	0	84381	84381	0	1	0	0	40000	146602	0	0	0	0	0	0	16173606	101	2500	1664470	116	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	50508649	0	0	0	0	3	0	0	180	1	1
+60103110	2	0	马拦坡匪徒	374	0	86567	86567	0	1	0	0	40000	148581	0	0	0	0	0	0	16468037	101	2500	1673276	117	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	51584800	0	0	0	0	3	0	0	180	1	1
+60103111	2	0	绿洲之灵	376	0	86008	86008	0	1	0	0	40000	150557	0	0	0	0	0	0	16766168	101	2500	1682083	117	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	52608976	0	0	0	0	3	0	0	180	1	1
+60103112	2	0	致命巴蛇	380	0	92116	92116	0	1	0	0	40000	154633	0	0	0	0	0	0	17384228	101	2500	1714349	120	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	54914830	0	0	0	0	3	0	0	180	1	1
+60103113	2	0	若曦	382	0	95968	95968	0	1	0	0	40000	156678	0	0	0	0	0	0	17706558	101	2500	1723232	121	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	55972858	0	0	0	0	3	0	0	180	1	1
+60103114	2	0	蓝月剑客	384	0	98542	98542	0	1	0	0	40000	158823	0	0	0	0	0	0	18032840	101	2500	1732114	121	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	57148777	0	0	0	0	3	0	0	180	1	1
+60103115	2	0	睚眦之魂	386	0	98352	98352	0	1	0	0	40000	161088	0	0	0	0	0	0	18367961	101	2500	1740997	122	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	58279802	0	0	0	0	3	0	0	180	1	1
+60103116	2	0	古阵巨石	390	0	105471	105471	0	1	0	0	40000	165582	0	0	0	0	0	0	19035430	101	2500	1758762	123	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	60752770	0	0	0	0	3	0	0	180	1	1
+60103117	2	0	鹰眼	392	0	110159	110159	0	1	0	0	40000	167882	0	0	0	0	0	0	19372098	101	2500	1782753	126	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	61894570	0	0	0	0	3	0	0	180	1	1
+60103118	2	0	球球兽	394	0	113450	113450	0	1	0	0	40000	170293	0	0	0	0	0	0	19705620	101	2500	1791712	126	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	63077140	0	0	0	0	3	0	0	180	1	1
+60103119	2	0	灾厄花妖	396	0	113655	113655	0	1	0	0	40000	172609	0	0	0	0	0	0	20039512	101	2500	1800670	127	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	64151398	0	0	0	0	3	0	0	180	1	1
+60103120	2	0	狂躁河神	400	0	122308	122308	0	1	0	0	40000	177353	0	0	0	0	0	0	20724634	101	2500	1817094	128	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	66559375	0	0	0	0	3	0	0	180	1	1
+60103121	2	0	沐日角兽	402	0	127983	127983	0	1	0	0	40000	180229	0	0	0	0	0	0	21253481	101	2500	1823066	128	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	67788270	0	0	0	0	3	0	0	180	1	1
+60103122	2	0	洪荒之灵	404	0	131980	131980	0	1	0	0	40000	182629	0	0	0	0	0	0	21780389	101	2500	1844539	131	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	69376120	0	0	0	0	3	0	0	180	1	1
+60103123	2	0	嗜蛊之兽	406	0	131276	131276	0	1	0	0	40000	184896	0	0	0	0	0	0	22283536	101	2500	1850562	131	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	71196320	0	0	0	0	3	0	0	180	1	1
+60103124	2	0	马栏坡首领	410	0	135900	135900	0	1	0	0	40000	189264	0	0	0	0	0	0	23204085	101	2500	1862608	132	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	73940599	0	0	0	0	3	0	0	180	1	1
+60103125	2	0	食人之花	412	0	139085	139085	0	1	0	0	40000	191487	0	0	0	0	0	0	23667074	101	2500	1868631	132	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	75377697	0	0	0	0	3	0	0	180	1	1
+60103126	2	0	不灭龙王	414	0	140539	140539	0	1	0	0	40000	193751	0	0	0	0	0	0	24128308	101	2500	1890408	134	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	76608130	0	0	0	0	3	0	0	180	1	1
+60103127	2	0	恒古之灵	416	0	138353	138353	0	1	0	0	40000	195877	0	0	0	0	0	0	24584319	101	2500	1896481	135	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	77919677	0	0	0	0	3	0	0	180	1	1
+60103128	2	0	燃世麒麟	420	0	143099	143099	0	1	0	0	40000	200366	0	0	0	0	0	0	25513532	101	2500	1908628	136	0	300	2	5	23030	0	0	0	0	0	0	0	0	40	2	80454872	0	0	0	0	3	0	0	180	1	1
 60204001	8	0	帅气三哥	20	1	203	203	0	0	0	0	0	5	0	0	0	0	0	0	0	0	1200	63582	7	0	300	0	6	0	0	0	0	0	0	0	0	0	10	2	100000	100	0	0	0	0	0	0	186	1	1
 60204002	8	0	我一只手就	20	1	211	211	0	0	0	0	0	7	0	0	0	0	0	0	0	0	1200	63582	7	0	300	0	6	0	0	0	0	0	0	0	0	0	10	2	100000	100	0	0	0	0	0	0	186	1	1
 60204003	8	0	狂战天下	20	1	215	215	0	0	0	0	0	8	0	0	0	0	0	0	0	0	1200	63582	7	0	300	0	6	0	0	0	0	0	0	0	0	0	10	2	100000	100	0	0	0	0	0	0	186	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index fc203f2..abb6093 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -2209,21 +2209,21 @@
 32357	生命转换	32350	8	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	320	7	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20600	0	0	0	0	0	0	0	2	227	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 32358	生命转换	32350	9	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	360	7	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20600	0	0	0	0	0	0	0	2	454	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 32359	生命转换	32350	10	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	400	7	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20600	0	0	0	0	0	0	0	2	682	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32400	真实转换	32400	1	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	50	33	1000500	519	50	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	909	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32401	真实转换	32400	2	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	75	33	1000500	519	75	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	1136	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32402	真实转换	32400	3	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	100	33	1000500	519	100	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	1364	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32403	真实转换	32400	4	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	125	33	1000500	519	125	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	1591	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32404	真实转换	32400	5	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	150	33	1000500	519	150	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	1818	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32405	真实转换	32400	6	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	175	33	1000500	519	175	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2046	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32406	真实转换	32400	7	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	200	33	1000500	519	200	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2273	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32407	真实转换	32400	8	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	225	33	1000500	519	225	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32408	真实转换	32400	9	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	250	33	1000500	519	250	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2728	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32409	真实转换	32400	10	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	275	33	1000500	519	275	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2955	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32410	真实转换	32400	11	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	300	33	1000500	519	300	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2046	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32411	真实转换	32400	12	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	325	33	1000500	519	325	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2273	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32412	真实转换	32400	13	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	350	33	1000500	519	350	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32413	真实转换	32400	14	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	375	33	1000500	519	375	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2728	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-32414	真实转换	32400	15	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	400	33	1000500	519	400	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2955	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32400	真实转换	32400	1	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	50	33	1000500	518	50	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	909	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32401	真实转换	32400	2	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	75	33	1000500	518	75	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	1136	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32402	真实转换	32400	3	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	100	33	1000500	518	100	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	1364	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32403	真实转换	32400	4	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	125	33	1000500	518	125	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	1591	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32404	真实转换	32400	5	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	150	33	1000500	518	150	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	1818	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32405	真实转换	32400	6	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	175	33	1000500	518	175	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2046	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32406	真实转换	32400	7	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	200	33	1000500	518	200	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2273	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32407	真实转换	32400	8	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	225	33	1000500	518	225	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32408	真实转换	32400	9	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	250	33	1000500	518	250	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2728	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32409	真实转换	32400	10	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	275	33	1000500	518	275	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2955	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32410	真实转换	32400	11	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	300	33	1000500	518	300	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2046	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32411	真实转换	32400	12	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	325	33	1000500	518	325	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2273	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32412	真实转换	32400	13	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	350	33	1000500	518	350	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32413	真实转换	32400	14	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	375	33	1000500	518	375	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2728	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+32414	真实转换	32400	15	15	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	400	33	1000500	518	400	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	32350	6	0	30010	0	0	0	2	2955	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 32450	攻击转换	32450	1	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	40	9	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	21200	32400	6	0	30020	0	0	0	2	3183	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 32451	攻击转换	32450	2	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	80	9	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	21200	32400	6	0	30020	0	0	0	2	3410	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 32452	攻击转换	32450	3	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	120	9	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	21200	32400	6	0	30020	0	0	0	2	3637	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -3621,21 +3621,21 @@
 37407	生命转换	37400	8	10	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	320	7	2000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50600	0	0	0	0	0	0	0	2	2500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 37408	生命转换	37400	9	10	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	360	7	2000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50600	0	0	0	0	0	0	0	2	2728	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 37409	生命转换	37400	10	10	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	400	7	2000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50600	0	0	0	0	0	0	0	2	2955	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37450	真实转换	37450	1	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	50	33	2000500	519	50	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	3183	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37451	真实转换	37450	2	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	75	33	2000500	519	75	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	3410	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37452	真实转换	37450	3	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	100	33	2000500	519	100	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	3637	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37453	真实转换	37450	4	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	125	33	2000500	519	125	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	3865	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37454	真实转换	37450	5	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	150	33	2000500	519	150	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4092	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37455	真实转换	37450	6	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	175	33	2000500	519	175	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4319	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37456	真实转换	37450	7	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	200	33	2000500	519	200	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4547	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37457	真实转换	37450	8	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	225	33	2000500	519	225	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4774	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37458	真实转换	37450	9	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	250	33	2000500	519	250	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	5001	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37459	真实转换	37450	10	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	275	33	2000500	519	275	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	5229	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37460	真实转换	37450	11	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	300	33	2000500	519	300	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4319	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37461	真实转换	37450	12	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	325	33	2000500	519	325	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4547	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37462	真实转换	37450	13	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	350	33	2000500	519	350	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4774	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37463	真实转换	37450	14	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	375	33	2000500	519	375	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	5001	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-37464	真实转换	37450	15	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	519	400	33	2000500	519	400	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	5229	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37450	真实转换	37450	1	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	50	33	2000500	518	50	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	3183	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37451	真实转换	37450	2	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	75	33	2000500	518	75	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	3410	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37452	真实转换	37450	3	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	100	33	2000500	518	100	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	3637	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37453	真实转换	37450	4	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	125	33	2000500	518	125	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	3865	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37454	真实转换	37450	5	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	150	33	2000500	518	150	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4092	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37455	真实转换	37450	6	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	175	33	2000500	518	175	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4319	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37456	真实转换	37450	7	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	200	33	2000500	518	200	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4547	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37457	真实转换	37450	8	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	225	33	2000500	518	225	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4774	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37458	真实转换	37450	9	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	250	33	2000500	518	250	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	5001	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37459	真实转换	37450	10	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	275	33	2000500	518	275	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	5229	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37460	真实转换	37450	11	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	300	33	2000500	518	300	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4319	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37461	真实转换	37450	12	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	325	33	2000500	518	325	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4547	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37462	真实转换	37450	13	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	350	33	2000500	518	350	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	4774	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37463	真实转换	37450	14	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	375	33	2000500	518	375	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	5001	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+37464	真实转换	37450	15	15	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	400	33	2000500	518	400	38	1000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	37400	6	0	30010	0	0	0	2	5229	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 37500	攻击转换	37500	1	10	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	40	9	2000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	37450	6	0	30020	0	0	0	2	5456	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 37501	攻击转换	37500	2	10	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	80	9	2000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	37450	6	0	30020	0	0	0	2	5684	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 37502	攻击转换	37500	3	10	4	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	518	120	9	2000500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	37450	6	0	30020	0	0	0	2	254	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0