From bdf1a98142a2821b065d796548423b006552f39a Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期四, 31 一月 2019 19:33:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                 |    0 
 db/PyMongoDataServer/PySysDB/tagCoat.txt                                               |    6 +-
 db/PyMongoDataServer/SysDB/tagEffectRefresh.txt                                        |   18 +++---
 db/PyMongoDataServer/PySysDB/tagAlchemy.txt                                            |    2 
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt                                      |   24 ++++----
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                             |    2 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                         |    6 +-
 db/PyMongoDataServer/SysDB/tagBornRefresh.txt                                          |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc     |    0 
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc        |    0 
 db/PyMongoDataServer/PySysDB/tagFBLine.txt                                             |    2 
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt                                        |    4 
 db/PyMongoDataServer/SysDB/tagNPCRefresh.txt                                           |   54 +++++++++---------
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                              |   56 +++++++++---------
 16 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 3496b42..991a823 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -493,20 +493,20 @@
 20303005	金甲蛮狮	335
 20303006	麒麟瑞兽	355
 20303007	金色战神	375
-20402001	精英狼蛛	405
+20402001	精英鬼蛛	405
 20402002	精英鱼妖	440
 20402003	精英海石精	450
 20402004	精英海牛	490
 20402005	精英海斗士	500
 20402006	精英地龙	540
 20402007	精英冰骨妖	550
-20403001	蜘蛛女皇	410
-20403002	嗜海狂鲨	445
-20403003	古墓石巨人	455
-20403004	残暴海怪	495
-20403005	寒冰古妖	505
-20403006	翻水妖龙	545
-20403007	深海之王	555
+20403001	猩红女王	410
+20403002	忘川鬼鲨	445
+20403003	幽冥石鬼	455
+20403004	炎魔巨兽	495
+20403005	上古裂妖	505
+20403006	战场魔龙	545
+20403007	戮仙鬼王	555
 30102001	凶狼	50
 30102002	巨虎	50
 30102003	幼龙	50
@@ -563,10 +563,10 @@
 30303014	巨木石人	380
 30303015	剧毒蛇王	450
 30303016	古森之灵	485
-30303017	蜘蛛皇后	390
-30303018	巨木石人	420
-30303019	剧毒蛇王	450
-30303020	古森之灵	500
+30303017	麒麟瑞兽	390
+30303018	秘境石人	420
+30303019	图腾蛇王	450
+30303020	秘境之主	500
 30403001	仙魔之争NPC	90
 30403002	仙魔守卫	90
 30403003	仙魔守卫	90
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 7fb2ed6..0e92987 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
index b8e30f0..11cdc1d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc
index dfa6ae6..bd9fc94 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 44b96c4..dcfbcef 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index 784a163..588b898 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemy.txt b/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
index 7fd78b2..5dadbb1 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
@@ -7,4 +7,4 @@
 106	4611_6|4613_6|4612_6|4614_6|4615_6	746	[[3511,4715,1],[1193,4711,1],[1111,4720,1],[1432,4724,1],[1491,4727,1],[1193,4729,1],[69,4732,1]]	41	[]	6
 107	4611_6|4613_6|4612_6|4614_6|4615_6	895	[[4164,4781,1],[1257,4780,1],[556,4782,1],[1341,4783,1],[1397,4784,1],[1257,4785,1],[28,4733,1]]		[]	7
 108	4611_6|4613_6|4612_6|4614_6|4615_6	1074	[[4025,4787,1],[1349,4786,1],[556,4788,1],[1349,4789,1],[1349,4790,1],[1349,4791,1],[23,4742,1]]		[]	8
-109	4611_8|4613_8|4612_8|4614_8|4615_8	1719	[[4031,4792,1],[1349,4793,1],[556,4794,1],[1349,4795,1],[1349,4796,1],[1349,4797,1],[17,4798,1]]		[]	9
+109	4611_8|4613_8|4612_8|4614_8|4615_8	1719	[[4031,4793,1],[1349,4792,1],[556,4794,1],[1349,4795,1],[1349,4796,1],[1349,4797,1],[17,4798,1]]		[]	9
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index cbe13d0..c650fdf 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -270,6 +270,6 @@
 2482						[[25,[3804,1]],[125,[3803,1]],[275,[5408,1]],[285,[5409,1]],[335,[4607,1]],[435,[4606,1]],[585,[2348,1]],[605,[2425,1]],[705,[2484,1]],[1505,[7105,3]],[2005,[5303,60]],[2505,[5412,10]],[3705,[8353,6]],[5200,[2324,2]],[6400,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]]	1	{5:[[10000,[2348,1]]],11:[[10000,[4607,1]]],23:[[10000,[5408,1]]]}				[3804,3803,5408,5409,4607,4606,2348,2425,2484]
 2483			4184_2|1025_15|952_3|913_1									[913]
 2484		5809_1|5810_1|5811_1										[5809,5810,5811]
-2485			912_1|5503_3|5513_3									[912]
-2486			913_1|5414_500|5523_3									[913,5414]
+2485			912_1|5503_2|5513_2									[912]
+2486			913_1|5414_500|5523_2									[913,5414]
 2487		8416_1|8417_1|8418_1|8419_1										[8416,8417,8418,8419]
