From 60a301ba1b0101bb9735291be73401c917d5f1ae Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 04 一月 2019 21:22:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/MergeServer_LogicProcess.pyc                                              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc                       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc  |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc                                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc     |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                 |    6 +++---
 db/PyMongoDataServer/LogicProcessThread.pyc                                                    |    0 
 db/PyMongoDataServer/NetCore/AsyncoreServer.pyc                                                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc                    |    0 
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt                                                |   18 +++++++++---------
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                    |   14 +++++++-------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc |    0 
 db/PyMongoDataServer/NetCore/AsynServerClient.pyc                                              |    0 
 db/PyMongoDataServer/PackDispatchThread.pyc                                                    |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc                     |    0 
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                      |    2 +-
 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc                              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc                   |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.pyc          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc           |    0 
 db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc                                               |    0 
 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc                             |    0 
 24 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
index c764b94..845d3bd 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index 716c588..315682a 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index 6a29bfb..41b0b9d 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 82e0480..2ab703f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
index 859736e..078eba4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 83e4e8d..78c12bf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index c816348..29096c2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.pyc
index 79d1cbc..881a184 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
index cb805a6..d0d75cc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 640d664..878e4d9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 5cd5c8b..b763577 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
index 35e92bc..f5eca19 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc
index c92172d..562b177 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc
index 3a6d866..ce7f6c7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
index 05c375e..33c5962 100644
--- a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
+++ b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/LogicProcessThread.pyc b/db/PyMongoDataServer/LogicProcessThread.pyc
index a4a69da..95235c8 100644
--- a/db/PyMongoDataServer/LogicProcessThread.pyc
+++ b/db/PyMongoDataServer/LogicProcessThread.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/MergeServer_LogicProcess.pyc b/db/PyMongoDataServer/MergeServer_LogicProcess.pyc
index 9340e5b..1660920 100644
--- a/db/PyMongoDataServer/MergeServer_LogicProcess.pyc
+++ b/db/PyMongoDataServer/MergeServer_LogicProcess.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/NetCore/AsynServerClient.pyc b/db/PyMongoDataServer/NetCore/AsynServerClient.pyc
index 723687d..48d51bc 100644
--- a/db/PyMongoDataServer/NetCore/AsynServerClient.pyc
+++ b/db/PyMongoDataServer/NetCore/AsynServerClient.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/NetCore/AsyncoreServer.pyc b/db/PyMongoDataServer/NetCore/AsyncoreServer.pyc
index beabbf6..2150ce3 100644
--- a/db/PyMongoDataServer/NetCore/AsyncoreServer.pyc
+++ b/db/PyMongoDataServer/NetCore/AsyncoreServer.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PackDispatchThread.pyc b/db/PyMongoDataServer/PackDispatchThread.pyc
index aadda11..d43855b 100644
--- a/db/PyMongoDataServer/PackDispatchThread.pyc
+++ b/db/PyMongoDataServer/PackDispatchThread.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 7f72f6e..6d05369 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -121,11 +121,11 @@
 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],3001:[8205,8218,8231,8244,8257],3002:[8205,8218,8231,8244,8257],3003:[8205,8218,8231,8244,8257],4001:[8208,8221,8234,8247,8260],4002:[8209,8222,8235,8248,8261],4003:[8210,8223,8236,8249,8262],5002:[8211,8224,8237,8250,8263],5003:[8212,8225,8238,8251,8264],6003:[8213,8226,8239,8252,8265],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]}				
