From 3fcdcf362338c95da9ec3933c6f7ba2d2da2b03e Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期五, 28 九月 2018 22:40:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagActBossReborn.txt                                |    3 
 db/PyMongoDataServer/PySysDB/tagHorseUp.txt                                      |  150 +++++++--------
 db/PyMongoDataServer/PySysDB/tagStore.txt                                        |    1 
 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt                                |    2 
 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt                             |    2 
 db/PyMongoDataServer/PySysDB/tagAlchemy.txt                                      |   10 
 db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt                                |   96 +++++-----
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt                                 |    4 
 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt                          |    3 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagRealm.txt                                        |   36 ++--
 webbottle/Config.ini                                                             |    8 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                   |    6 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip                    |    0 
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt                                  |   34 +-
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                      |    9 +
 db/PyMongoDataServer/PySysDB/tagPetClassCost.txt                                 |   60 +++---
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt                                  |    6 
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt                        |   43 ++--
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt                              |   43 ++--
 db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt                                  |    8 
 21 files changed, 264 insertions(+), 260 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 933f06c..b1eb882 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,2 +1,3 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV	TemplateID
-1	OpenSever	[]	9	10	1	{0:["BossFHOpen", []]}	{}	110	1
+1	OpenSever1	[]	3	5	1	{0:["BossFHOpen", []]}	{}	110	1
+2	OpenSever2	[]	9	11	1	{0:["BossFHOpen", []]}	{}	110	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index a6f9dbf..c1e3bd5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,2 +1,2 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	StartTime	EndTime	NotifyInfoStart	NotifyInfoEnd	LimitLV	AddExpRate
-1	OpenServer	[]	8	8	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	110	10000
+1	OpenServer	[]	6	6	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	110	10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 1fe5ba3..9462109 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,23 +1,22 @@
 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	[]	4	4			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-3	OpenServer03	[]	6	6			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
-4	OpenServer04	[]	7	7			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	180	0
-5	OpenServer05	[]	10	10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	280	0
-6	NationalDay	[]	2018-9-1	2018-9-3			120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
-7	NationalDay	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
-8	1OpenServer01	[7001]	2018-9-7	2018-9-7			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-9	1OpenServer02	[7001]	2018-9-9	2018-9-9			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-10	1OpenServer03	[7001]	2018-9-11	2018-9-11			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-11	1OpenServer04	[7001]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-12	1OpenServer05	[7001]	2018-9-15	2018-9-15			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-13	2OpenServer01	[7002]	2018-9-8	2018-9-8			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-14	2OpenServer02	[7002]	2018-9-10	2018-9-10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-15	2OpenServer03	[7002]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-16	2OpenServer04	[7002]	2018-9-13	2018-9-13			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-17	2OpenServer05	[7002]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-18	3OpenServer01	[7003]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-19	3OpenServer02	[7003]	2018-9-14	2018-9-14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-20	3OpenServer03	[7003]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-21	3OpenServer04	[7003]	2018-9-17	2018-9-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-22	3OpenServer05	[7003]	2018-9-20	2018-9-20			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+1	OpenServer01	[]	3	4			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+2	OpenServer02	[]	5	6			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+3	OpenServer03	[]	7	8			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+4	OpenServer04	[]	9	10			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+5	NationalDay	[]	2018-9-1	2018-9-3			120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
+6	NationalDay	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
+7	1OpenServer01	[7001]	2018-9-7	2018-9-7			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+8	1OpenServer02	[7001]	2018-9-9	2018-9-9			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+9	1OpenServer03	[7001]	2018-9-11	2018-9-11			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+10	1OpenServer04	[7001]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+11	1OpenServer05	[7001]	2018-9-15	2018-9-15			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+12	2OpenServer01	[7002]	2018-9-8	2018-9-8			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+13	2OpenServer02	[7002]	2018-9-10	2018-9-10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+14	2OpenServer03	[7002]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+15	2OpenServer04	[7002]	2018-9-13	2018-9-13			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+16	2OpenServer05	[7002]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+17	3OpenServer01	[7003]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+18	3OpenServer02	[7003]	2018-9-14	2018-9-14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+19	3OpenServer03	[7003]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+20	3OpenServer04	[7003]	2018-9-17	2018-9-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+21	3OpenServer05	[7003]	2018-9-20	2018-9-20			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index f5ee0bc..d88ea94 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
index 8e54fb5..a2fdeac 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index d0cc53a..9ee58df 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -1,2 +1,3 @@
 CfgID	StartDate	EndDate	ResetType	LimitLV	TemplateID
-1	9	10	1	110	1
+1	3	5	1	110	1
+2	9	11	1	110	1
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 2d9cae7..3ac62f2 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,23 +1,22 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	GiftbagList	MailKey	MailItemPrize
-1	2	2			120	50	0	[[2]]	SellMail4	[[181,2,1],[4151,2,1]]
-2	4	4			120	50	0	[[4]]	SellMail4	[[181,2,1],[4151,2,1]]
-3	6	6			120	50	0	[[1]]	SellMail4	[[181,2,1],[4151,2,1]]
-4	7	7			0	180	0	[[3]]	SellMail4	[[181,2,1],[4151,2,1]]
-5	10	10			120	280	0	[[5]]	SellMail4	[[181,2,1],[4151,2,1]]
-6	2018-9-1	2018-9-3			120	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
-7	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-8	2018-9-7	2018-9-7			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-9	2018-9-9	2018-9-9			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-10	2018-9-11	2018-9-11			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-11	2018-9-12	2018-9-12			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-12	2018-9-15	2018-9-15			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-13	2018-9-8	2018-9-8			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-14	2018-9-10	2018-9-10			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-15	2018-9-12	2018-9-12			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-16	2018-9-13	2018-9-13			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-17	2018-9-16	2018-9-16			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-18	2018-9-12	2018-9-12			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-19	2018-9-14	2018-9-14			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-20	2018-9-16	2018-9-16			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-21	2018-9-17	2018-9-17			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-22	2018-9-20	2018-9-20			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+1	3	4			120	50	0	[[6]]	SellMail4	[[181,2,1],[4151,2,1]]
+2	5	6			0	50	0	[[7]]	SellMail4	[[181,2,1],[4151,2,1]]
+3	7	8			0	50	0	[[8]]	SellMail4	[[181,2,1],[4151,2,1]]
+4	9	10			0	50	0	[[9]]	SellMail4	[[181,2,1],[4151,2,1]]
+5	2018-9-1	2018-9-3			120	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
+6	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+7	2018-9-7	2018-9-7			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+8	2018-9-9	2018-9-9			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+9	2018-9-11	2018-9-11			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+10	2018-9-12	2018-9-12			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+11	2018-9-15	2018-9-15			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+12	2018-9-8	2018-9-8			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+13	2018-9-10	2018-9-10			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+14	2018-9-12	2018-9-12			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+15	2018-9-13	2018-9-13			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+16	2018-9-16	2018-9-16			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+17	2018-9-12	2018-9-12			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+18	2018-9-14	2018-9-14			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+19	2018-9-16	2018-9-16			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+20	2018-9-17	2018-9-17			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+21	2018-9-20	2018-9-20			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemy.txt b/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
index b8f39b6..1f5492b 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
@@ -1,7 +1,7 @@
 AlchemyID	MaterialAll	AlchemyEXP	AlchemyItem	SpecialItem	AlchemyIUp	BlastFurnaceLV
 101	4611_1|4613_1|4612_1|4614_1|4615_1	50	[[10000,4706,1]]		[]	1