diff --git a/db/PyMongoDataServer/PySysDB/tagCoat.txt b/db/PyMongoDataServer/PySysDB/tagCoat.txt
index b1a23b1..31c7ff5 100644
--- a/db/PyMongoDataServer/PySysDB/tagCoat.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCoat.txt
@@ -8,6 +8,6 @@
 7	6006|6206	5806	3	1|1|1	{"1":{"6":5000,"7":170},"2":{"6":10000,"7":340},"3":{"6":15000,"7":510}}
 8	6007|6207	5807	3	1|1|1	{"1":{"6":4000,"7":140},"2":{"6":8000,"7":280},"3":{"6":12000,"7":420}}
 9	6008|6208	5808	3	1|1|1	{"1":{"6":6000,"7":200},"2":{"6":12000,"7":400},"3":{"6":18000,"7":600}}
-10	6009|6209	5809	4	1|1|1|1	{"1":{"6":31900,"7":1070},"2":{"6":63800,"7":2140},"3":{"6":95700,"7":3210},"4":{"6":127600,"7":2580}}
-11	6010|6210	5810	4	1|1|1|1	{"1":{"6":25500,"7":850},"2":{"6":51000,"7":1700},"3":{"6":76500,"7":2550},"4":{"6":102000,"7":3400}}
-12	6011|6211	5811	4	1|1|1|1	{"1":{"6":38300,"7":1280},"2":{"6":76600,"7":2560},"3":{"6":114900,"7":3840},"4":{"6":153200,"7":5120}}
+10	6009|6209	5809	5	1|1|1|1|1	{"1":{"6":31900,"7":1070},"2":{"6":63800,"7":2140},"3":{"6":95700,"7":3210},"4":{"6":127600,"7":4280},"5":{"6":159500,"7":5350}}
+11	6010|6210	5810	5	1|1|1|1|1	{"1":{"6":25500,"7":850},"2":{"6":51000,"7":1700},"3":{"6":76500,"7":2550},"4":{"6":102000,"7":3400},"5":{"6":127500,"7":4250}}
+12	6011|6211	5811	5	1|1|1|1|1	{"1":{"6":38300,"7":1280},"2":{"6":76600,"7":2560},"3":{"6":114900,"7":3840},"4":{"6":153200,"7":5120},"5":{"6":191500,"7":6400}}
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index e734dc9..65e4386 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -101,7 +101,7 @@
 32010	2	32012	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 32010	3	32013	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 32010	4	32014	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
-31370	0	31370	0	500	0	0	0	0	0	0	0	[18,18]	[3,180,10, [179,178,120,60]]	101		
+31370	0	31370	0	500	0	0	0	0	0	0	0	[18,18]	[3,180,30, [179,178,120,60]]	101		
 31380	0	31380	235	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,2,1],[1158,1,1],[5500,3,1]]
 31380	1	31380	300	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,2,1],[1158,1,1],[5500,3,1]]
 31380	2	31380	300	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,3,1],[1158,1,1],[5500,4,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index d574f90..64b39fe 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -5,9 +5,9 @@
 GemType2	1|2|8|9|10	可镶嵌攻击炎晶	0	0	0
 GemType3	121|122|123|124	可镶嵌生命宝石	170	0	0
 GemType4	125|126|127|128	可镶嵌攻击宝石	171	0	0
-GemType5	129|130|131|132	可镶嵌附伤宝石	0	0	0
+GemType5	129|130|131|132	可镶嵌附伤宝石	172	0	0
 GemTypeCount	5	0	0	0	0
-GemResonance	8				
+GemResonance	12				
 GemUpCostFormula	1_3501|2_3511|5_5521	3	0	0	0
 PutInItemPack	{"255":[30, 31], "254":[61,62,63], "32":[70,119,120,121,122,123,139], "34":[128,129,130,131,132,133,134,135,136,137,138,140]}				
 OpenBagItem	951	int(math.ceil(index/4.0))	20	0	0
@@ -126,7 +126,7 @@
 MapDropBindRule	{52010:1,31340:1}	0	0	0	0
 MapDropItemNoBind	{52010:[3801,4606,4608]}	0	0	0	0
 MapDropItemBind	{}	0	0	0	0
-JobItemDropSets	{2:[5012,5022]}	{5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}	{3001:[[2800,8205],[4600,8218],[6400,8231],[8200,8244],[10000,8257]],3002:[[2800,8206],[4600,8219],[6400,8232],[8200,8245],[10000,8258]],3003:[[2800,8207],[4600,8220],[6400,8233],[8200,8246],[10000,8259]],4002:[[2800,8209],[4600,8222],[6400,8235],[8200,8248],[10000,8261]],4003:[[2800,8210],[4600,8223],[6400,8236],[8200,8249],[10000,8262]],5002:[[2800,8211],[4600,8224],[6400,8237],[8200,8250],[10000,8263]],5003:[[2800,8212],[4600,8225],[6400,8238],[8200,8251],[10000,8264]],6003:[[2800,8213],[4600,8226],[6400,8239],[8200,8252],[10000,8265]],8411:[[5000,8411],[10000,8412]],8412:[[3500,8411],[7000,8412],[9000,8414],[10000,8415]],8421:[[5000,8421],[10000,8422]],8422:[[3500,8421],[7000,8422],[9000,8424],[10000,8425]],8431:[[5000,8431],[10000,8432]],8432:[[3500,8431],[7000,8432],[9000,8434],[10000,8435]]}		
+JobItemDropSets	{2:[5012,5022]}	{2:[5012,5022],5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}	{3001:[[2800,8205],[4600,8218],[6400,8231],[8200,8244],[10000,8257]],3002:[[2800,8206],[4600,8219],[6400,8232],[8200,8245],[10000,8258]],3003:[[2800,8207],[4600,8220],[6400,8233],[8200,8246],[10000,8259]],4002:[[2800,8209],[4600,8222],[6400,8235],[8200,8248],[10000,8261]],4003:[[2800,8210],[4600,8223],[6400,8236],[8200,8249],[10000,8262]],5002:[[2800,8211],[4600,8224],[6400,8237],[8200,8250],[10000,8263]],5003:[[2800,8212],[4600,8225],[6400,8238],[8200,8251],[10000,8264]],6003:[[2800,8213],[4600,8226],[6400,8239],[8200,8252],[10000,8265]],8411:[[5000,8411],[10000,8412]],8412:[[3500,8411],[7000,8412],[9000,8414],[10000,8415]],8421:[[5000,8421],[10000,8422]],8422:[[3500,8421],[7000,8422],[9000,8424],[10000,8425]],8431:[[5000,8431],[10000,8432]],8432:[[3500,8431],[7000,8432],[9000,8434],[10000,8435]]}		
 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]]}}		
