From 0050aff6aeb9670684be091fd9489a9d0a51535e Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 11 十月 2018 16:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/GMToolLogicProcess/Commands/GMT_PlayerItemInfo.pyc             |    0 
 db/PyMongoDataServer/PySysDB/tagHorseUp.txt                                         |  142 ++++++++--------
 db/PyMongoDataServer/PySysDB/tagPetClassCost.txt                                    |  290 +++++++++++++++++------------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt                                         |   12 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                          |   10 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc         |    0 
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt                                     |    4 
 8 files changed, 224 insertions(+), 234 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
index 8dfa343..b089274 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index 65be629..8b23e03 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMT_PlayerItemInfo.pyc b/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMT_PlayerItemInfo.pyc
index a183547..b5329b0 100644
--- a/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMT_PlayerItemInfo.pyc
+++ b/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMT_PlayerItemInfo.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index 6ec60e1..04c27ae 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -478,7 +478,7 @@
 308	17	1987	6|7|23	27411|1370|60	0	
 308	18	2110	6|7|23	29595|1479|60	0	
 308	19	2237	6|7|23	31845|1592|60	0	
-308	20	2369	6|7|23	34156|1707|60	49220	
+308	20	2369	6|7|23	34156|1707|60	49220	MountUpLv12
 308	21	2505	6|7|23	36526|1826|60	0	
 308	22	2645	6|7|23	38968|1948|60	0	
 308	23	2790	6|7|23	41481|2074|60	0	
@@ -529,73 +529,73 @@
 309	28	2863	6|7|23	43338|2166|40	0	
 309	29	3045	6|7|23	45629|2281|40	0	
 309	30	0	6|7|23	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	