-102	4611_2|4613_1|4612_2|4614_1|4615_1	84	[[5000,4707,1],[5000,4716,1]]	1	[]	2
-103	4611_2|4613_2|4612_2|4614_2|4615_2	144	[[4682,4712,1],[1603,4708,1],[1667,4717,1],[1923,4721,1],[125,4740,1]]	2|11	[]	3
-104	4611_3|4613_3|4612_3|4614_3|4615_3	260	[[3657,4713,1],[1294,4709,1],[1333,4718,1],[1552,4722,1],[1940,4725,1],[24,4656,1],[24,4657,1],[24,4664,1],[24,4669,1],[24,4670,1],[24,4674,1],[24,4675,1],[56,4730,1]]	12|21|31	[]	4
-105	4611_4|4613_4|4612_4|4614_4|4615_4	415	[[3305,4714,1],[1180,4710,1],[1111,4719,1],[1416,4723,1],[1573,4726,1],[1180,4728,1],[42,4670,1],[42,4671,1],[42,4685,1],[42,4686,1],[67,4731,1]]	22|32	[]	5
-106	4611_5|4613_5|4612_5|4614_5|4615_5	622	[[3162,4715,1],[1193,4711,1],[1111,4720,1],[1432,4724,1],[1491,4727,1],[1193,4729,1],[42,4654,1],[42,4705,1],[125,4732,1],[125,4733,1],[42,4694,1],[42,4695,1]]	41	[]	6
+102	4611_2|4613_2|4612_2|4614_2|4615_2	84	[[5000,4707,1],[5000,4716,1]]	1	[]	2
+103	4611_3|4613_3|4612_3|4614_3|4615_3	144	[[4682,4712,1],[1603,4708,1],[1667,4717,1],[1923,4721,1],[125,4740,1]]	2|11	[]	3
+104	4611_4|4613_4|4612_4|4614_4|4615_4	260	[[3657,4713,1],[1294,4709,1],[1333,4718,1],[1552,4722,1],[1940,4725,1],[24,4656,1],[24,4657,1],[24,4664,1],[24,4669,1],[24,4670,1],[24,4674,1],[24,4675,1],[56,4730,1]]	12|21|31	[]	4
+105	4611_5|4613_5|4612_5|4614_5|4615_5	415	[[3305,4714,1],[1180,4710,1],[1111,4719,1],[1416,4723,1],[1573,4726,1],[1180,4728,1],[42,4670,1],[42,4671,1],[42,4685,1],[42,4686,1],[67,4731,1]]	22|32	[]	5
+106	4611_6|4613_6|4612_6|4614_6|4615_6	622	[[3162,4715,1],[1193,4711,1],[1111,4720,1],[1432,4724,1],[1491,4727,1],[1193,4729,1],[42,4654,1],[42,4705,1],[125,4732,1],[125,4733,1],[42,4694,1],[42,4695,1]]	41	[]	6
diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
index 6a95f9b..da2c2d3 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
@@ -1,8 +1,8 @@
 ID	SpecialMaterialD	SpecialMateriaNUM	AlchemyEXP	AlchemyItem	BlastFurnaceLV
-1	4609	1	134	[[9000,4655,1],[1000,1128,1]]	2
-2	4609	1	194	[[9000,4691,1],[1000,1128,1]]	3
-11	4610	1	244	[[9000,4687,1],[1000,4681,1]]	3
-12	4610	1	359	[[9000,4692,1],[1000,4681,1]]	4
+1	4609	1	134	[[9500,4655,1],[500,1128,1]]	2
+2	4609	1	194	[[9500,4691,1],[500,1128,1]]	3
+11	4610	1	244	[[9500,4687,1],[500,4681,1]]	3
+12	4610	1	359	[[9500,4692,1],[500,4681,1]]	4
 21	4608	1	509	[[6500,4660,1],[2000,200,1],[1500,4680,1]]	4
 22	4608	1	665	[[7000,4661,1],[1500,201,1],[1500,4680,1]]	5
 31	4606	1	759	[[9200,4183,1],[800,4206,1]]	4
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index f6a255a..476d397 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -105,15 +105,15 @@
 2311	0			[[380,[10621,1]],[760,[10622,1]],[1140,[10623,1]],[1520,[10624,1]],[1900,[10625,1]],[2280,[10626,1]],[2660,[10627,1]],[2755,[10631,1]],[2850,[10632,1]],[2945,[10633,1]],[3040,[10634,1]],[3135,[10635,1]],[3230,[10636,1]],[3325,[10637,1]],[3372,[10641,1]],[3419,[10642,1]],[3466,[10643,1]],[3513,[10644,1]],[3560,[10645,1]],[3607,[10646,1]],[3654,[10647,1]],[4560,[10611,1]],[5466,[10612,1]],[6372,[10613,1]],[7278,[10614,1]],[8184,[10615,1]],[9090,[10616,1]],[10000,[10617,1]]]	6	[[285,[10651,1]],[570,[10652,1]],[855,[10653,1]],[1140,[10654,1]],[1425,[10655,1]],[1710,[10656,1]],[1995,[10657,1]],[2052,[10671,1]],[2109,[10672,1]],[2166,[10673,1]],[2223,[10674,1]],[2280,[10675,1]],[2337,[10676,1]],[2394,[10677,1]],[10000,[0,0]]]	1		[[10621,20621,30621],[10622,20622,30622],[10623,20623,30623],[10624,20624,30624],[10625,20625,30625],[10626,20626,30626],[10627,20627,30627],[10631,20631,30631],[10632,20632,30632],[10633,20633,30633],[10634,20634,30634],[10635,20635,30635],[10636,20636,30636],[10637,20637,30637],[10641,20641,30641],[10642,20642,30642],[10643,20643,30643],[10644,20644,30644],[10645,20645,30645],[10646,20646,30646],[10647,20647,30647],[10611,20611,30611],[10612,20612,30612],[10613,20613,30613],[10614,20614,30614],[10615,20615,30615],[10616,20616,30616],[10617,20617,30617],[10651,20651,30651],[10652,20652,30652],[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10671,20671,30671],[10672,20672,30672],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]]			[10651,10652,10653,10654,10655,10656,10657,20651,20652,20653,20654,20655,20656,20657,30651,30652,30653,30654,30655,30656,30657,10671,10672,10673,10674,10675,10676,10677,20671,20672,20673,20674,20675,20676,20677,30671,30672,30673,30674,30675,30676,30677]
 2312	0			[[457,[10621,1]],[914,[10622,1]],[1371,[10623,1]],[1828,[10624,1]],[2285,[10625,1]],[2742,[10626,1]],[3199,[10627,1]],[3313,[10631,1]],[3427,[10632,1]],[3541,[10633,1]],[3655,[10634,1]],[3769,[10635,1]],[3883,[10636,1]],[3997,[10637,1]],[4054,[10641,1]],[4111,[10642,1]],[4168,[10643,1]],[4225,[10644,1]],[4282,[10645,1]],[4339,[10646,1]],[4396,[10647,1]],[5196,[10611,1]],[5996,[10612,1]],[6796,[10613,1]],[7596,[10614,1]],[8396,[10615,1]],[9196,[10616,1]],[10000,[10617,1]]]	10	[[571,[10651,1]],[1142,[10652,1]],[1713,[10653,1]],[2284,[10654,1]],[2855,[10655,1]],[3426,[10656,1]],[3997,[10657,1]],[4111,[10671,1]],[4225,[10672,1]],[4339,[10673,1]],[4453,[10674,1]],[4567,[10675,1]],[4681,[10676,1]],[4795,[10677,1]],[10000,[0,0]]]	1		[[10621,20621,30621],[10622,20622,30622],[10623,20623,30623],[10624,20624,30624],[10625,20625,30625],[10626,20626,30626],[10627,20627,30627],[10631,20631,30631],[10632,20632,30632],[10633,20633,30633],[10634,20634,30634],[10635,20635,30635],[10636,20636,30636],[10637,20637,30637],[10641,20641,30641],[10642,20642,30642],[10643,20643,30643],[10644,20644,30644],[10645,20645,30645],[10646,20646,30646],[10647,20647,30647],[10611,20611,30611],[10612,20612,30612],[10613,20613,30613],[10614,20614,30614],[10615,20615,30615],[10616,20616,30616],[10617,20617,30617],[10651,20651,30651],[10652,20652,30652],[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10671,20671,30671],[10672,20672,30672],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]]			[10651,10652,10653,10654,10655,10656,10657,20651,20652,20653,20654,20655,20656,20657,30651,30652,30653,30654,30655,30656,30657,10671,10672,10673,10674,10675,10676,10677,20671,20672,20673,20674,20675,20676,20677,30671,30672,30673,30674,30675,30676,30677]
 2317	0		109_5|106_5|103_5									