diff --git a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
index 0cd9f4e..7c3d42d 100644
--- a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
@@ -40,5 +40,5 @@
 114285	31370	19	20	1	0
 114287	32030	18	20	1	0
 116720	31380	18	18	1	0
-116752	21310	85	94	1	0
 116780	31360	53	7	0	0
+117332	21310	85	94	1	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index a1c7da6..d32df62 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1173,7 +1173,7 @@
 5206	1	0	强化套装石(龙牙)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	250	0	50	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5207	1	0	强化套装石(玉佩)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	250	0	50	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5301	1	0	套装石碎片	35	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	5	0	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-5302	1	0	完美套装石	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	2000	0	50	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+5302	1	0	完美套装石	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	200	0	50	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5303	1	0	洗炼石	36	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5304	1	0	通灵石	126	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	50	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5305	1	0	淬心玉	126	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	50	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 8510da2..e4b27f7 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -448,7 +448,7 @@
 10803001	2	0	白泽	350	0	54313	54313	0	16	0	0	10000	54559	0	1	0	0	0	0	0	3	3000	4785052	299	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	45641098	13	10000	0	0	5	0	0	186	1	1
 10903001	2	0	蔚寒魔将	400	0	92430	92430	0	22	0	0	10000	96932	0	1	0	0	0	0	0	3	3000	5734071	360	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	50633273	42	10000	0	0	5	0	0	186	1	1
 11003001	2	0	烈风将军	450	0	125542	125542	0	24	0	0	10000	135570	0	1	0	0	0	0	0	3	3000	7035174	442	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	15870953	109	10000	0	0	5	0	0	186	1	1
-11103001	2	0	守陵大将军	500	0	153679	153679	0	30	0	0	10000	168352	0	1	0	0	0	0	0	3	3000	8285215	519	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	34630602	188	10000	0	0	5	0	0	186	1	1
+11103001	2	0	守陵大将军	500	0	153679	153679	0	30	0	0	10000	168352	0	1	0	0	0	0	0	3	3000	8285215	519	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	25292117	215	10000	0	0	5	0	0	186	1	1
 20102001	2	0	精英狼蛛	125	0	746	746	0	1	0	0	0	200	0	0	0	0	0	0	0	3	3000	428948	17	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	292718	0	0	0	0	1	75272	0	1	1	1
 20102002	2	0	精英鱼妖	140	0	917	917	0	1	0	0	0	200	0	0	0	0	0	0	0	3	3000	531440	20	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	365898	0	0	0	0	1	116139	0	1	1	1
 20102003	2	0	精英海石精	155	0	1521	1521	0	2	0	0	0	650	0	0	0	0	0	0	0	3	3000	608308	22	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	476075	0	0	0	0	1	219537	0	1	1	1
@@ -493,20 +493,20 @@
 20303005	2	0	金甲蛮狮	335	0	34641	34641	0	16	0	0	10000	33439	0	1	0	0	0	0	0	3	3000	4008354	252	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	2691253	5	10000	0	0	5	0	0	186	1	1
 20303006	2	0	麒麟瑞兽	355	0	45112	45112	0	17	0	0	10000	44723	0	1	0	0	0	0	0	3	3000	4554422	285	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	33143382	9	10000	0	0	5	0	0	186	1	1
 20303007	2	0	金色战神	375	0	58234	58234	0	18	0	0	10000	57175	0	1	0	0	0	0	0	3	3000	4861408	305	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	15324762	15	10000	0	0	5	0	0	186	1	1