-310	4	2486	6|7|23	15495|774|80	49150	
-310	5	2694	6|7|23	17297|864|80	0	
-310	6	2915	6|7|23	19183|959|80	0	
-310	7	3151	6|7|23	21204|1060|80	0	
-310	8	3400	6|7|23	23366|1168|80	0	
-310	9	3663	6|7|23	25675|1283|80	0	
-310	10	3940	6|7|23	28137|1406|80	49155	
-310	11	4231	6|7|23	30757|1537|80	0	
-310	12	4535	6|7|23	33501|1675|80	0	
-310	13	4853	6|7|23	36368|1818|80	0	
-310	14	5185	6|7|23	39355|1967|80	0	
-310	15	5531	6|7|23	42462|2123|80	0	
-310	16	5891	6|7|23	45684|2284|80	0	
-310	17	6264	6|7|23	49018|2450|80	0	
-310	18	6651	6|7|23	52461|2623|80	0	
-310	19	7052	6|7|23	56006|2800|80	0	
-310	20	7467	6|7|23	59649|2982|80	49160	
-310	21	7896	6|7|23	63383|3169|80	0	
-310	22	8338	6|7|23	67232|3361|80	0	
-310	23	8794	6|7|23	71193|3559|80	0	
-310	24	9264	6|7|23	75260|3763|80	0	
-310	25	9748	6|7|23	79429|3971|80	0	
-310	26	10245	6|7|23	83694|4184|80	0	
-310	27	10756	6|7|23	88048|4402|80	0	
-310	28	11281	6|7|23	92486|4624|80	0	
-310	29	11820	6|7|23	96998|4849|80	0	
-310	30	12373	6|7|23	101579|5078|80	0	
-310	31	12939	6|7|23	106219|5310|80	0	
-310	32	13519	6|7|23	110974|5548|80	0	
-310	33	14113	6|7|23	115841|5792|80	0	
-310	34	14721	6|7|23	120816|6040|80	0	
-310	35	15342	6|7|23	125895|6294|80	0	
-310	36	15978	6|7|23	131073|6553|80	0	
-310	37	16627	6|7|23	136346|6817|80	0	
-310	38	17290	6|7|23	141709|7085|80	0	
-310	39	17966	6|7|23	147155|7357|80	0	
-310	40	18657	6|7|23	152680|7634|80	0	
-310	41	19361	6|7|23	158277|7913|80	0	
-310	42	20079	6|7|23	164086|8204|80	0	
-310	43	20811	6|7|23	170109|8505|80	0	
-310	44	21557	6|7|23	176353|8817|80	0	
-310	45	22316	6|7|23	182820|9141|80	0	
-310	46	23089	6|7|23	189515|9475|80	0	
-310	47	23876	6|7|23	196442|9822|80	0	
-310	48	24677	6|7|23	203605|10180|80	0	
-310	49	25511	6|7|23	211008|10550|80	0	
-310	50	0	6|7|23	218656|10932|80	0	
-311	1	493	6|7|23	1764|88|40	0	
-311	2	535	6|7|23	2553|127|40	0	
-311	3	581	6|7|23	3384|169|40	0	
-311	4	630	6|7|23	4257|212|40	49195	
-311	5	683	6|7|23	5172|258|40	0	
-311	6	740	6|7|23	6129|306|40	0	
-311	7	799	6|7|23	7155|357|40	0	
-311	8	863	6|7|23	8252|412|40	0	
-311	9	929	6|7|23	9424|471|40	0	
-311	10	1000	6|7|23	10674|533|40	49200	
-311	11	1073	6|7|23	12004|600|40	0	
-311	12	1151	6|7|23	13397|669|40	0	
-311	13	1231	6|7|23	14852|742|40	0	
-311	14	1316	6|7|23	16368|818|40	0	
-311	15	1403	6|7|23	17945|897|40	0	
-311	16	1495	6|7|23	19581|979|40	0	
-311	17	1590	6|7|23	21274|1063|40	0	
-311	18	1688	6|7|23	23021|1151|40	0	
-311	19	1790	6|7|23	24821|1241|40	0	
-311	20	1895	6|7|23	26670|1333|40	49205	
+310	1	651	6|7|124	3024|151|60	0	
+310	2	707	6|7|125	4066|203|60	0	
+310	3	767	6|7|126	5163|258|60	0	
+310	4	832	6|7|127	6314|315|60	49240	
+310	5	902	6|7|128	7522|376|60	0	
+310	6	976	6|7|129	8786|439|60	0	
+310	7	1055	6|7|130	10140|507|60	0	
+310	8	1139	6|7|131	11588|579|60	0	
+310	9	1227	6|7|132	13135|656|60	0	
+310	10	1320	6|7|133	14785|739|60	49245	
+310	11	1417	6|7|134	16541|827|60	0	
+310	12	1519	6|7|135	18379|918|60	0	
+310	13	1626	6|7|136	20300|1015|60	0	
+310	14	1737	6|7|137	22302|1115|60	0	
+310	15	1853	6|7|138	24383|1219|60	0	
+310	16	1973	6|7|139	26543|1327|60	0	
+310	17	2098	6|7|140	28777|1438|60	0	
+310	18	2228	6|7|141	31083|1554|60	0	
+310	19	2362	6|7|142	33459|1672|60	0	
+310	20	2501	6|7|143	35900|1795|60	49250	MountUpLv11
+310	21	2645	6|7|144	38402|1920|60	0	
+310	22	2793	6|7|145	40981|2049|60	0	
+310	23	2946	6|7|146	43635|2181|60	0	
+310	24	3103	6|7|147	46360|2318|60	0	
+310	25	3265	6|7|148	49154|2457|60	0	
+310	26	3432	6|7|149	52011|2600|60	0	
+310	27	3603	6|7|150	54929|2746|60	0	
+310	28	3779	6|7|151	57902|2895|60	0	
+310	29	3960	6|7|152	60926|3046|60	0	
+310	30	4145	6|7|153	63995|3199|60	0	
+310	31	4335	6|7|154	67104|3355|60	0	
+310	32	4529	6|7|155	70290|3514|60	0	
+310	33	4728	6|7|156	73551|3677|60	0	
+310	34	4932	6|7|157	76885|3844|60	0	
+310	35	5140	6|7|158	80288|4014|60	0	
+310	36	5353	6|7|159	83758|4187|60	0	
+310	37	5570	6|7|160	87291|4364|60	0	
+310	38	5792	6|7|161	90884|4544|60	0	
+310	39	6060	6|7|162	94533|4726|60	0	
+310	40	0	6|7|163	98235|4911|60	0	
+311	1	478	6|7|94	1224|61|40	0	
+311	2	519	6|7|95	1990|99|40	0	
+311	3	564	6|7|96	2795|139|40	0	
+311	4	612	6|7|97	3642|182|40	49230	
+311	5	663	6|7|98	4529|226|40	0	
+311	6	717	6|7|99	5458|272|40	0	
+311	7	775	6|7|100	6453|322|40	0	
+311	8	837	6|7|101	7517|375|40	0	
+311	9	901	6|7|102	8654|432|40	0	
+311	10	970	6|7|103	9866|493|40	49231	
+311	11	1041	6|7|104	11157|557|40	0	
+311	12	1116	6|7|105	12508|625|40	0	
+311	13	1194	6|7|106	13919|695|40	0	
+311	14	1276	6|7|107	15390|769|40	0	
+311	15	1361	6|7|108	16920|846|40	0	
+311	16	1450	6|7|109	18506|925|40	0	
+311	17	1542	6|7|110	20148|1007|40	0	
+311	18	1637	6|7|111	21843|1092|40	0	
+311	19	1736	6|7|112	23589|1179|40	0	
+311	20	1838	6|7|113	25383|1269|40	49235	
+311	21	1943	6|7|114	27221|1361|40	0	
+311	22	2052	6|7|115	29117|1455|40	0	
+311	23	2165	6|7|116	31067|1553|40	0	
+311	24	2280	6|7|117	33069|1653|40	0	
+311	25	2399	6|7|118	35122|1756|40	0	
+311	26	2522	6|7|119	37222|1861|40	0	
+311	27	2648	6|7|120	39366|1968|40	0	
+311	28	2777	6|7|121	41551|2077|40	0	
+311	29	2987	6|7|122	43773|2188|40	0	
+311	30	0	6|7|123	46028|2301|40	0	
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index ce4e38a..919cc4a 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -165,8 +165,8 @@
 31503005	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):1200000,(6,5,107):5000}	1	{4:2,5:1}	{3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}	[]	[]	{5202:800000,5006:27778,5007:27778,5206:0,5207:0,4606:0,8064:0,4608:0}	{}	{2:2488320}	{}	{2:1}	25	800	1129	1694	[]	[958]
 31503006	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):1200000,(7,5,107):5000}	1	{4:2,5:1}	{3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}	[]	[]	{5202:850000,5006:32986,5007:32986,5206:0,5207:0,4606:0,8074:6597,4608:0}	{}	{2:2985984}	{}	{2:1}	25	800	1356	1824	[]	[958]
 31503007	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):1200000,(7,5,107):5000}	1	{4:2,5:1}	{3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}	[]	[]	{5202:900000,5006:32986,5007:32986,5206:0,5207:0,4606:0,8074:6597,4608:0}	{}	{2:3583180}	{}	{2:1}	25	800	1356	1824	[]	[958]