-2318	0		4611_2|4612_2|4613_1|4614_1|4615_1									
-2319	0		4609_1|4611_2|4612_2|4613_1|4614_1|4615_1									
+2318	0		4611_2|4612_2|4613_2|4614_2|4615_2									
+2319	0		4609_1|4611_2|4612_2|4613_2|4614_2|4615_2									
 2320	0	4611_5|4612_5|4613_5|4614_5|4615_5										
 2321	0		4611_1|4612_1|4613_1|4614_1|4615_1									
 2322	0		4611_1|4612_1|4613_1|4614_1|4615_1	[[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]]	2							
 2323	0		4611_1|4612_1|4613_1|4614_1|4615_1	[[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]]	[[5000,3],[10000,4]]							
 2324	0		4611_2|4612_2|4613_2|4614_2|4615_2									
 2325	0		181_10									
-2326	0		4610_1|4611_2|4612_2|4613_2|4614_2|4615_2									
+2326	0		4610_1|4611_3|4612_3|4613_3|4614_3|4615_3									
 2327	0		3502_2|3512_2									
 2328	0		3504_2|3514_2									
 2329	0		5012_20						[[5012,5022]]			
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt b/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
index 81a2ec7..53a6665 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
@@ -7,30 +7,30 @@
 2	1	6	0	1	6|18	26171|250	2	7|20	1308|250	3	6|7|18	26171|1308|500
 2	1	7	0	1	6|18	41599|250	2	7|20	2080|250	3	6|7|18	41599|2080|500
 2	1	8	0	1	6|18	66349|250	2	7|20	3317|250	3	6|7|18	66349|3317|500
-1	1	1	1	2	7|18	103|500	3	6|18|51	4100|500|400	5	7|19	103|300
-1	1	2	1	2	7|18	284|500	3	6|18|51	11346|500|400	5	7|19	284|300
-1	1	3	1	2	7|18	497|500	3	6|18|51	19874|500|400	5	7|19	497|300
-1	1	4	1	2	7|18	766|500	3	6|18|51	30616|500|400	5	7|19	766|300
-1	1	5	1	2	7|18	1134|500	3	6|18|51	45333|500|400	5	7|19	1134|300
-1	1	6	1	2	7|18	1705|500	3	6|18|51	68193|500|400	5	7|19	1705|300
-1	1	7	1	2	7|18	2570|500	3	6|18|51	102773|500|400	5	7|19	2570|300
-1	1	8	1	2	7|18	3928|500	3	6|18|51	157112|500|400	5	7|19	3928|300
-1	1	1	2	2	7|18	103|500	3	6|18|51	4100|500|400	5	7|19	103|300
-1	1	2	2	2	7|18	284|500	3	6|18|51	11346|500|400	5	7|19	284|300
-1	1	3	2	2	7|18	497|500	3	6|18|51	19874|500|400	5	7|19	497|300
-1	1	4	2	2	7|18	766|500	3	6|18|51	30616|500|400	5	7|19	766|300
-1	1	5	2	2	7|18	1134|500	3	6|18|51	45333|500|400	5	7|19	1134|300
-1	1	6	2	2	7|18	1705|500	3	6|18|51	68193|500|400	5	7|19	1705|300
-1	1	7	2	2	7|18	2570|500	3	6|18|51	102773|500|400	5	7|19	2570|300
-1	1	8	2	2	7|18	3928|500	3	6|18|51	157112|500|400	5	7|19	3928|300
-1	1	1	3	2	7|18	103|500	3	6|18|51	4100|500|400	5	7|19	103|300
-1	1	2	3	2	7|18	284|500	3	6|18|51	11346|500|400	5	7|19	284|300
-1	1	3	3	2	7|18	497|500	3	6|18|51	19874|500|400	5	7|19	497|300
-1	1	4	3	2	7|18	766|500	3	6|18|51	30616|500|400	5	7|19	766|300
-1	1	5	3	2	7|18	1134|500	3	6|18|51	45333|500|400	5	7|19	1134|300
-1	1	6	3	2	7|18	1705|500	3	6|18|51	68193|500|400	5	7|19	1705|300
-1	1	7	3	2	7|18	2570|500	3	6|18|51	102773|500|400	5	7|19	2570|300
-1	1	8	3	2	7|18	3928|500	3	6|18|51	157112|500|400	5	7|19	3928|300
+1	1	1	1	2	7|18	612|750	3	6|18|20	24480|750|400	5	7|19	612|450
+1	1	2	1	2	7|18	977|750	3	6|18|20	39078|750|400	5	7|19	977|450
+1	1	3	1	2	7|18	1379|750	3	6|18|20	55160|750|400	5	7|19	1379|450
+1	1	4	1	2	7|18	1841|750	3	6|18|20	73640|750|400	5	7|19	1841|450
+1	1	5	1	2	7|18	2336|750	3	6|18|20	93436|750|400	5	7|19	2336|450
+1	1	6	1	2	7|18	2908|750	3	6|18|20	116296|750|400	5	7|19	2908|450
+1	1	7	1	2	7|18	3776|750	3	6|18|20	151029|750|400	5	7|19	3776|450
+1	1	8	1	2	7|18	5141|750	3	6|18|20	205618|750|400	5	7|19	5141|450
+1	1	1	2	2	7|18	612|750	3	6|18|20	24480|750|400	5	7|19	612|450
+1	1	2	2	2	7|18	977|750	3	6|18|20	39078|750|400	5	7|19	977|450
+1	1	3	2	2	7|18	1379|750	3	6|18|20	55160|750|400	5	7|19	1379|450
+1	1	4	2	2	7|18	1841|750	3	6|18|20	73640|750|400	5	7|19	1841|450
+1	1	5	2	2	7|18	2336|750	3	6|18|20	93436|750|400	5	7|19	2336|450
+1	1	6	2	2	7|18	2908|750	3	6|18|20	116296|750|400	5	7|19	2908|450
+1	1	7	2	2	7|18	3776|750	3	6|18|20	151029|750|400	5	7|19	3776|450
+1	1	8	2	2	7|18	5141|750	3	6|18|20	205618|750|400	5	7|19	5141|450
+1	1	1	3	2	7|18	612|750	3	6|18|20	24480|750|400	5	7|19	612|450
+1	1	2	3	2	7|18	977|750	3	6|18|20	39078|750|400	5	7|19	977|450
+1	1	3	3	2	7|18	1379|750	3	6|18|20	55160|750|400	5	7|19	1379|450
+1	1	4	3	2	7|18	1841|750	3	6|18|20	73640|750|400	5	7|19	1841|450
+1	1	5	3	2	7|18	2336|750	3	6|18|20	93436|750|400	5	7|19	2336|450
+1	1	6	3	2	7|18	2908|750	3	6|18|20	116296|750|400	5	7|19	2908|450
+1	1	7	3	2	7|18	3776|750	3	6|18|20	151029|750|400	5	7|19	3776|450
+1	1	8	3	2	7|18	5141|750	3	6|18|20	205618|750|400	5	7|19	5141|450
 2	2	1	0	1	6|18	6216|500	2	7|20	311|500	3	6|7|18	6216|311|1000
 2	2	2	0	1	6|18	14133|500	2	7|20	706|500	3	6|7|18	14133|706|1000
 2	2	3	0	1	6|18	21633|500	2	7|20	1081|500	3	6|7|18	21633|1081|1000
@@ -39,27 +39,27 @@
 2	2	6	0	1	6|18	84942|500	2	7|20	4247|500	3	6|7|18	84942|4247|1000
 2	2	7	0	1	6|18	135399|500	2	7|20	6770|500	3	6|7|18	135399|6770|1000
 2	2	8	0	1	6|18	216399|500	2	7|20	10820|500	3	6|7|18	216399|10820|1000