-20402001	2	0	精英狼蛛	405	0	25533	25533	0	20	0	0	0	4394	0	0	0	0	0	0	0	0	0	5196577	326	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	76986274	0	0	0	0	1	34798563	0	1	1	1
-20402002	2	0	精英鱼妖	440	0	29839	29839	0	23	0	0	0	7741	0	0	0	0	0	0	0	0	0	5734071	360	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	27518996	1	0	0	0	1	52367876	0	1	1	1
-20402003	2	0	精英海石精	450	0	31450	31450	0	24	0	0	0	8115	0	0	0	0	0	0	0	0	0	5921443	372	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	43395937	1	0	0	0	1	60436129	0	1	1	1
-20402004	2	0	精英海牛	490	0	36998	36998	0	26	0	0	0	10097	0	0	0	0	0	0	0	0	0	6661390	418	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	92691731	1	0	0	0	1	109294469	0	1	1	1
-20402005	2	0	精英海斗士	500	0	39084	39084	0	29	0	0	0	10537	0	0	0	0	0	0	0	0	0	6851040	430	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	7253266	2	0	0	0	1	127053886	0	1	1	1
-20402006	2	0	精英地龙	540	0	45948	45948	0	33	0	0	0	12765	0	0	0	0	0	0	0	0	0	7864938	492	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	85782899	2	0	0	0	1	231950199	0	1	1	1
-20402007	2	0	精英冰骨妖	550	0	48174	48174	0	38	0	0	0	13253	0	0	0	0	0	0	0	0	0	8123391	508	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	9426047	3	0	0	0	1	269289020	0	1	1	1
-20403001	2	0	蜘蛛女皇	410	0	97305	97305	0	23	0	0	10000	87533	0	1	0	0	0	0	0	0	0	5521147	347	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	92989241	34	10000	0	0	5	0	0	186	1	1
-20403002	2	0	嗜海狂鲨	445	0	117747	117747	0	24	0	0	10000	121341	0	1	0	0	0	0	0	0	0	6074463	382	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	75605183	52	10000	0	0	5	0	0	186	1	1
-20403003	2	0	古墓石巨人	455	0	125583	125583	0	25	0	0	10000	130720	0	1	0	0	0	0	0	0	0	6350068	399	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	12296157	76	10000	0	0	5	0	0	186	1	1
-20403004	2	0	残暴海怪	495	0	148345	148345	0	29	0	0	10000	157744	0	1	0	0	0	0	0	0	0	7316494	459	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	90632901	117	10000	0	0	5	0	0	186	1	1
-20403005	2	0	寒冰古妖	505	0	154242	154242	0	30	0	0	10000	164704	0	1	0	0	0	0	0	0	0	7574138	475	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	27636704	150	10000	0	0	5	0	0	186	1	1
-20403006	2	0	翻水妖龙	545	0	192984	192984	0	34	0	0	10000	208599	0	1	0	0	0	0	0	0	0	9115586	569	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	26067941	253	10000	0	0	5	0	0	186	1	1
-20403007	2	0	深海之王	555	0	204390	204390	0	35	0	0	10000	221256	0	1	0	0	0	0	0	0	0	9623162	599	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	40068843	346	10000	0	0	5	0	0	186	1	1
+20402001	2	0	精英鬼蛛	405	0	25533	25533	0	20	0	0	0	4394	0	0	0	0	0	0	0	0	3000	5196577	326	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	76986274	0	0	0	0	1	34798563	0	1	1	1
+20402002	2	0	精英鱼妖	440	0	29839	29839	0	23	0	0	0	7741	0	0	0	0	0	0	0	0	3000	5734071	360	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	27518996	1	0	0	0	1	52367876	0	1	1	1
+20402003	2	0	精英海石精	450	0	31450	31450	0	24	0	0	0	8115	0	0	0	0	0	0	0	0	3000	5921443	372	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	43395937	1	0	0	0	1	60436129	0	1	1	1
+20402004	2	0	精英海牛	490	0	36998	36998	0	26	0	0	0	10097	0	0	0	0	0	0	0	0	3000	6661390	418	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	92691731	1	0	0	0	1	109294469	0	1	1	1
+20402005	2	0	精英海斗士	500	0	39084	39084	0	29	0	0	0	10537	0	0	0	0	0	0	0	0	3000	6851040	430	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	7253266	2	0	0	0	1	127053886	0	1	1	1
+20402006	2	0	精英地龙	540	0	45948	45948	0	33	0	0	0	12765	0	0	0	0	0	0	0	0	3000	7864938	492	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	85782899	2	0	0	0	1	231950199	0	1	1	1
+20402007	2	0	精英冰骨妖	550	0	48174	48174	0	38	0	0	0	13253	0	0	0	0	0	0	0	0	3000	8123391	508	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	9426047	3	0	0	0	1	269289020	0	1	1	1
+20403001	2	0	猩红女王	410	0	110889	110889	0	23	0	0	10000	114272	0	1	0	0	0	0	0	0	3000	5921443	372	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	79864653	47	10000	0	0	5	0	0	186	1	1
+20403002	2	0	忘川鬼鲨	445	0	132498	132498	0	24	0	0	10000	140284	0	1	0	0	0	0	0	0	3000	6763516	425	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	28195606	83	10000	0	0	5	0	0	186	1	1
+20403003	2	0	幽冥石鬼	455	0	146677	146677	0	25	0	0	10000	155703	0	1	0	0	0	0	0	0	3000	7228636	453	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	10258546	115	10000	0	0	5	0	0	186	1	1
+20403004	2	0	炎魔巨兽	495	0	174032	174032	0	29	0	0	10000	186395	0	1	0	0	0	0	0	0	3000	8260931	517	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	29717300	160	10000	0	0	5	0	0	186	1	1
+20403005	2	0	上古裂妖	505	0	181582	181582	0	30	0	0	10000	195581	0	1	0	0	0	0	0	0	3000	8557220	534	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	60796610	201	10000	0	0	5	0	0	186	1	1
+20403006	2	0	战场魔龙	545	0	205267	205267	0	34	0	0	10000	222189	0	1	0	0	0	0	0	0	3000	9658212	601	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	27966702	314	10000	0	0	5	0	0	186	1	1
+20403007	2	0	戮仙鬼王	555	0	253946	253946	0	35	0	0	10000	266418	0	1	0	0	0	0	0	0	3000	9798411	609	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	82515120	361	10000	0	0	5	0	0	186	1	1
 30102001	2	0	凶狼	50	0	100	100	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	3000	100	0	0	300	2	6	0	0	0	0	0	0	0	0	0	15	2	100	0	0	0	0	1	0	0	1	1	1
 30102002	2	0	巨虎	50	0	100	100	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	3000	100	0	0	300	2	6	0	0	0	0	0	0	0	0	0	15	2	100	0	0	0	0	1	0	0	1	1	1
 30102003	2	0	幼龙	50	0	100	100	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	3000	100	0	0	300	2	6	10005	0	0	0	0	0	0	0	0	15	2	100	0	0	0	0	1	0	0	198	1	1