-31503008	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):1200000,(8,5,107):5000}	1	{4:2,5:1}	{3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}	[]	[]	{5202:950000,5006:48611,5007:48611,5206:0,5207:0,4606:9722,8084:9722,4608:0}	{}	{2:4299816}	{}	{2:1}	25	800	1588	1962	[]	[958]
-31503009	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):1200000,(8,5,107):5000}	1	{4:2,5:1}	{3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}	[]	[]	{5202:1000000,5006:48611,5007:48611,5206:0,5207:0,4606:0,8084:9722,4608:9722}	{}	{2:5159780}	{}	{2:1}	25	800	1588	1962	[]	[958]
+31503008	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):1200000,(8,5,107):5000}	1	{4:2,5:1}	{3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}	[]	[]	{5202:950000,5006:48611,5007:48611,5206:0,5207:0,4606:0,8084:9722,4608:9722}	{}	{2:4299816}	{}	{2:1}	25	800	1588	1962	[]	[958]
+31503009	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):1200000,(8,5,107):5000}	1	{4:2,5:1}	{3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}	[]	[]	{5202:1000000,5006:48611,5007:48611,5206:0,5207:0,4606:9722,8084:9722,4608:0}	{}	{2:5159780}	{}	{2:1}	25	800	1588	1962	[]	[958]
 60203001	0	0	0	1	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[1,1,1,[1009,10112,20112,30112,10114,20114,30114]]	[]
 60203002	0	0	0	1	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[1,1,1,[1010,10211,20211,30211,10213,20213,30213]]	[]
 60203003	0	0	0	1	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[1,1,1,[1011,10222,20222,30222,10211,20211,30211]]	[]
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index d29e46a..1a3a9a2 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -639,153 +639,143 @@
 50106312	28	5440	8235
 50106312	29	5707	8703
 50106312	30	0	9176