-1	2	1	1	2	7|18	154|750	3	6|18|51	6150|750|500	5	7|19	154|450
-1	2	2	1	2	7|18	426|750	3	6|18|51	17019|750|500	5	7|19	426|450
-1	2	3	1	2	7|18	746|750	3	6|18|51	29811|750|500	5	7|19	746|450
-1	2	4	1	2	7|18	1149|750	3	6|18|51	45924|750|500	5	7|19	1149|450
-1	2	5	1	2	7|18	1701|750	3	6|18|51	68000|750|500	5	7|19	1701|450
-1	2	6	1	2	7|18	2558|750	3	6|18|51	102290|750|500	5	7|19	2558|450
-1	2	7	1	2	7|18	3855|750	3	6|18|51	154160|750|500	5	7|19	3855|450
-1	2	8	1	2	7|18	5892|750	3	6|18|51	235668|750|500	5	7|19	5892|450
-1	2	1	2	2	7|18	154|750	3	6|18|51	6150|750|500	5	7|19	154|450
-1	2	2	2	2	7|18	426|750	3	6|18|51	17019|750|500	5	7|19	426|450
-1	2	3	2	2	7|18	746|750	3	6|18|51	29811|750|500	5	7|19	746|450
-1	2	4	2	2	7|18	1149|750	3	6|18|51	45924|750|500	5	7|19	1149|450
-1	2	5	2	2	7|18	1701|750	3	6|18|51	68000|750|500	5	7|19	1701|450
-1	2	6	2	2	7|18	2558|750	3	6|18|51	102290|750|500	5	7|19	2558|450
-1	2	7	2	2	7|18	3855|750	3	6|18|51	154160|750|500	5	7|19	3855|450
-1	2	8	2	2	7|18	5892|750	3	6|18|51	235668|750|500	5	7|19	5892|450
-1	2	1	3	2	7|18	154|750	3	6|18|51	6150|750|500	5	7|19	154|450
-1	2	2	3	2	7|18	426|750	3	6|18|51	17019|750|500	5	7|19	426|450
-1	2	3	3	2	7|18	746|750	3	6|18|51	29811|750|500	5	7|19	746|450
-1	2	4	3	2	7|18	1149|750	3	6|18|51	45924|750|500	5	7|19	1149|450
-1	2	5	3	2	7|18	1701|750	3	6|18|51	68000|750|500	5	7|19	1701|450
-1	2	6	3	2	7|18	2558|750	3	6|18|51	102290|750|500	5	7|19	2558|450
-1	2	7	3	2	7|18	3855|750	3	6|18|51	154160|750|500	5	7|19	3855|450
-1	2	8	3	2	7|18	5892|750	3	6|18|51	235668|750|500	5	7|19	5892|450
+1	2	1	1	2	7|18	918|1000	3	6|18|20	36720|1000|600	5	7|19	918|600
+1	2	2	1	2	7|18	1466|1000	3	6|18|20	58617|1000|600	5	7|19	1466|600
+1	2	3	1	2	7|18	2069|1000	3	6|18|20	82740|1000|600	5	7|19	2069|600
+1	2	4	1	2	7|18	2762|1000	3	6|18|20	110460|1000|600	5	7|19	2762|600
+1	2	5	1	2	7|18	3504|1000	3	6|18|20	140154|1000|600	5	7|19	3504|600
+1	2	6	1	2	7|18	4362|1000	3	6|18|20	174444|1000|600	5	7|19	4362|600
+1	2	7	1	2	7|18	5664|1000	3	6|18|20	226544|1000|600	5	7|19	5664|600
+1	2	8	1	2	7|18	7711|1000	3	6|18|20	308427|1000|600	5	7|19	7711|600
+1	2	1	2	2	7|18	918|1000	3	6|18|20	36720|1000|600	5	7|19	918|600
+1	2	2	2	2	7|18	1466|1000	3	6|18|20	58617|1000|600	5	7|19	1466|600
+1	2	3	2	2	7|18	2069|1000	3	6|18|20	82740|1000|600	5	7|19	2069|600
+1	2	4	2	2	7|18	2762|1000	3	6|18|20	110460|1000|600	5	7|19	2762|600
+1	2	5	2	2	7|18	3504|1000	3	6|18|20	140154|1000|600	5	7|19	3504|600
+1	2	6	2	2	7|18	4362|1000	3	6|18|20	174444|1000|600	5	7|19	4362|600
+1	2	7	2	2	7|18	5664|1000	3	6|18|20	226544|1000|600	5	7|19	5664|600
+1	2	8	2	2	7|18	7711|1000	3	6|18|20	308427|1000|600	5	7|19	7711|600
+1	2	1	3	2	7|18	918|1000	3	6|18|20	36720|1000|600	5	7|19	918|600
+1	2	2	3	2	7|18	1466|1000	3	6|18|20	58617|1000|600	5	7|19	1466|600
+1	2	3	3	2	7|18	2069|1000	3	6|18|20	82740|1000|600	5	7|19	2069|600
+1	2	4	3	2	7|18	2762|1000	3	6|18|20	110460|1000|600	5	7|19	2762|600
+1	2	5	3	2	7|18	3504|1000	3	6|18|20	140154|1000|600	5	7|19	3504|600
+1	2	6	3	2	7|18	4362|1000	3	6|18|20	174444|1000|600	5	7|19	4362|600
+1	2	7	3	2	7|18	5664|1000	3	6|18|20	226544|1000|600	5	7|19	5664|600
+1	2	8	3	2	7|18	7711|1000	3	6|18|20	308427|1000|600	5	7|19	7711|600
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 64099d5..fd874e0 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -4,3 +4,7 @@
 5	3	200	1	[(7002,1,0),(4608,2,0)]	7002	LimitGift3
 7	4	320	1	[(4214,1,0),(4151,200,0)]	4214	LimitGift3
 8	5	600	1	[(4606,2,0),(4607,2,0)]	4606	LimitGift3
+4	6	70	1	[(4215,1,1),(4151,40,1)]	4215	LimitGift3
+6	7	210	1	[(263,1,1),(181,120,1)]	263	LimitGift3
+5	8	140	1	[(4220,1,1),(4151,80,1)]	4220	LimitGift3
+8	9	360	1	[(262,1,1),(181,200,1)]	262	LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1e73c0f..e140166 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -116,7 +116,7 @@
 EquipDropPartSets	{102:[1,2],105:[3,4,5,6,7],107:[1,2,3,4,5,6,7],108:[8],204:[4],205:[5],206:[6]}				
 FamilyBOSSDropRule	6000+grade*800	min(2*playerCount,50)			
 FBGradeEquipDropRate	{}	{}	{30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1131,4],[1134,4]], 4:[[1016,1],[1131,6],[1134,6]], 5:[[1015,1],[1131,8],[1134,8]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,6]], 5:[[1015,1],[1132,8],[1135,8]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,4]], 4:[[1016,1],[1133,6],[1136,6]], 5:[[1015,1],[1133,8],[1136,8]]}}		
-MutexDrop	[[3803,3802,3801]]	0	0	0	0
+MutexDrop	[[3803,3802,3801],[4606,4608,4610,4609]]	0	0	0	0
 EquipWashMaxLV	1_2|2_2|3_2|4_2|5_4|6_6|7_9|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10	0	0	0	0
 EquipWashGroup1	1|2	0	0	0	0
 EquipWashGroup2	3|4|5|6|7	0	0	0	0
@@ -165,7 +165,7 @@
 LegendAttrValueByColor2	{30:{2:100,3:140,4:180,5:200,6:220},26:{2:250,3:350,4:450,5:500,6:550},27:{2:250,3:350,4:450,5:500,6:550},14:{2:300,3:420,4:540,5:600,6:660},70:{2:300,3:420,4:540,5:600,6:660},29:{2:350,3:490,4:630,5:700,6:770},10:{1:450,2:750,3:1050,4:1125,5:1200},9:{1:450,2:750,3:1050,4:1125,5:1200},25:{1:120,2:200,3:280,4:300,5:320},55:{1:120,2:200,3:280,4:300,5:320},52:{1:6,2:10,3:14,4:15,5:16},53:{1:1,2:2,3:2,4:3,5:4}}				
 LegendAttrValueByClassLV	{29:{9:600,10:900,11:1200,12:1320,13:1425,14:1500,15:1575},30:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},14:{9:1600,10:2400,11:3200,12:3520,13:3800,14:4000,15:4200},18:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},71:{9:800,10:1200,11:1600,12:1760,13:1900,14:2000,15:2100}}	0	0	0	0
 EquipGSTypeForSort	101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123	0	0	0	0