@@ -546,7 +546,7 @@
 30301001	2	0	精英护卫	200	0	1503	1503	0	6	0	0	10000	25	0	0	780	0	0	0	0	1	3000	634880	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	125457	0	0	0	0	1	44677	7	1	1	1
 30301002	2	0	精英护卫	230	0	1839	1839	0	8	0	0	10000	55	0	0	780	0	0	0	0	1	3000	738321	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	243454	0	0	0	0	1	91068	13	1	1	1
 30301003	2	0	精英护卫	300	0	6273	5324	0	13	0	0	10000	180	0	0	780	0	0	0	0	1	3000	1129082	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	672234	0	0	0	0	1	275695	26	1	1	1
-30301004	2	0	精英护卫	400	0	22079	22079	0	22	0	0	10000	2016	0	0	0	0	0	0	0	0	0	4977758	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	10939612	0	0	0	0	1	1097010	30	1	1	1
+30301004	2	0	精英护卫	400	0	22079	22079	0	22	0	0	10000	2016	0	0	0	0	0	0	0	0	3000	4977758	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	10939612	0	0	0	0	1	1097010	30	1	1	1
 30303001	2	0	天枢	160	0	2636	2636	0	4	0	0	10000	3215	0	1	0	0	0	0	0	3	3000	301782	16	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	6566154	0	10000	0	0	5	0	0	186	1	1
 30303002	2	0	天璇	180	0	3897	3897	0	5	0	0	10000	5001	0	1	0	0	0	0	0	3	3000	339742	18	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	9354177	0	10000	0	0	5	0	0	186	1	1
 30303003	2	0	天玑	210	0	6392	6392	0	6	0	0	10000	8100	0	1	0	0	0	0	0	3	3000	409208	23	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	24105054	0	10000	0	0	5	0	0	186	1	1
@@ -563,10 +563,10 @@
 30303014	2	0	巨木石人	380	0	73225	73225	0	18	0	0	10000	63789	0	1	0	0	0	0	0	3	3000	5222534	327	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	50382622	22	10000	0	0	5	0	0	186	1	1
 30303015	2	0	剧毒蛇王	450	0	105622	105622	0	22	0	0	10000	114307	0	1	0	0	0	0	0	3	3000	6521555	410	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	9673073	66	10000	0	0	5	0	0	186	1	1
 30303016	2	0	古森之灵	485	0	127530	127530	0	25	0	0	10000	141920	0	1	0	0	0	0	0	3	3000	7719538	484	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	86957073	135	10000	0	0	5	0	0	186	1	1