-50106313	1	2468	1440
-50106313	2	2679	1785
-50106313	3	2908	2154
-50106313	4	3154	2546
-50106313	5	3418	2964
-50106313	6	3700	3409
-50106313	7	3999	3882
-50106313	8	4315	4386
-50106313	9	4649	4921
-50106313	10	5000	5489
-50106313	11	5369	6089
-50106313	12	5755	6728
-50106313	13	6159	7407
-50106313	14	6581	8127
-50106313	15	7019	8891
-50106313	16	7476	9698
-50106313	17	7950	10551
-50106313	18	8441	11449
-50106313	19	8950	12394
-50106313	20	9476	13388
-50106313	21	10020	14430
-50106313	22	10581	15502
-50106313	23	11160	16603
-50106313	24	11756	17730
-50106313	25	12370	18882
-50106313	26	13001	20057
-50106313	27	13650	21254
-50106313	28	14316	22469
-50106313	29	15000	23700
-50106313	30	15701	24945
-50106313	31	16420	26201
-50106313	32	17157	27482
-50106313	33	17910	28786
-50106313	34	18682	30111
-50106313	35	19470	31456
-50106313	36	20277	32819
-50106313	37	21100	34198
-50106313	38	21941	35591
-50106313	39	22800	36995
-50106313	40	23676	38409
-50106314	1	2468	1440
-50106314	2	2679	1785
-50106314	3	2908	2154
-50106314	4	3154	2546
-50106314	5	3418	2964
-50106314	6	3700	3409
-50106314	7	3999	3882
-50106314	8	4315	4386
-50106314	9	4649	4921
-50106314	10	5000	5489
-50106314	11	5369	6089
-50106314	12	5755	6728
-50106314	13	6159	7407
-50106314	14	6581	8127
-50106314	15	7019	8891
-50106314	16	7476	9698
-50106314	17	7950	10551
-50106314	18	8441	11449
-50106314	19	8950	12394
-50106314	20	9476	13388
-50106314	21	10020	14430
-50106314	22	10581	15502
-50106314	23	11160	16603
-50106314	24	11756	17730
-50106314	25	12370	18882
-50106314	26	13001	20057
-50106314	27	13650	21254
-50106314	28	14316	22469
-50106314	29	15000	23700
-50106314	30	15701	24945
-50106314	31	16420	26201
-50106314	32	17157	27482
-50106314	33	17910	28786
-50106314	34	18682	30111
-50106314	35	19470	31456
-50106314	36	20277	32819
-50106314	37	21100	34198
-50106314	38	21941	35591
-50106314	39	22800	36995
-50106314	40	23676	38409
-50106315	1	2468	1440
-50106315	2	2679	1785
-50106315	3	2908	2154
-50106315	4	3154	2546
-50106315	5	3418	2964
-50106315	6	3700	3409
-50106315	7	3999	3882
-50106315	8	4315	4386
-50106315	9	4649	4921
-50106315	10	5000	5489
-50106315	11	5369	6089
-50106315	12	5755	6728
-50106315	13	6159	7407
-50106315	14	6581	8127
-50106315	15	7019	8891
-50106315	16	7476	9698
-50106315	17	7950	10551
-50106315	18	8441	11449
-50106315	19	8950	12394
-50106315	20	9476	13388
-50106315	21	10020	14430
-50106315	22	10581	15502
-50106315	23	11160	16603
-50106315	24	11756	17730
-50106315	25	12370	18882
-50106315	26	13001	20057
-50106315	27	13650	21254
-50106315	28	14316	22469
-50106315	29	15000	23700
-50106315	30	15701	24945
-50106315	31	16420	26201
-50106315	32	17157	27482
-50106315	33	17910	28786
-50106315	34	18682	30111
-50106315	35	19470	31456
-50106315	36	20277	32819
-50106315	37	21100	34198
-50106315	38	21941	35591
-50106315	39	22800	36995
-50106315	40	23676	38409
-50106315	41	24570	39829
-50106315	42	25481	41304
-50106315	43	26410	42832
-50106315	44	27356	44417
-50106315	45	28320	46058
-50106315	46	29301	47758
-50106315	47	30300	49516
-50106315	48	31316	51334
-50106315	49	32392	53213
-50106315	50	0	55154
-50106308	1	2468	1440
-50106308	2	2679	1785
-50106308	3	2908	2154
-50106308	4	3154	2546
-50106308	5	3418	2964
-50106308	6	3700	3409
-50106308	7	3999	3882
-50106308	8	4315	4386
-50106308	9	4649	4921
-50106308	10	5000	5489
-50106308	11	5369	6089
-50106308	12	5755	6728
-50106308	13	6159	7407
-50106308	14	6581	8127
-50106308	15	7019	8891
-50106308	16	7476	9698
-50106308	17	7950	10551
-50106308	18	8441	11449
-50106308	19	8950	12394
-50106308	20	9476	13388
+50106308	1	1056	244
+50106308	2	1146	392
+50106308	3	1244	550
+50106308	4	1350	718
+50106308	5	1463	897
+50106308	6	1583	1087
+50106308	7	1711	1290
+50106308	8	1847	1505
+50106308	9	1989	1735
+50106308	10	2140	1977
+50106308	11	2298	2234
+50106308	12	2463	2508
+50106308	13	2636	2798
+50106308	14	2816	3107
+50106308	15	3004	3434
+50106308	16	3199	3779
+50106308	17	3402	4144
+50106308	18	3612	4528
+50106308	19	3830	4933
+50106308	20	4055	5358
+50106308	21	4288	5804
+50106308	22	4528	6263
+50106308	23	4776	6734
+50106308	24	5031	7217
+50106308	25	5294	7710
+50106308	26	5564	8213
+50106308	27	5842	8725
+50106308	28	6127	9245
+50106308	29	6406	9772
+50106308	30	0	10305
+50106313	1	1204	460
+50106313	2	1307	629
+50106313	3	1419	809
+50106313	4	1539	1000
+50106313	5	1668	1204
+50106313	6	1805	1421
+50106313	7	1951	1652
+50106313	8	2105	1898
+50106313	9	2268	2159
+50106313	10	2440	2436
+50106313	11	2620	2729
+50106313	12	2808	3041
+50106313	13	3005	3372
+50106313	14	3211	3724
+50106313	15	3425	4097
+50106313	16	3648	4491
+50106313	17	3879	4906
+50106313	18	4119	5345
+50106313	19	4367	5806
+50106313	20	4624	6291
+50106313	21	4889	6800
+50106313	22	5163	7323
+50106313	23	5446	7860
+50106313	24	5737	8410
+50106313	25	6036	8972
+50106313	26	6344	9546
+50106313	27	6661	10130
+50106313	28	6986	10722
+50106313	29	7320	11323
+50106313	30	7662	11931
+50106313	31	8013	12544
+50106313	32	8372	13169
+50106313	33	8740	13805
+50106313	34	9116	14452
+50106313	35	9501	15109
+50106313	36	9895	15774
+50106313	37	10297	16446
+50106313	38	10707	17126
+50106313	39	11103	17811
+50106313	40	0	18501
+50106314	1	1229	460
+50106314	2	1334	632
+50106314	3	1448	816
+50106314	4	1571	1011
+50106314	5	1702	1220
+50106314	6	1842	1441
+50106314	7	1991	1677
+50106314	8	2149	1928
+50106314	9	2315	2194
+50106314	10	2490	2477
+50106314	11	2674	2776
+50106314	12	2866	3094
+50106314	13	3067	3432
+50106314	14	3277	3791
+50106314	15	3495	4171
+50106314	16	3723	4573
+50106314	17	3959	4998
+50106314	18	4203	5445
+50106314	19	4457	5916
+50106314	20	4719	6411
+50106314	21	4990	6930
+50106314	22	5269	7464
+50106314	23	5557	8012
+50106314	24	5854	8573
+50106314	25	6160	9147
+50106314	26	6474	9732
+50106314	27	6798	10328
+50106314	28	7129	10933
+50106314	29	7470	11546
+50106314	30	7819	12166
+50106314	31	8177	12792
+50106314	32	8544	13429
+50106314	33	8919	14079
+50106314	34	9303	14739
+50106314	35	9696	15409
+50106314	36	10097	16087
+50106314	37	10508	16774
+50106314	38	10927	17468
+50106314	39	11398	18167
+50106314	40	0	18871
+50106315	1	1081	244
+50106315	2	1173	396
+50106315	3	1273	557
+50106315	4	1381	729
+50106315	5	1497	912
+50106315	6	1620	1107
+50106315	7	1751	1314
+50106315	8	1890	1535
+50106315	9	2036	1769
+50106315	10	2190	2018
+50106315	11	2351	2281
+50106315	12	2521	2560
+50106315	13	2697	2858
+50106315	14	2882	3174
+50106315	15	3074	3508
+50106315	16	3274	3862
+50106315	17	3482	4235
+50106315	18	3697	4628
+50106315	19	3920	5043
+50106315	20	4150	5478
+50106315	21	4388	5934
+50106315	22	4634	6404
+50106315	23	4888	6886
+50106315	24	5149	7380
+50106315	25	5418	7884
+50106315	26	5694	8399
+50106315	27	5978	8923
+50106315	28	6270	9455
+50106315	29	6641	9994
+50106315	30	0	10540
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index 0571c7f..22fb8b0 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -13,11 +13,11 @@
 50106305	3	GetPet11	4213	1	1000	1	30	6	48380|48385|48390	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2476
 50106306	4	GetPet12	4214	1	1000	1	40	6	48410|48415|48420	4|10|20	['PetUpLv','PetUpLv','PetUpLv8']	4608
 50106307	2	GetPet1	4215	1	1000	1	20	6	48395|48400|48405	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1440