-EquipGSFormula	int(((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0))	[67,68,6,7,8,11,20,19,23]	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+MaxHPPer/10000.0+PerLVAtk/100.0+Hit/10000.0+Miss/10000.0)	0	0
+EquipGSFormula	int(((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0))	[67,68,6,7,8,11,20,19,23]	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0)	0	0
 HorseUpItem	181	20	0	0	0
 HorseSuperRate	{}	0	0	0	0
 NeedSysHorseLV	{100:(3,6,9),101:(3,6,9),102:(3,6,9),103:(3,6,9),104:(3,6,9),105:(3,6,9),106:(3,6,9),107:(3,6,9),108:(3,6,9),109:(3,6,9),110:(3,6,9)}				
@@ -236,7 +236,7 @@
 GuardFBCageNPCID	32502001	32504001	3		
 FBCntRegainInterval	7200				
 SealDemonNewbieLine	0|1|2				
-SealDemonDoubleDrop	0	1|2|3|4|5|6|7	2		
+SealDemonDoubleDrop	2321|2322|2323|2324|4609|4610|4608|4606	1|2|3|4|5|6|7	2		
 SealDemonFirstPos	[20,16]				
 UnblockTreasure	101|102|103	{301:'UnblockTreasure301',302:'UnblockTreasure302',303:'UnblockTreasure303',304:'UnblockTreasure304',305:'UnblockTreasure305',306:'UnblockTreasure306',307:'UnblockTreasure307',308:'UnblockTreasure308'}			
 MWSignDayAttr	{"7":100}	304			
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index fe91463..983b695 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -459,86 +459,76 @@
 307	28	2505	6|7|23	37076|1853|40	0	
 307	29	2705	6|7|23	39080|1954|40	0	
 307	30	0	6|7|23	41115|2055|40	0	
-308	1	1945	6|7|23	10584|529|80	0	
-308	2	2111	6|7|23	12140|607|80	0	
-308	3	2291	6|7|23	13776|688|80	0	
-308	4	2486	6|7|23	15495|774|80	49210	
-308	5	2694	6|7|23	17297|864|80	0	
-308	6	2915	6|7|23	19183|959|80	0	
-308	7	3151	6|7|23	21204|1060|80	0	
-308	8	3400	6|7|23	23366|1168|80	0	
-308	9	3663	6|7|23	25675|1283|80	0	
-308	10	3940	6|7|23	28137|1406|80	49215	
-308	11	4231	6|7|23	30757|1537|80	0	
-308	12	4535	6|7|23	33501|1675|80	0	
-308	13	4853	6|7|23	36368|1818|80	0	
-308	14	5185	6|7|23	39355|1967|80	0	
-308	15	5531	6|7|23	42462|2123|80	0	
-308	16	5891	6|7|23	45684|2284|80	0	
-308	17	6264	6|7|23	49018|2450|80	0	
-308	18	6651	6|7|23	52461|2623|80	0	
-308	19	7052	6|7|23	56006|2800|80	0	
-308	20	7467	6|7|23	59649|2982|80	49220	
-308	21	7896	6|7|23	63383|3169|80	0	
-308	22	8338	6|7|23	67232|3361|80	0	
-308	23	8794	6|7|23	71193|3559|80	0	
-308	24	9264	6|7|23	75260|3763|80	0	
-308	25	9748	6|7|23	79429|3971|80	0	
-308	26	10245	6|7|23	83694|4184|80	0	
-308	27	10756	6|7|23	88048|4402|80	0	
-308	28	11281	6|7|23	92486|4624|80	0	
-308	29	11820	6|7|23	96998|4849|80	0	
-308	30	12373	6|7|23	101579|5078|80	0	
-308	31	12939	6|7|23	106219|5310|80	0	
-308	32	13519	6|7|23	110974|5548|80	0	
-308	33	14113	6|7|23	115841|5792|80	0	
-308	34	14721	6|7|23	120816|6040|80	0	
-308	35	15342	6|7|23	125895|6294|80	0	
-308	36	15978	6|7|23	131073|6553|80	0	
-308	37	16627	6|7|23	136346|6817|80	0	
-308	38	17290	6|7|23	141709|7085|80	0	
-308	39	17966	6|7|23	147155|7357|80	0	
-308	40	18657	6|7|23	152680|7634|80	0	
-308	41	19361	6|7|23	158277|7913|80	0	
-308	42	20079	6|7|23	164086|8204|80	0	
-308	43	20811	6|7|23	170109|8505|80	0	
-308	44	21557	6|7|23	176353|8817|80	0	
-308	45	22316	6|7|23	182820|9141|80	0	
-308	46	23089	6|7|23	189515|9475|80	0	
-308	47	23876	6|7|23	196442|9822|80	0	
-308	48	24677	6|7|23	203605|10180|80	0	
-308	49	25511	6|7|23	211008|10550|80	0	
-308	50	0	6|7|23	218656|10932|80	0	
-309	1	1945	6|7|23	10584|529|80	0	
-309	2	2111	6|7|23	12140|607|80	0	
-309	3	2291	6|7|23	13776|688|80	0	
-309	4	2486	6|7|23	15495|774|80	49195	
-309	5	2694	6|7|23	17297|864|80	0	
-309	6	2915	6|7|23	19183|959|80	0	
-309	7	3151	6|7|23	21204|1060|80	0	
-309	8	3400	6|7|23	23366|1168|80	0	
-309	9	3663	6|7|23	25675|1283|80	0	
-309	10	3940	6|7|23	28137|1406|80	49200	
-309	11	4231	6|7|23	30757|1537|80	0	
-309	12	4535	6|7|23	33501|1675|80	0	
-309	13	4853	6|7|23	36368|1818|80	0	
-309	14	5185	6|7|23	39355|1967|80	0	
-309	15	5531	6|7|23	42462|2123|80	0	
-309	16	5891	6|7|23	45684|2284|80	0	
-309	17	6264	6|7|23	49018|2450|80	0	
-309	18	6651	6|7|23	52461|2623|80	0	
-309	19	7052	6|7|23	56006|2800|80	0	
-309	20	7467	6|7|23	59649|2982|80	49205	
-309	21	7896	6|7|23	63383|3169|80	0	
-309	22	8338	6|7|23	67232|3361|80	0	
-309	23	8794	6|7|23	71193|3559|80	0	
-309	24	9264	6|7|23	75260|3763|80	0	
-309	25	9748	6|7|23	79429|3971|80	0	
-309	26	10245	6|7|23	83694|4184|80	0	
-309	27	10756	6|7|23	88048|4402|80	0	
-309	28	11281	6|7|23	92486|4624|80	0	
-309	29	11820	6|7|23	96998|4849|80	0	
-309	30	12373	6|7|23	101579|5078|80	0	
+308	1	617	6|7|24	3024|151|60	0	
+308	2	669	6|7|25	4011|200|60	0	
+308	3	727	6|7|26	5049|252|60	0	
+308	4	788	6|7|27	6140|307|60	49210	
+308	5	854	6|7|28	7284|364|60	0	
+308	6	925	6|7|29	8480|424|60	0	
+308	7	999	6|7|30	9762|488|60	0	
+308	8	1078	6|7|31	11134|556|60	0	
+308	9	1162	6|7|32	12599|629|60	0	
+308	10	1250	6|7|33	14161|708|60	49215	
+308	11	1342	6|7|34	15824|791|60	0	
+308	12	1438	6|7|35	17565|878|60	0	
+308	13	1539	6|7|36	19384|969|60	0	
+308	14	1645	6|7|37	21280|1064|60	0	
+308	15	1754	6|7|38	23251|1162|60	0	
+308	16	1869	6|7|39	25295|1264|60	0	
+308	17	1987	6|7|40	27411|1370|60	0	
+308	18	2110	6|7|41	29595|1479|60	0	
+308	19	2237	6|7|42	31845|1592|60	0	
+308	20	2369	6|7|43	34156|1707|60	49220	
+308	21	2505	6|7|44	36526|1826|60	0	
+308	22	2645	6|7|45	38968|1948|60	0	
+308	23	2790	6|7|46	41481|2074|60	0	
+308	24	2939	6|7|47	44062|2203|60	0	
+308	25	3092	6|7|48	46707|2335|60	0	
+308	26	3250	6|7|49	49413|2470|60	0	
+308	27	3412	6|7|50	52176|2608|60	0	
+308	28	3579	6|7|51	54992|2749|60	0	
+308	29	3750	6|7|52	57855|2892|60	0	
+308	30	3925	6|7|53	60762|3038|60	0	
+308	31	4105	6|7|54	63706|3185|60	0	
+308	32	4289	6|7|55	66723|3336|60	0	
+308	33	4477	6|7|56	69811|3490|60	0	
+308	34	4670	6|7|57	72968|3648|60	0	
+308	35	4867	6|7|58	76191|3809|60	0	
+308	36	5069	6|7|59	79476|3973|60	0	
+308	37	5275	6|7|60	82822|4141|60	0	
+308	38	5485	6|7|61	86225|4311|60	0	
+308	39	5717	6|7|62	89681|4484|60	0	
+308	40	0	6|7|63	93186|4659|60	0	
+309	1	493	6|7|64	1764|88|40	0	
+309	2	535	6|7|65	2553|127|40	0	
+309	3	581	6|7|66	3384|169|40	0	
+309	4	630	6|7|67	4257|212|40	49195	
+309	5	683	6|7|68	5172|258|40	0	
+309	6	740	6|7|69	6129|306|40	0	
+309	7	799	6|7|70	7155|357|40	0	
+309	8	863	6|7|71	8252|412|40	0	
+309	9	929	6|7|72	9424|471|40	0	
+309	10	1000	6|7|73	10674|533|40	49200	
+309	11	1073	6|7|74	12004|600|40	0	
+309	12	1151	6|7|75	13397|669|40	0	
+309	13	1231	6|7|76	14852|742|40	0	
+309	14	1316	6|7|77	16368|818|40	0	
+309	15	1403	6|7|78	17945|897|40	0	
+309	16	1495	6|7|79	19581|979|40	0	
+309	17	1590	6|7|80	21274|1063|40	0	
+309	18	1688	6|7|81	23021|1151|40	0	
+309	19	1790	6|7|82	24821|1241|40	0	
+309	20	1895	6|7|83	26670|1333|40	49205	
+309	21	2004	6|7|84	28565|1428|40	0	
+309	22	2116	6|7|85	30519|1525|40	0	
+309	23	2232	6|7|86	32530|1626|40	0	
+309	24	2351	6|7|87	34594|1729|40	0	
+309	25	2474	6|7|88	36711|1835|40	0	
+309	26	2600	6|7|89	38875|1943|40	0	
+309	27	2730	6|7|90	41086|2054|40	0	
+309	28	2863	6|7|91	43338|2166|40	0	
+309	29	3045	6|7|92	45629|2281|40	0	
+309	30	0	6|7|93	47954|2397|40	0	
 310	1	1945	6|7|23	10584|529|80	0	
 310	2	2111	6|7|23	12140|607|80	0	
 310	3	2291	6|7|23	13776|688|80	0	
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 23cc40a..6fc6c3f 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -168,23 +168,23 @@
 60203005	0	190	0	0	[(600000,0),(1000000,(3,2,107))]	5	{(3,3,107):1000000}	1	{}	{3:[(10000,0)]}	[]	[2,3,3,[(10000,0)],107]	{987:1000000,2321:1000000}	{}	{}	{}	{}	0	0	0	0	[]	[]
 60203006	0	210	0	0	[(500000,0),(1000000,(3,2,107))]	7	{(3,3,107):1000000}	1	{}	{3:[(10000,0)]}	[]	[1,3,3,[(10000,0)],107]	{987:1000000,2322:1000000}	{}	{}	{}	{}	0	0	0	0	[]	[]
 60203007	0	230	0	0	[(500000,0),(1000000,(3,2,107))]	10	{(3,3,107):1000000}	1	{}	{3:[(10000,0)]}	[]	[1,3,3,[(10000,0)],107]	{987:1000000,2323:1000000}	{}	{}	{}	{5:1}	0	0	0	0	[]	[]