-30303017	2	0	蜘蛛皇后	390	0	75896	75896	0	22	0	0	10000	67285	0	1	0	0	0	0	0	0	0	5378077	337	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	68998899	30	10000	0	0	5	0	0	186	1	1
-30303018	2	0	巨木石人	420	0	86179	86179	0	23	0	0	10000	91700	0	1	0	0	0	0	0	0	0	5803584	364	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	56625328	44	10000	0	0	5	0	0	186	1	1
-30303019	2	0	剧毒蛇王	450	0	105152	105152	0	30	0	0	10000	113765	0	1	0	0	0	0	0	0	0	6504075	409	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	27412954	98	10000	0	0	5	0	0	186	1	1
-30303020	2	0	古森之灵	500	0	115919	115919	0	31	0	0	10000	127377	0	1	0	0	0	0	0	0	0	7107722	446	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	51058764	148	10000	0	0	5	0	0	186	1	1
+30303017	2	0	麒麟瑞兽	390	0	84573	84573	0	22	0	0	10000	89892	0	1	0	0	0	0	0	0	3000	5734071	360	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	50633273	42	10000	0	0	5	0	0	186	1	1
+30303018	2	0	秘境石人	420	0	99720	99720	0	23	0	0	10000	107125	0	1	0	0	0	0	0	0	3000	6297705	396	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	24215454	59	10000	0	0	5	0	0	186	1	1
+30303019	2	0	图腾蛇王	450	0	109347	109347	0	30	0	0	10000	119982	0	1	0	0	0	0	0	0	3000	6851040	430	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	62663383	103	10000	0	0	5	0	0	186	1	1
+30303020	2	0	秘境之主	500	0	133086	133086	0	31	0	0	10000	148347	0	1	0	0	0	0	0	0	3000	8002098	501	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	43992870	198	10000	0	0	5	0	0	186	1	1
 30403001	2	0	仙魔之争NPC	90	0	341	361	53	0	0	0	10000	102	0	0	0	0	0	0	0	0	2000	128115	13	0	200	2	6	0	0	0	0	0	0	0	0	0	40	1	586760	0	10000	0	0	5	0	0	186	1	1
 30403002	2	0	仙魔守卫	90	0	341	361	53	0	0	0	10000	102	0	0	0	0	0	0	0	0	2000	128115	13	0	200	2	6	0	0	0	0	0	0	0	0	0	40	1	586760	0	10000	0	0	5	0	0	186	1	1
 30403003	2	0	仙魔守卫	90	0	341	361	53	0	0	0	10000	102	0	0	0	0	0	0	0	0	2000	128115	13	0	200	2	6	0	0	0	0	0	0	0	0	0	40	1	586760	0	10000	0	0	5	0	0	186	1	1
@@ -1238,14 +1238,14 @@
 40102005	2	0	亚种雷兽	435	0	28866	28866	0	21	0	0	0	7467	0	0	0	0	0	0	0	3	3000	1611629	130	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	12026311	1	0	0	0	1	602510	38	1	1	1
 40102006	2	0	金甲剑士	455	0	31450	31450	0	22	0	0	0	8115	0	0	0	0	0	0	0	3	3000	1671530	135	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	25170648	1	0	0	0	1	809985	22	1	1	1
 40102007	2	0	黄金战将	475	0	34527	34527	0	24	0	0	0	9152	0	0	0	0	0	0	0	3	3000	1761976	143	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	43922990	1	0	0	0	1	1036030	25	1	1	1
-40103001	2	0	仙境巨兽	340	0	58865	58865	0	16	0	0	0	34584	0	1	0	0	0	0	0	3	3000	4102521	258	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	48916350	7	10000	0	0	5	0	0	186	1	1
-40103002	2	0	丛林祭祀	365	0	77357	77357	0	18	0	0	0	47399	0	1	0	0	0	0	0	3	3000	4631686	290	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	60215843	13	10000	0	0	5	0	0	186	1	1
-40103003	2	0	秘境之吻	390	0	110808	110808	0	20	0	0	0	60750	0	1	0	0	0	0	0	3	3000	4977758	312	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	59734246	18	10000	0	0	5	0	0	186	1	1
-40103004	2	0	仙湖守卫	415	0	140270	140270	0	21	0	0	0	72368	0	1	0	0	0	0	0	3	3000	5339065	335	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	4026546	25	10000	0	0	5	0	0	186	1	1
-40103005	2	0	湖中之灵	440	0	158146	158146	0	22	0	0	0	96932	0	1	0	0	0	0	0	3	3000	5734071	360	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	75696600	46	10000	0	0	5	0	0	186	1	1
-40103006	2	0	岩石守卫	460	0	180237	180237	0	23	0	0	0	110376	0	1	0	0	0	0	0	3	3000	6109321	384	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	33070572	59	10000	0	0	5	0	0	186	1	1
-40103007	2	0	裂空魅影	480	0	197295	197295	0	25	0	0	0	122439	0	1	0	0	0	0	0	3	3000	6472247	406	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	69963900	87	10000	0	0	5	0	0	186	1	1
-40103008	2	0	秘境勇士	500	0	204140	204140	0	27	0	0	0	129421	0	1	0	0	0	0	0	3	3000	6851040	430	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	53507609	110	10000	0	0	5	0	0	186	1	1
+40103001	2	0	仙境巨兽	340	0	58865	58865	0	16	0	0	0	34584	0	1	0	0	0	0	0	3	3000	4102521	258	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	55904399	8	10000	0	0	5	0	0	186	1	1
+40103002	2	0	丛林祭祀	365	0	77357	77357	0	18	0	0	0	47399	0	1	0	0	0	0	0	3	3000	4631686	290	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	30242822	15	10000	0	0	5	0	0	186	1	1
+40103003	2	0	秘境之吻	390	0	110808	110808	0	20	0	0	0	60750	0	1	0	0	0	0	0	3	3000	4977758	312	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	69130378	19	10000	0	0	5	0	0	186	1	1
+40103004	2	0	仙湖守卫	415	0	140270	140270	0	21	0	0	0	72368	0	1	0	0	0	0	0	3	3000	5339065	335	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	51322225	26	10000	0	0	5	0	0	186	1	1
+40103005	2	0	湖中之灵	440	0	158146	158146	0	22	0	0	0	96932	0	1	0	0	0	0	0	3	3000	5734071	360	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	759928	51	10000	0	0	5	0	0	186	1	1
+40103006	2	0	岩石守卫	460	0	180237	180237	0	23	0	0	0	110376	0	1	0	0	0	0	0	3	3000	6109321	384	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	72440624	64	10000	0	0	5	0	0	186	1	1
+40103007	2	0	裂空魅影	480	0	197295	197295	0	25	0	0	0	122439	0	1	0	0	0	0	0	3	3000	6472247	406	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	94777377	90	10000	0	0	5	0	0	186	1	1
+40103008	2	0	秘境勇士	500	0	204140	204140	0	27	0	0	0	129421	0	1	0	0	0	0	0	3	3000	6851040	430	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	44351834	117	10000	0	0	5	0	0	186	1	1
 50103001	2	0	道士鼠	1	0	1184	1184	0	2	0	0	10000	1430	0	7	0	0	0	0	0	5	3000	453622	18	0	300	2	6	23010	23072	0	0	0	0	0	0	0	10	2	1742024	0	0	0	0	5	0	0	186	1	1
 50103002	2	0	觉灵鹿	1	0	2863	2863	0	3	0	0	10000	4148	0	7	0	0	0	0	0	5	3000	556113	20	0	300	2	6	23010	23068	0	0	0	0	0	0	0	10	2	5087089	0	0	0	0	5	0	0	186	1	1
 50103003	2	0	球球	1	0	3046	3046	0	4	0	0	10000	4235	0	7	0	0	0	0	0	5	3000	634880	22	0	300	2	6	23010	23074	0	0	0	0	0	0	0	10	2	7079698	0	0	0	0	5	0	0	186	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