-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]}	{102:[[5000,1],[10000,2]],105:[[2000,3],[4000,4],[6000,5],[8000,6],[10000,7]],107:[[500,1],[1000,2],[2000,3],[4000,4],[6000,5],[8000,6],[10000,7]],108:[[10000,8]],204:[[10000,4]],205:[[10000,5]],206:[[10000,6]]}			
+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]]}		
+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],[4606,4608,4610,4609]]	0	0	0	0
+MutexDrop	[[3804,3803,3802,3801],[4606,4608,4610,4609]]	0	0	0	0
 EquipWashMustID	5412	0	0	0	0
 EquipWashGroup1	1|2	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
 EquipWashGroup2	3|4|5|6|7	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
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 018a36f..5e9b17d 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -77,9 +77,9 @@
 10703001	290	400	2	0	[(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))]	30	{(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,9051:6000,2320:100000,2340:80000,2339:20000,2404:80000}	{}	{}	{}	{}	25	800	1129	1694	[]	[999,3904]
 10703001	1000	400	2	0	[(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))]	30	{(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:1000,9051:6000,2320:100000,2340:80000,2339:20000,2404:80000}	{}	{}	{}	{}	25	800	1129	1694	[]	[999,3904]
 10803001	1000	450	2	0	[(397839,0),(541172,(7,2,107)),(1000000,(7,3,107))]	30	{(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:2500,9051:6000,2320:100000,2340:80000,2339:20000,2404:100000}	{}	{}	{}	{}	25	800	1129	1694	[]	[999,3904]
-10903001	1000	500	2	0	[(397839,0),(541172,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,9051:6000,2320:100000,2340:80000,2339:20000,5408:2222,2404:140000}	{}	{}	{}	{}	25	800	1129	1694	[]	[998,3904]
-11003001	1000	550	2	0	[(397839,0),(541172,(9,2,107)),(1000000,(9,3,107))]	30	{(9,4,107):1000000,(9,5,107):50000,(9,2,108):100000,(9,3,108):10000,(9,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,9051:6000,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000}	{}	{}	{}	{}	25	800	1129	1694	[]	[998,3904]
-11103001	1000	600	2	0	[(397839,0),(541172,(10,2,107)),(1000000,(10,3,107))]	30	{(10,4,107):1000000,(10,5,107):50000,(10,2,108):100000,(10,3,108):10000,(10,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,9051:6000,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000}	{}	{}	{}	{}	25	800	1129	1694	[]	[998,3904]
+10903001	1000	500	2	0	[(397839,0),(541172,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,3804:1000,9051:6000,2320:100000,2340:80000,2339:20000,5408:2222,2404:140000}	{}	{}	{}	{}	25	800	1129	1694	[]	[998,3904]
+11003001	1000	550	2	0	[(397839,0),(541172,(9,2,107)),(1000000,(9,3,107))]	30	{(9,4,107):1000000,(9,5,107):50000,(9,2,108):100000,(9,3,108):10000,(9,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,3804:2000,9051:6000,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000}	{}	{}	{}	{}	25	800	1129	1694	[]	[998,3904]
+11103001	1000	600	2	0	[(397839,0),(541172,(10,2,107)),(1000000,(10,3,107))]	30	{(10,4,107):1000000,(10,5,107):50000,(10,2,108):100000,(10,3,108):10000,(10,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,3804:3000,9051:6000,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000}	{}	{}	{}	{}	25	800	1129	1694	[]	[998,3904]
 31401001	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5303:666667}	{5303:2}	{}	{}	{}	0	0	0	0	[]	[]
 31403001	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5303:800000}	{5303:10}	{}	{}	{}	0	0	0	0	[]	[]
 20102001	0	190	1	0	[(953440,0),(965106,(3,1,107)),(997744,(3,2,107)),(1000000,(3,3,107))]	1	{}	0	{}	{3:[(9600,0),(10000,1)]}	[]	[]	{951:63}	{}	{}	{}	{}	1	800	1077	1615	[]	[]
@@ -118,7 +118,7 @@
 20203004	1000	410	2	0	[(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]	30	{(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:2000,9051:6000,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000}	{}	{2:800000}	{}	{2:5}	25	800	1129	1694	[]	[999,3904]
 20203005	1000	455	2	0	[(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:3000,9051:6000,2320:100000,5202:520000,2340:80000,2339:20000,5408:1778,2404:120000}	{}	{2:800000}	{}	{2:5}	25	800	1356	1824	[]	[999,3904]
 20203006	1000	460	2	0	[(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:3500,9051:6000,2320:100000,5202:540000,2340:80000,2339:20000,5408:2222,2404:120000}	{}	{2:800000}	{}	{2:5}	25	800	1356	1824	[]	[999,3904]
-20203007	1000	505	2	0	[(388426,0),(531759,(9,2,107)),(1000000,(9,3,107))]	30	{(9,4,107):1000000,(9,5,107):50000,(9,2,108):100000,(9,3,108):10000,(9,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,9051:6000,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000}	{}	{2:800000}	{}	{2:5}	25	800	1588	1962	[]	[999,3904]
+20203007	1000	505	2	0	[(388426,0),(531759,(9,2,107)),(1000000,(9,3,107))]	30	{(9,4,107):1000000,(9,5,107):50000,(9,2,108):100000,(9,3,108):10000,(9,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:20000,3803:5000,3804:1000,9051:6000,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000}	{}	{2:800000}	{}	{2:5}	25	800	1588	1962	[]	[999,3904]
 30303001	1000	210	0	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):40000,(4,2,108):50000,(4,3,108):5000,(4,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,2320:50000}	{}	{}	{}	{}	20	800	1123	1685	[]	[1004]
 30303002	1000	220	0	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):50000,(4,3,108):5000,(4,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
 30303003	1000	260	0	0	[(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]	30	{(5,4,107):1000000,(5,5,107):10000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:5000,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
@@ -132,11 +132,11 @@
 30303010	290	350	0	0	[(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]	30	{(6,4,107):1000000,(6,5,107):20000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:5000,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1356	1824	[]	[1004]
 30303010	1000	350	0	0	[(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]	30	{(6,4,107):1000000,(6,5,107):20000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:500,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1356	1824	[]	[1004]
 30303011	1000	400	0	0	[(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]	30	{(7,4,107):1000000,(7,5,107):15000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:600,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1588	1962	[]	[1004]
-30303012	1000	450	0	0	[(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):10000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1588	1962	[]	[1004]
+30303012	1000	450	0	0	[(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):10000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,3804:100,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1588	1962	[]	[1004]
 30303013	1000	380	0	0	[(410784,0),(554117,(7,2,107)),(1000000,(7,3,107))]	30	{(7,4,107):1000000,(7,5,107):15000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:500,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1123	1685	[]	[1004]
 30303014	1000	430	0	0	[(410784,0),(554117,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):10000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:600,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
-30303015	1000	500	0	0	[(406076,0),(549409,(9,2,107)),(1000000,(9,3,107))]	30	{(9,4,107):1000000,(9,5,107):10000,(9,2,108):50000,(9,3,108):5000,(9,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
-30303016	1000	550	0	0	[(406076,0),(549409,(9,2,107)),(1000000,(9,3,107))]	30	{(9,4,107):1000000,(9,5,107):10000,(9,2,108):50000,(9,3,108):5000,(9,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
+30303015	1000	500	0	0	[(406076,0),(549409,(9,2,107)),(1000000,(9,3,107))]	30	{(9,4,107):1000000,(9,5,107):10000,(9,2,108):50000,(9,3,108):5000,(9,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,3804:200,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
+30303016	1000	550	0	0	[(406076,0),(549409,(9,2,107)),(1000000,(9,3,107))]	30	{(9,4,107):1000000,(9,5,107):10000,(9,2,108):50000,(9,3,108):5000,(9,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,3804:300,9051:2000,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
 31501001	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5301:1000000}	{}	{}	{}	{}	0	0	0	0	[]	[]
 31501002	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5301:1000000}	{}	{}	{}	{}	0	0	0	0	[]	[]
 31501003	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5301:1000000}	{}	{}	{}	{}	0	0	0	0	[]	[]
@@ -199,8 +199,8 @@
 31903003	1000	0	0	0	[(716666,0),(783333,(5,2,107)),(1000000,(5,3,107)),(1000000,(5,2,108)),(1000000,(5,3,108))]	30	{(5,4,107):1000000,(5,5,107):50000,(5,2,108):0,(5,3,108):0,(5,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:10000,9074:3000,4609:100000,5202:520000,4151:1000000,4184:1000000,2405:301724}	{4151:4,5202:1}	{2:832000}	{}	{2:5}	0	0	0	0	[]	[1006]
 31903004	0	0	0	0	[(716666,0),(783333,(6,2,107)),(1000000,(6,3,107)),(1000000,(6,2,108)),(1000000,(6,3,108))]	30	{(6,4,107):1000000,(6,5,107):5000,(6,2,108):0,(6,3,108):0,(6,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:540000,4151:1000000,4184:1000000,2405:301724}	{4151:4,5202:1}	{2:676000}	{}	{2:10}	0	0	0	0	[]	[1006]
 31903005	0	0	0	0	[(716666,0),(783333,(7,2,107)),(1000000,(7,3,107)),(1000000,(7,2,108)),(1000000,(7,3,108))]	30	{(7,4,107):1000000,(7,5,107):5000,(7,2,108):0,(7,3,108):0,(7,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:560000,4151:1000000,4184:1000000,2405:301724}	{4151:4,5202:1}	{2:732333}	{}	{2:15}	0	0	0	0	[]	[1006]
-31903006	0	0	0	0	[(716666,0),(783333,(8,2,107)),(1000000,(8,3,107)),(1000000,(8,2,108)),(1000000,(8,3,108))]	30	{(8,4,107):1000000,(8,5,107):5000,(8,2,108):0,(8,3,108):0,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:580000,4151:1000000,4184:1000000,5408:4000,2405:301724}	{4151:4,5202:1}	{2:915416}	{}	{2:15}	0	0	0	0	[]	[1006]
-31903007	0	0	0	0	[(716666,0),(783333,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,2,108)),(1000000,(9,3,108))]	30	{(9,4,107):1000000,(9,5,107):5000,(9,2,108):0,(9,3,108):0,(9,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:580000,4151:1000000,4184:1000000,5408:4000,2405:301724}	{4151:4,5202:1}	{2:915416}	{}	{2:15}	0	0	0	0	[]	[1006]
+31903006	0	0	0	0	[(716666,0),(783333,(8,2,107)),(1000000,(8,3,107)),(1000000,(8,2,108)),(1000000,(8,3,108))]	30	{(8,4,107):1000000,(8,5,107):5000,(8,2,108):0,(8,3,108):0,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:10000,3803:100,3804:50,9074:3000,4609:100000,5202:580000,4151:1000000,4184:1000000,5408:4000,2405:297872}	{4151:4,5202:1}	{2:915416}	{}	{2:15}	0	0	0	0	[]	[1006]
+31903007	0	0	0	0	[(716666,0),(783333,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,2,108)),(1000000,(9,3,108))]	30	{(9,4,107):1000000,(9,5,107):5000,(9,2,108):0,(9,3,108):0,(9,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:10000,3803:100,3804:50,9074:3000,4609:100000,5202:580000,4151:1000000,4184:1000000,5408:4000,2405:297872}	{4151:4,5202:1}	{2:915416}	{}	{2:15}	0	0	0	0	[]	[1006]
 30301001	0	280	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
 30301002	0	300	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
 30301003	0	320	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 080ff49..97be49f 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -572,7 +572,7 @@
 30902001	2	0	皓月战神幻象	10	0	22	22	0	0	0	0	10000	26	0	0	0	0	0	0	0	0	2000	845	0	0	200	2	4	10012	10013	10009	0	0	0	0	0	0	80	2	2737	0	0	0	0	5	0	0	186	1	1
 31103001	2	0	暗裔暴君幻象	20	0	29	29	0	0	0	0	10000	43	0	0	0	0	0	0	0	0	2600	2021	2	0	300	2	5	10059	10060	10061	10201	0	0	0	0	0	40	2	6012	0	0	0	0	3	0	0	186	1	1
 31103002	2	0	龙血武姬幻象	35	0	64	64	0	0	0	0	10000	77	0	0	0	0	0	0	0	0	2600	4512	5	0	300	2	5	10050	10051	10052	10202	0	0	0	0	0	40	2	16119	0	0	0	0	3	0	0	186	1	1
-31103003	2	0	执印龙王幻象	50	0	138	138	0	0	0	0	10000	238	0	0	0	0	0	0	0	0	2600	7707	8	0	300	2	5	10053	10054	10055	10203	0	0	0	0	0	40	2	25758	0	0	0	0	3	0	0	186	1	1
+31103003	2	0	执印龙王幻象	50	0	138	138	0	0	0	0	10000	238	0	0	0	0	0	0	0	0	2600	7707	8	0	300	2	5	10053	10054	10055	10203	0	0	0	0	0	40	2	20758	0	0	0	0	3	0	0	186	1	1
 31103004	2	0	杏黄术士幻象	65	0	228	228	0	0	0	0	10000	280	0	0	0	0	0	0	0	0	2600	11280	12	0	300	2	5	10056	10057	10058	10204	0	0	0	0	0	40	2	65163	0	0	0	0	3	0	0	186	1	1
 31103005	2	0	东皇太一幻象	115	0	1152	1152	0	0	0	0	10000	1024	0	0	0	0	0	0	0	0	2600	19740	20	0	300	2	5	10062	10063	10064	10205	0	0	0	0	0	40	2	117184	0	0	0	0	3	0	0	186	1	1
 31103006	2	0	枯藤老人幻象	160	0	1258	1258	0	0	0	0	90000	2054	0	0	0	0	0	0	0	0	2600	28200	27	0	300	2	5	10065	10066	10067	10206	0	0	0	0	0	40	2	627049	0	0	0	0	3	0	0	186	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 45ee6de..8cb70a2 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -738,7 +738,7 @@
 47070	阴阳妙法	47070	1	1	2	9	0	16	0	0	0	0	10	0	0	0	0	0	0	0	0	4022	0	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	16000	0	0	0	0	0	0	0	0	0	50600	0	0	0	0
 47080	麒麟幻真	47080	1	1	2	9	0	7	0	0	0	0	0	0	0	20000	0	0	0	0	0	4048	0	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	47081	0	0	0	0	0	0	0	0	0	0	2	16000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47081	回血	47081	1	1	2	0	0	2	0	0	8	1	10	0	0	0	0	0	0	0	0	1000	1000	500	1	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-47090	蚩尤法身	47090	1	1	2	9	0	7	0	0	8	0	10	0	0	60000	0	0	0	0	0	1000	5000	0	1	4028	2000	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+47090	蚩尤法身	47090	1	1	2	9	0	7	0	0	8	0	10	0	0	60000	0	0	0	0	0	1000	5000	0	1	4028	2000	0	1	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47130	贯日之威	47130	1	1	2	9	0	16	1	0	0	0	10	0	0	60000	0	0	0	0	0	4501	5000	10000	0	4023	10000	3000	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47140	琉璃似水	47140	1	1	2	9	0	7	0	0	0	0	0	0	0	60000	0	0	0	0	0	4050	6500	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47100	龙凤之力	47100	1	1	0	9	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4041	2000	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	3000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -756,7 +756,7 @@
 47270	阴阳妙法	47270	1	1	4	9	0	16	0	0	0	0	10	0	0	0	0	0	0	0	0	4022	0	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	16000	0	0	0	0	0	0	0	0	0	55600	0	0	0	0
 47280	麒麟幻真	47280	1	1	4	9	0	7	0	0	0	0	0	0	0	20000	0	0	0	0	0	4048	0	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	47081	0	0	0	0	0	0	0	0	0	0	2	16000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47281	回血	47281	1	1	4	0	0	2	0	0	8	1	10	0	0	0	0	0	0	0	0	1000	1000	500	1	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-47290	蚩尤法身	47290	1	1	4	9	0	7	0	0	8	0	10	0	0	60000	0	0	0	0	0	1000	5000	0	1	4028	2000	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+47290	蚩尤法身	47290	1	1	4	9	0	7	0	0	8	0	10	0	0	60000	0	0	0	0	0	1000	5000	0	1	4028	2000	0	1	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47330	贯日之威	47330	1	1	4	9	0	16	1	0	0	0	10	0	0	60000	0	0	0	0	0	4501	5000	10000	0	4023	10000	3000	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47340	琉璃似水	47340	1	1	4	9	0	7	0	0	0	0	0	0	0	60000	0	0	0	0	0	4050	6500	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47400	斗战之力	47400	1	1	8	9	0	7	0	0	1	0	41	8	0	0	0	0	0	0	0	4004	10000	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	47201	0	0	0	0	0	0	0	0	0	0	2	12000	0	0	0	0	0	0	0	0	0	55000	0	0	0	0
@@ -772,7 +772,7 @@
 47470	阴阳妙法	47470	1	1	8	9	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4022	0	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	16000	0	0	0	0	0	0	0	0	0	55600	0	0	0	0
 47480	麒麟幻真	47480	1	1	8	9	0	7	0	0	0	0	0	0	0	20000	0	0	0	0	0	4048	0	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	47281	0	0	0	0	0	0	0	0	0	0	2	16000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47481	回血	47481	1	1	8	0	0	2	0	0	8	1	10	0	0	0	0	0	0	0	0	1000	1000	500	1	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-47490	蚩尤法身	47490	1	1	8	9	0	7	0	0	0	0	0	0	0	60000	0	0	0	0	0	4028	5000	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	47291	0	0	0	0	0	0	0	0	0	0	2	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+47490	蚩尤法身	47490	1	1	8	9	0	7	0	0	0	0	0	0	0	60000	0	0	0	0	0	4028	5000	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	47291	0	0	0	0	0	0	0	0	0	0	2	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47491	回血	47491	1	1	8	0	0	2	0	0	8	1	10	0	0	0	0	0	0	0	0	1000	5000	500	1	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 47530	贯日之威	47530	1	1	8	9	0	16	1	0	0	0	10	0	0	60000	0	0	0	0	0	4501	5000	10000	0	4023	10000	3000	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 47540	琉璃似水	47540	1	1	8	9	0	7	0	0	0	0	0	0	0	60000	0	0	0	0	0	4050	6500	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	20000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -1802,7 +1802,7 @@
 50910	元素召唤	50910	1	1	2	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105002	0	0	1013	10000	0	0	4004	10000	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	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50911	森罗万象 	50911	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	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	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50912	斩杀	50912	1	1	2	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	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	56001	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50913	起死回生	50913	1	1	2	2	0	7	0	0	0	0	0	0	0	100000	0	0	0	0	0	4028	10000	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	50947	50948	0	0	0	0	0	0	0	0	0	2	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+50913	起死回生	50913	1	1	2	2	0	7	0	0	0	0	0	0	0	100000	0	0	0	0	0	4028	10000	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	50947	50948	0	0	0	0	0	0	0	0	0	2	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50932	元素减少攻防	50932	1	1	0	0	0	6	3	0	0	0	41	10	0	0	0	0	0	0	0	13	3000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50939	剩余护盾爆炸	50939	1	1	2	0	0	1	0	0	2	3	40	0	0	0	0	0	0	0	0	0	0	0	0	4023	10000	5000	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50947	起死回生眩晕	50947	1	1	0	0	0	14	3	0	1	0	41	10	0	0	0	0	0	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	3	511	511	3	4	0	0	0	0	0	0
@@ -1972,7 +1972,7 @@
 30657	炎盾	30650	8	10	2	4	0	16	3	0	0	0	10	0	0	0	0	0	0	0	0	4022	8000	0	0	4517	10000	0	14	1011	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	21500	30600	6	0	20042	0	0	0	2	434472	0	0	0	0	0	0	0	0	0	30000	0	0	0	0
 30658	炎盾	30650	9	10	2	4	0	16	3	0	0	0	10	0	0	0	0	0	0	0	0	4022	9000	0	0	4517	10000	0	14	1011	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	21500	30600	6	0	20042	0	0	0	2	488781	0	0	0	0	0	0	0	0	0	30000	0	0	0	0
 30659	炎盾	30650	10	10	2	4	0	16	3	0	0	0	10	0	0	0	0	0	0	0	0	4022	10000	0	0	4517	10000	0	14	1011	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	21500	30600	6	0	20042	0	0	0	2	543090	0	0	0	0	0	0	0	0	0	30000	0	0	0	0
-30700	浴血奋战	30700	1	1	2	4	0	16	3	0	0	0	10	0	0	0	0	0	0	0	0	4022	10000	0	0	4518	0	0	0	4519	0	0	0	76	5000	1	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	21800	30650	6	0	20052	0	0	0	2	81464	0	0	0	0	0	0	0	0	0	30000	0	0	0	0
+30700	浴血奋战	30700	1	1	2	4	0	16	3	0	0	0	10	0	0	0	0	0	0	0	0	4022	10000	0	0	4518	0	0	0	4519	1	0	0	76	5000	1	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	21800	30650	6	0	20052	0	0	0	2	81464	0	0	0	0	0	0	0	0	0	30000	0	0	0	0
 30750	冥炎之力	30750	1	5	2	4	0	7	0	0	0	0	0	2	0	0	0	0	0	0	0	4056	4000	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	20600	0	0	0	0	0	0	0	2	27081	0	0	0	0	0	0	0	0	0	50908	0	0	0	0
 30751	冥炎之力	30750	2	5	2	4	0	7	0	0	0	0	0	2	0	0	0	0	0	0	0	4056	8000	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	20600	0	0	0	0	0	0	0	2	54162	0	0	0	0	0	0	0	0	0	50908	0	0	0	0
 30752	冥炎之力	30750	3	5	2	4	0	7	0	0	0	0	0	2	0	0	0	0	0	0	0	4056	12000	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	20600	0	0	0	0	0	0	0	2	81243	0	0	0	0	0	0	0	0	0	50908	0	0	0	0
@@ -3215,7 +3215,7 @@
 55910	元素召唤	55910	1	1	4	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105003	0	0	4004	10000	0	0	1013	10000	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	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55911	森罗万象 	55911	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	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	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55912	斩杀	55912	1	1	4	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	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	56001	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55913	起死回生	55913	1	1	4	2	0	7	0	0	0	0	0	0	0	100000	0	0	0	0	0	4028	10000	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	55947	55948	0	0	0	0	0	0	0	0	0	2	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+55913	起死回生	55913	1	1	4	2	0	7	0	0	0	0	0	0	0	100000	0	0	0	0	0	4028	10000	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	55947	55948	0	0	0	0	0	0	0	0	0	2	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55932	定身	55932	1	1	0	0	0	14	3	0	0	0	41	10	0	0	0	0	0	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	507	507	4	8	0	0	0	0	0	0
 55939	剩余护盾爆炸	55939	1	1	4	0	0	1	0	0	2	3	40	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	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 55947	起死回生眩晕	55947	1	1	0	0	0	14	3	0	1	0	41	10	0	0	0	0	0	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	3	511	511	3	4	0	0	0	0	0	0
@@ -3450,7 +3450,7 @@
 35957	雪上加霜	35950	8	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4057	8000	6	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	51500	35900	9	0	20040	0	0	0	2	452208	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 35958	雪上加霜	35950	9	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4057	9000	6	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	51500	35900	9	0	20040	0	0	0	2	508734	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 35959	雪上加霜	35950	10	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4057	10000	6	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	51500	35900	9	0	20040	0	0	0	2	565260	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-36000	不灭冰心(PVP)	36000	1	1	4	4	0	16	1	0	0	0	10	2	0	90000	0	0	0	0	0	4028	10000	0	0	4519	0	0	0	56	10000	1	0	9	8000	4	0	10	8000	4	0	0	0	0	0	10000	5000	0	0	0	0	51800	35950	6	0	20050	0	0	0	2	84790	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+36000	不灭冰心(PVP)	36000	1	1	4	4	0	16	1	0	0	0	10	2	0	90000	0	0	0	0	0	4028	10000	0	1	4519	1	0	0	56	10000	1	0	9	8000	4	0	10	8000	4	0	0	0	0	0	10000	5000	0	0	0	0	51800	35950	6	0	20050	0	0	0	2	84790	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 36050	闪避本能	36050	1	10	4	4	0	7	0	0	0	0	10	2	0	0	0	0	0	0	0	1010	10000	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	1274	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 36051	闪避本能	36050	2	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	1010	10000	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	1529	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 36052	闪避本能	36050	3	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	1010	10000	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	1784	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0