-50106309	5	GetPet14	4217	1	1000	1	50	6	48440|48445|48450	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	14400
-50106310	4	GetPet15	4218	1	1000	1	40	6	48425|48430|48435	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	7200
+50106308	2	GetPet17	4216	1	1000	1	20	6	48485|48490|48495	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1440
+50106309	5	GetPet14	4217	1	1000	1	50	6	48440|48445|48450	4|10|20	['PetUpLv','PetUpLv','PetUpLv11']	14400
+50106310	4	GetPet15	4218	1	1000	1	40	6	48425|48430|48435	4|10|20	['PetUpLv','PetUpLv','PetUpLv12']	7200
 50106311	3	GetPet16	4219	1	1000	1	30	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
-50106308	2	GetPet17	4216	1	1000	1	20	6	48395|48400|48405	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1440
 50106312	3	GetPet18	4220	1	1000	1	30	6	48470|48475|48480	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2448
-50106313	4	GetPet19	4221	1	1000	1	40	6	48440|48445|48450	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	14400
-50106314	4	GetPet20	4222	1	1000	1	40	6	48425|48430|48435	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	7200
-50106315	4	GetPet21	4223	1	1000	1	40	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
+50106313	3	GetPet19	4221	1	1000	1	40	6	48500|48505|48510	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	14400
+50106314	4	GetPet20	4222	1	1000	1	40	6	48515|48520|48525	4|10|20	['PetUpLv','PetUpLv','PetUpLv9']	7200
+50106315	4	GetPet21	4223	1	1000	1	40	6	48530|48535|48540	4|10|20	['PetUpLv','PetUpLv','PetUpLv10']	1396
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b500399..eae6e1f 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -117,9 +117,9 @@
 262	1	0	坐骑:白玉兽	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1680	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
 263	1	0	坐骑:筋斗云	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	980	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
 264	1	0	坐骑:福源猫	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