-60203008	0	255	0	0	[(500000,0),(1000000,(4,2,107))]	7	{(4,3,107):1200000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:20000,2324:1000000}	{}	{}	{}	{5:1}	0	0	0	0	[]	[]
-60203009	0	280	0	0	[(500000,0),(1000000,(4,2,107))]	5	{(4,3,107):1400000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:20000,3801:8000,2324:1000000}	{2321:2}	{}	{2:1140000}	{2:1}	0	0	0	0	[]	[]
-60203010	0	305	0	0	[(500000,0),(1000000,(5,2,107))]	5	{(5,3,107):1600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:8000,4610:10000,2324:1000000}	{2321:2}	{}	{2:2500000}	{2:1}	0	0	0	0	[]	[]
-60203011	0	330	0	0	[(500000,0),(1000000,(5,2,107))]	5	{(5,3,107):1800000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:6000,4610:10000,2324:1000000}	{2321:2}	{}	{2:3100000}	{2:1}	0	0	0	0	[]	[]
-60203012	0	355	0	0	[(500000,0),(1000000,(6,2,107))]	5	{(6,3,107):2000000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:6000,4610:10000,2324:1000000}	{2321:2}	{}	{2:4100000}	{2:1}	0	0	0	0	[]	[]
-60203013	0	380	0	0	[(500000,0),(1000000,(6,2,107))]	5	{(6,3,107):2200000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,2324:1000000}	{2321:2}	{}	{2:5100000}	{2:1}	0	0	0	0	[]	[]
-60203014	0	405	0	0	[(500000,0),(1000000,(7,2,107))]	5	{(7,3,107):2400000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:2500,2324:1000000}	{2321:2}	{}	{2:6600000}	{2:1}	0	0	0	0	[]	[]
-60203015	0	430	0	0	[(500000,0),(1000000,(7,2,107))]	5	{(7,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:2500,2324:1000000}	{2321:2}	{}	{2:8300000}	{2:1}	0	0	0	0	[]	[]
-60203016	0	455	0	0	[(500000,0),(1000000,(8,2,107))]	5	{(8,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:10700000}	{2:1}	0	0	0	0	[]	[]
-60203017	0	480	0	0	[(500000,0),(1000000,(8,2,107))]	5	{(8,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:13400000}	{2:1}	0	0	0	0	[]	[]
-60203018	0	505	0	0	[(500000,0),(1000000,(9,2,107))]	5	{(9,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:17400000}	{2:1}	0	0	0	0	[]	[]
-60203019	0	530	0	0	[(500000,0),(1000000,(9,2,107))]	5	{(9,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:21800000}	{2:1}	0	0	0	0	[]	[]
-60203020	0	555	0	0	[(500000,0),(1000000,(10,2,107))]	5	{(10,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:26160000}	{2:1}	0	0	0	0	[]	[]
-60203021	0	580	0	0	[(500000,0),(1000000,(10,2,107))]	5	{(10,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:31392000}	{2:1}	0	0	0	0	[]	[]
-60203022	0	655	0	0	[(500000,0),(1000000,(11,2,107))]	5	{(11,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:37670400}	{2:1}	0	0	0	0	[]	[]
-60203023	0	680	0	0	[(500000,0),(1000000,(11,2,107))]	5	{(11,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:37670400}	{2:1}	0	0	0	0	[]	[]
-60203024	0	705	0	0	[(500000,0),(1000000,(12,2,107))]	5	{(12,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:10000,3801:4000,4610:10000,4608:1250,4606:1250,2324:1000000}	{2321:2}	{}	{2:37670400}	{2:1}	0	0	0	0	[]	[]
+60203008	0	255	0	0	[(500000,0),(1000000,(4,2,107))]	7	{(4,3,107):1200000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:50000,2324:1000000}	{}	{}	{}	{5:1}	0	0	0	0	[2,0,1,[4609]]	[]
+60203009	0	280	0	0	[(500000,0),(1000000,(4,2,107))]	5	{(4,3,107):1400000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:50000,3801:8000,2324:1000000}	{2321:2}	{}	{2:1140000}	{2:1}	0	0	0	0	[]	[]
+60203010	0	305	0	0	[(500000,0),(1000000,(5,2,107))]	5	{(5,3,107):1600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:20000,3801:8000,4610:20000,2324:1000000}	{2321:2}	{}	{2:2500000}	{2:1}	0	0	0	0	[3,0,1,[4610]]	[]
+60203011	0	330	0	0	[(500000,0),(1000000,(5,2,107))]	5	{(5,3,107):1800000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:20000,3801:6000,4610:20000,2324:1000000}	{2321:2}	{}	{2:3100000}	{2:1}	0	0	0	0	[]	[]
+60203012	0	355	0	0	[(500000,0),(1000000,(6,2,107))]	5	{(6,3,107):2000000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:20000,3801:6000,4610:20000,2324:1000000}	{2321:2}	{}	{2:4100000}	{2:1}	0	0	0	0	[]	[]
+60203013	0	380	0	0	[(500000,0),(1000000,(6,2,107))]	5	{(6,3,107):2200000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:20000,3801:4000,4610:20000,2324:1000000}	{2321:2}	{}	{2:5100000}	{2:1}	0	0	0	0	[]	[]
+60203014	0	405	0	0	[(500000,0),(1000000,(7,2,107))]	5	{(7,3,107):2400000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4608:5000,2324:1000000}	{2321:2}	{}	{2:6600000}	{2:1}	0	0	0	0	[]	[]
+60203015	0	430	0	0	[(500000,0),(1000000,(7,2,107))]	5	{(7,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4608:5000,2324:1000000}	{2321:2}	{}	{2:8300000}	{2:1}	0	0	0	0	[]	[]
+60203016	0	455	0	0	[(500000,0),(1000000,(8,2,107))]	5	{(8,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:10700000}	{2:1}	0	0	0	0	[]	[]
+60203017	0	480	0	0	[(500000,0),(1000000,(8,2,107))]	5	{(8,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:13400000}	{2:1}	0	0	0	0	[]	[]
+60203018	0	505	0	0	[(500000,0),(1000000,(9,2,107))]	5	{(9,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:17400000}	{2:1}	0	0	0	0	[]	[]
+60203019	0	530	0	0	[(500000,0),(1000000,(9,2,107))]	5	{(9,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:21800000}	{2:1}	0	0	0	0	[]	[]
+60203020	0	555	0	0	[(500000,0),(1000000,(10,2,107))]	5	{(10,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:26160000}	{2:1}	0	0	0	0	[]	[]
+60203021	0	580	0	0	[(500000,0),(1000000,(10,2,107))]	5	{(10,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:31392000}	{2:1}	0	0	0	0	[]	[]
+60203022	0	655	0	0	[(500000,0),(1000000,(11,2,107))]	5	{(11,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:37670400}	{2:1}	0	0	0	0	[]	[]
+60203023	0	680	0	0	[(500000,0),(1000000,(11,2,107))]	5	{(11,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:37670400}	{2:1}	0	0	0	0	[]	[]
+60203024	0	705	0	0	[(500000,0),(1000000,(12,2,107))]	5	{(12,3,107):2600000}	1	{}	{3:[(10000,0)]}	[]	[]	{987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000}	{2321:2}	{}	{2:37670400}	{2:1}	0	0	0	0	[]	[]
 30903001	150	0	0	0	[(250000,0),(375000,(3,2,107)),(918750,(3,3,107)),(1000000,(3,4,107)),(1000000,(3,5,107))]	80	{(3,4,107):2000000}	1	{4:8,5:0}	{3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
 30903001	200	0	0	0	[(250000,0),(375000,(4,2,107)),(918750,(4,3,107)),(987500,(4,4,107)),(1000000,(4,5,107))]	80	{(4,4,107):2000000}	1	{4:8,5:1}	{3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
 30903001	250	0	0	0	[(250000,0),(375000,(5,2,107)),(918750,(5,3,107)),(987500,(5,4,107)),(1000000,(5,5,107))]	80	{(5,4,107):2000000}	1	{4:8,5:1}	{3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index 1d8f97e..d29e46a 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -609,36 +609,36 @@
 50106311	28	5726	8551
 50106311	29	5980	9043
 50106311	30	0	9541
-50106312	1	987	139
-50106312	2	1071	277
-50106312	3	1163	425
-50106312	4	1261	582
-50106312	5	1367	749
-50106312	6	1480	927
-50106312	7	1599	1116
-50106312	8	1726	1318
-50106312	9	1859	1532
-50106312	10	2000	1759
-50106312	11	2147	1999
-50106312	12	2302	2254
-50106312	13	2463	2526
-50106312	14	2632	2814
-50106312	15	2807	3120
-50106312	16	2990	3443
-50106312	17	3180	3784
-50106312	18	3376	4143
-50106312	19	3580	4521
-50106312	20	3790	4918
-50106312	21	4008	5335
-50106312	22	4232	5764
-50106312	23	4464	6205
-50106312	24	4702	6655
-50106312	25	4948	7116
-50106312	26	5200	7586
-50106312	27	5460	8065
-50106312	28	5726	8551
-50106312	29	5980	9043
-50106312	30	0	9541
+50106312	1	937	244
+50106312	2	1018	376
+50106312	3	1105	516
+50106312	4	1198	665
+50106312	5	1299	824
+50106312	6	1406	993
+50106312	7	1519	1173
+50106312	8	1639	1364
+50106312	9	1766	1567
+50106312	10	1900	1783
+50106312	11	2040	2011
+50106312	12	2187	2254
+50106312	13	2340	2512
+50106312	14	2500	2786
+50106312	15	2667	3076
+50106312	16	2840	3383
+50106312	17	3021	3706
+50106312	18	3207	4048
+50106312	19	3401	4407
+50106312	20	3601	4785
+50106312	21	3807	5181
+50106312	22	4021	5588
+50106312	23	4240	6006
+50106312	24	4467	6435
+50106312	25	4700	6873
+50106312	26	4940	7319
+50106312	27	5187	7774
+50106312	28	5440	8235
+50106312	29	5707	8703
+50106312	30	0	9176
 50106313	1	2468	1440
 50106313	2	2679	1785
 50106313	3	2908	2154
diff --git a/db/PyMongoDataServer/PySysDB/tagRealm.txt b/db/PyMongoDataServer/PySysDB/tagRealm.txt
index acc4684..766261a 100644
--- a/db/PyMongoDataServer/PySysDB/tagRealm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRealm.txt
@@ -3,22 +3,22 @@
 1	0	540	0	0	0	6|7	4700|230	61103001	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
 2	1	600	0	0	0	6|7	9900|490	61203001	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
 3	0	800	0	0	0	6|7|19	18700|940|1000	61103002	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-4	0	950	0	0	0	6|7|19	25100|1260|1000	61103003	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-5	1	1510	0	0	0	6|7|19	32300|1620|1000	61203002	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
-6	0	1160	0	0	0	6|7|19	44300|2220|3000	61103004	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-7	1	1250	0	0	0	6|7|19	53300|2670|3000	61203003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
-8	0	1390	0	0	0	6|7|19|18	68200|3410|3000|2000	61103005	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-9	1	2290	0	0	0	6|7|19|18	79300|3970|3000|2000	61203004	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
-10	0	2360	0	0	0	6|7|19|18	97600|4880|3000|5000	61103006	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-11	0	2410	0	0	0	6|7|19|18	111300|5560|3000|5000	61103007	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-12	1	4830	0	0	0	6|7|19|18	126400|6320|3000|5000	61203005	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
-13	0	3950	0	0	0	6|7|19|18|49	151500|7570|3000|5000|3000	61103008	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-14	0	4650	0	0	0	6|7|19|18|49	170000|8500|3000|5000|3000	61103009	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-15	1	8420	0	0	0	6|7|19|18|49	190400|9520|3000|5000|3000	61203006	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
-16	0	4910	0	0	0	6|7|19|18|49	224000|11200|7000|5000|3000	61103010	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-17	0	5620	0	0	0	6|7|19|18|49	248600|12430|7000|5000|3000	61103011	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-18	1	11230	0	0	0	6|7|19|18|49	275600|13780|7000|5000|3000	61203007	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
-19	0	6320	0	0	0	6|7|19|18|49|20	320000|16000|7000|5000|3000|2000	61103012	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-20	0	7020	0	0	0	6|7|19|18|49|20	352400|17620|7000|5000|3000|2000	61103013	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-21	1	14040	0	0	0	6|7|19|18|49|20	387600|19380|7000|5000|3000|2000	61203008	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
+4	0	970	0	0	0	6|7|19	25100|1260|1000	61103003	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+5	1	1530	0	0	0	6|7|19	32300|1620|1000	61203002	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
+6	0	1200	0	0	0	6|7|19	44300|2220|3000	61103004	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+7	1	1290	0	0	0	6|7|19	53300|2670|3000	61203003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
+8	0	1430	0	0	0	6|7|19|18	68200|3410|3000|2000	61103005	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+9	1	2370	0	0	0	6|7|19|18	79300|3970|3000|2000	61203004	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
+10	0	2440	0	0	0	6|7|19|18	97600|4880|3000|5000	61103006	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+11	0	2490	0	0	0	6|7|19|18	111300|5560|3000|5000	61103007	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+12	1	4990	0	0	0	6|7|19|18	126400|6320|3000|5000	61203005	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
+13	0	4080	0	0	0	6|7|19|18|49	151500|7570|3000|5000|3000	61103008	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+14	0	4800	0	0	0	6|7|19|18|49	170000|8500|3000|5000|3000	61103009	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+15	1	8720	0	0	0	6|7|19|18|49	190400|9520|3000|5000|3000	61203006	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
+16	0	5090	0	0	0	6|7|19|18|49	224000|11200|7000|5000|3000	61103010	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+17	0	5820	0	0	0	6|7|19|18|49	248600|12430|7000|5000|3000	61103011	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+18	1	11630	0	0	0	6|7|19|18|49	275600|13780|7000|5000|3000	61203007	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
+19	0	6540	0	0	0	6|7|19|18|49|20	320000|16000|7000|5000|3000|2000	61103012	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+20	0	7270	0	0	0	6|7|19|18|49|20	352400|17620|7000|5000|3000|2000	61103013	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+21	1	14540	0	0	0	6|7|19|18|49|20	387600|19380|7000|5000|3000|2000	61203008	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(2263,1,1)]}
 22	0	8320	0	0	0	6|7|19|18|49|20	445200|22260|7000|10000|3000|2000	61103014	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 5b8a552..3867918 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -9,6 +9,6 @@
 8	14	0	8	0	{"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}	50000	{"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}
 9	8	0	25	0	{"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]}	150000	{"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
 10	7	0	50	0	{"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]}	167000	{"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
-11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*634828+max(min(2,extraData)-1,0)*665472+max(min(3,extraData)-2,0)*814080+max(min(4,extraData)-3,0)*935424+max(min(5,extraData)-4,0)*1123776+max(min(6,extraData)-5,0)*1332864+max(min(7,extraData)-6,0)*1562688+max(min(8,extraData)-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*20+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*3+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*12+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*4+max(min(5,extraData)-4,0)*8+max(min(6,extraData)-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*4+max(min(7,extraData)-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*8"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*436444+max(min(2,extraData)-1,0)*457512+max(min(3,extraData)-2,0)*559680+max(min(4,extraData)-3,0)*643104+max(min(5,extraData)-4,0)*772596+max(min(6,extraData)-5,0)*916344+max(min(7,extraData)-6,0)*1074348+max(min(8,extraData)-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*17+max(min(2,extraData)-1,0)*13+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*6+max(min(4,extraData)-3,0)*8+max(min(5,extraData)-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*1+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*5+max(min(6,extraData)-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)*3+max(min(7,extraData)-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*5"}]}
+11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
 12	9	0	25	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}	200000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
 13	12	0	20	0	{"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"12"}], "money":"500000"}	200000	{"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index fcd6055..f200f6c 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -28,6 +28,7 @@
 64	2	0	2050	1	0	[]	0		0	0	0	0	1	50	0	0	
 65	2	0	982	1	0	[]	0		0	0	0	0	1	250	0	0	
 66	2	0	983	1	0	[]	0		0	0	0	0	1	30	0	0	
+67	2	0	953	1	0	[]	0		0	0	0	0	1	500	0	0	
 101	3	0	181	1	0	[]	0		0	0	0	0	1	10	0	0	
 103	3	0	3501	1	0	[]	0		0	0	0	0	1	10	0	0	
 104	3	0	3511	1	0	[]	0		0	0	0	0	1	10	0	0	
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index c4cbe7f..0bdc4c4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -762,6 +762,9 @@
 48455	海牛之力	48455	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1500	10000	0	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	0	0	0	0	0	0	0	0	2	2951	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48460	海牛幻体	48460	1	1	0	6	0	17	0	0	0	0	91	8	0	25000	0	0	0	0	0	4004	10000	0	0	9	1500	4	0	10	1500	4	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	7377	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48465	海牛狂化	48465	1	1	0	6	0	16	0	0	0	0	111	0	0	25000	0	0	0	0	0	4004	10000	0	0	4503	1000	0	0	4508	0	0	0	1011	1	1	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	25819	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48470	雷震之力	48470	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1500	10000	0	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	0	0	0	0	0	0	0	0	2	2871	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
+48475	雷震之心	48475	1	1	0	6	0	17	0	0	0	0	41	8	0	25000	0	0	0	0	0	4004	10000	0	0	13	1000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	7177	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48480	雷震蛮力	48480	1	1	0	6	0	16	1	0	0	0	111	0	0	25000	0	0	0	0	0	4004	10000	0	0	76	1000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	25119	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49000	固本	49000	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	100	6	1000	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	0	0	0	0	0	0	0	0	2	1242	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49005	精准	49005	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	14	800	3	0	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	0	0	0	0	0	0	0	0	2	3105	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49010	培元	49010	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	2	6	1000	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	0	0	0	0	0	0	0	0	2	10867	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -805,6 +808,12 @@
 49180	旺盛	49180	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	307	6	1000	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	0	0	0	0	0	0	0	0	2	3598	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49185	强攻	49185	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	3	7	500	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	0	0	0	0	0	0	0	0	2	8995	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49190	必杀	49190	1	1	0	5	0	7	0	0	0	0	41	0	0	10000	0	0	0	0	0	4051	1500	0	0	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	0	0	0	0	0	0	0	0	2	31482	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49195	霸天	49195	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	309	7	300	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	0	0	0	0	0	0	0	0	2	4267	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49200	游龙	49200	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	3	6	300	511	3	7	300	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	10667	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49205	云痕	49205	1	1	0	5	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4023	10000	3000	0	13	2000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	37334	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49210	浩瀚	49210	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	308	6	1000	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	0	0	0	0	0	0	0	0	2	8197	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49215	玄翎	49215	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	4	6	300	511	4	7	300	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	20492	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49220	玄极	49220	1	1	0	5	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	10000	0	77	1000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	71722	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 50000	金箍幻灭	50000	1	1	2	1	0	1	0	0	2	8	40	4	0	8000	0	0	0	0	0	1010	25000	0	0	1200	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	692	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50100	皓月腾空	50100	1	1	2	1	0	1	0	0	2	6	41	10	0	16000	0	0	0	0	0	1010	30000	0	0	1200	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	50101	0	0	0	0	0	0	0	0	0	0	2	879	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50101	加速	50101	1	1	0	0	0	5	0	0	0	0	10	0	0	0	0	0	0	0	0	16	1000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	50100	0	0	0	0
diff --git a/webbottle/Config.ini b/webbottle/Config.ini
index cf5c66b..f62ac04 100644
--- a/webbottle/Config.ini
+++ b/webbottle/Config.ini
@@ -1,10 +1,10 @@
 [GeTuiConfig]
 # 一个自由APPID对应一对app_key和master_secret为极光推送应用生成
-app_key_822055139 = 1c060648058afe0b5faf72ca
-master_secret_822055139 = 568ae9f1a2a7650220af3921
+app_key_8220539 = 1c060658ab5faf72ca
+master_secret_825139 = 568ae50220af3921
 
-app_key_828115704 = 1c060648058afe0b5faf72ca
-master_secret_828115704 = 568ae9f1a2a7650220af3921
+app_key_828704 = 1c06064805b5faf72ca
+master_secret_828104 = 568aef1650220af3921
 
 
 

--
Gitblit v1.8.0