index 998f98c..bd02e5c 100644
--- a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
@@ -119,15 +119,6 @@
 114119	32020	159	245	15	20008	0
 114121	32020	108	246	14	20008	0
 114123	32020	158	201	200	20010	0
-116738	21310	84	139	12	20008	0
-116739	21310	153	124	15	20008	0
-116740	21310	16	123	14	20008	0
-116741	21310	15	55	14	20008	0
-116743	21310	154	55	14	20008	0
-116744	21310	111	13	12	20008	0
-116745	21310	57	13	13	20008	0
-116747	21310	84	95	10	20011	0
-116749	21310	85	77	100	20010	0
 116792	31360	17	81	14	20008	0
 116797	31360	89	81	14	20008	0
 116798	31360	52	115	14	20008	0
@@ -135,3 +126,12 @@
 116802	31360	53	170	13	20008	0
 116829	31360	74	93	100	20010	0
 117180	31380	17	18	16	20010	0
+117312	21310	84	139	12	20008	0
+117314	21310	153	124	15	20008	0
+117316	21310	16	123	14	20008	0
+117318	21310	15	55	14	20008	0
+117320	21310	154	55	14	20008	0
+117322	21310	111	13	12	20008	0
+117324	21310	57	13	13	20008	0
+117326	21310	84	95	10	20011	0
+117330	21310	85	77	100	20010	0
diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
index ecde0df..3694ac2 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -1001,15 +1001,6 @@
 117235	30301004	31360	0	[49,50,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 117236	30301004	31360	0	[47,53,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 117237	30301004	31360	0	[45,50,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116778	20402004	21310	0	[114,66,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116779	20402005	21310	0	[152,93,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116844	20402001	21310	0	[10,92,3,15]	1	1	0	3000	0	0	1		5	5	0	0
-116845	20402001	21310	0	[10,97,3,15]	1	1	0	3000	0	0	1		5	5	0	0
-116846	20402001	21310	0	[12,94,3,15]	1	1	0	3000	0	0	1		5	5	0	0
-116847	20402002	21310	0	[53,67,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116848	20402002	21310	0	[54,69,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116849	20402002	21310	0	[53,64,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116858	20402005	21310	0	[155,92,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 114149	0	32020	0	[206,143,0,15]	1	1	0	0	0	0	1		5	5	0	108
 114151	0	32020	0	[153,315,0,15]	1	1	0	0	0	0	1		5	5	0	102
 114153	0	32020	0	[93,293,0,15]	1	1	0	0	0	0	1		5	5	0	103
@@ -1034,14 +1025,6 @@
 114077	0	32020	0	[107,247,0,15]	1	1	0	0	0	0	1		5	5	0	183
 114079	0	32020	0	[227,210,0,14]	1	1	0	0	0	0	1		5	5	0	186
 114081	0	32020	0	[213,135,0,15]	1	1	0	0	0	0	1		5	5	0	187
-116850	20402003	21310	0	[81,46,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116851	20402003	21310	0	[82,48,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116852	20402003	21310	0	[83,44,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116853	20402004	21310	0	[111,65,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116854	20402004	21310	0	[113,68,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116855	20402004	21310	0	[114,63,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116856	20402005	21310	0	[151,94,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116857	20402005	21310	0	[149,93,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 105491	11001005	10100	0	[64,136,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105493	11001005	10100	0	[56,134,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105495	11001005	10100	0	[58,134,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -1061,11 +1044,11 @@
 99710	0	10080	0	[63,61,0,10]	1	1	0	2500	0	0	1		5	5	0	99
 114284	0	31370	0	[18,18,0,30]	1	1	0	0	0	0	1		5	5	0	101
 114286	0	32030	0	[18,18,0,30]	1	1	0	0	0	0	1		5	5	0	101
-116722	0	21310	0	[15,123,0,15]	1	1	0	0	0	0	1		5	5	0	90
-116724	0	21310	0	[60,14,0,15]	1	1	0	0	0	0	1		5	5	0	92
-116726	0	21310	0	[15,57,0,15]	1	1	0	0	0	0	1		5	5	0	91
-116727	0	21310	0	[110,13,0,15]	1	1	0	0	0	0	1		5	5	0	93
-116728	0	21310	0	[155,57,0,15]	1	1	0	0	0	0	1		5	5	0	94
+117284	0	21310	0	[15,123,0,15]	1	1	0	0	0	0	1		5	5	0	90
+117286	0	21310	0	[60,14,0,15]	1	1	0	0	0	0	1		5	5	0	92
+117288	0	21310	0	[15,57,0,15]	1	1	0	0	0	0	1		5	5	0	91
+117290	0	21310	0	[110,13,0,15]	1	1	0	0	0	0	1		5	5	0	93
+117292	0	21310	0	[155,57,0,15]	1	1	0	0	0	0	1		5	5	0	94
 80197	10901002	10090	0	[105,18,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80198	10901002	10090	0	[102,17,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80199	10901002	10090	0	[110,32,0,15]	1	1	0	3000	0	0	1		5	5	0	0
@@ -1187,11 +1170,11 @@
 76613	10301005	10030	0	[66,122,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76625	10301001	10030	0	[67,12,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 80303	10901005	10090	0	[61,123,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116729	0	21310	0	[154,123,0,15]	1	1	0	0	0	0	1		5	5	0	95
-116730	0	21310	0	[84,137,0,15]	1	1	0	0	0	0	1		5	5	0	96
-116773	20402001	21310	0	[8,94,3,14]	1	1	0	3000	0	0	1		5	5	0	0
-116776	20402002	21310	0	[56,66,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-116777	20402003	21310	0	[85,47,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+117294	0	21310	0	[154,123,0,15]	1	1	0	0	0	0	1		5	5	0	95
+117296	0	21310	0	[84,137,0,15]	1	1	0	0	0	0	1		5	5	0	96
+117334	20402001	21310	0	[8,94,3,14]	1	1	0	600000	0	0	1		5	5	0	0
+117336	20402002	21310	0	[56,66,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117338	20402003	21310	0	[85,47,0,15]	1	1	0	600000	0	0	1		5	5	0	0
 76635	10301005	10030	0	[58,125,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76647	10303001	10030	0	[20,160,1,12]	1	1	0	10000	0	0	1		5	5	128	0
 116782	0	31360	0	[17,81,0,15]	1	1	0	0	0	0	1		5	5	0	90
@@ -1202,6 +1185,23 @@
 117220	30301004	31360	0	[48,45,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 117221	30301004	31360	0	[51,43,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 117222	30301004	31360	0	[50,45,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+117340	20402004	21310	0	[114,66,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117342	20402005	21310	0	[152,93,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117346	20402001	21310	0	[10,92,3,15]	1	1	0	600000	0	0	1		5	5	0	0
+117348	20402001	21310	0	[10,97,3,15]	1	1	0	600000	0	0	1		5	5	0	0
+117350	20402001	21310	0	[12,94,3,15]	1	1	0	600000	0	0	1		5	5	0	0
+117352	20402002	21310	0	[53,67,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117354	20402002	21310	0	[54,69,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117356	20402002	21310	0	[53,64,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117358	20402003	21310	0	[81,46,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117360	20402003	21310	0	[82,48,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117362	20402003	21310	0	[83,44,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117364	20402004	21310	0	[111,65,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117366	20402004	21310	0	[113,68,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117368	20402004	21310	0	[114,63,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117370	20402005	21310	0	[151,94,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117372	20402005	21310	0	[149,93,0,15]	1	1	0	600000	0	0	1		5	5	0	0
+117374	20402005	21310	0	[155,92,0,15]	1	1	0	600000	0	0	1		5	5	0	0
 104851	0	21110	0	[8,82,0,15]	1	1	0	0	0	0	1		5	5	0	145
 104852	0	21110	0	[42,92,0,15]	1	1	0	0	0	0	1		5	5	0	146
 104853	0	21110	0	[51,98,0,15]	1	1	0	0	0	0	1		5	5	0	147

--
Gitblit v1.8.0