-265	1	0	坐骑:森之灵	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
+265	1	0	坐骑:森之灵	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
 289	1	0	追风	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	288	0	5	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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-280	1	0	觉灵鹿	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+280	1	0	觉灵鹿	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	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
 281	1	0	皓月狼	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	588	0	5	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
 282	1	0	雷霆战熊	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	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
 283	1	0	火炎兽	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	3888	0	5	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
@@ -133,7 +133,7 @@
 292	1	0	白玉兽	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	6000	0	5	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
 293	1	0	筋斗云	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	0	5	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
 294	1	0	福源猫	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	0	5	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
-295	1	0	森之灵	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	0	5	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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+295	1	0	森之灵	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	0	5	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
 600	1	0	时装1	91	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	220	0	5	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
 601	1	0	时装2	92	0	0	0	0	999	120	1	1	0	1	0	0	0	0	0	1	220	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
 602	1	0	时装3	93	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	220	0	5	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
@@ -600,12 +600,12 @@
 4213	1	0	灵宠:球球	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4214	1	0	灵宠:荒漠梦魇	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4215	1	0	灵宠:灵狐仙	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	400	0	100	0	1	0	0	77	27200	0	0	78	27200	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
-4216	1	0	灵宠:灵鲛刺客	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	100	0	1	0	0	77	27200	0	0	78	27200	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
+4216	1	0	灵宠:灵鲛刺客	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4217	1	0	灵宠:荒古巨兽	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4218	1	0	灵宠:熊猫斗士	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4219	1	0	灵宠:海牛侍卫	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4220	1	0	灵宠:雷震子	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	690	0	100	0	1	0	0	77	27200	0	0	78	27200	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
-4221	1	0	灵宠:极炎剑客	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
+4221	1	0	灵宠:极炎剑客	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4222	1	0	灵宠:阴雷之狼	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4223	1	0	灵宠:雷蛟	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4250	1	0	冰火冥魂碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	100	0	0	0	0	0	4209	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

--
Gitblit v1.8.0