From da6370a9236b7b1e7f8f912148ca37607490b2d0 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 28 九月 2018 10:33:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagHorseUp.txt      |   20 ++++++++++++++++++++
 db/PyMongoDataServer/PySysDB/tagPetClassCost.txt |   20 ++++++++++++++++++++
 db/PyMongoDataServer/PySysDB/tagHorse.txt        |    5 +++--
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt      |    3 ++-
 db/PyMongoDataServer/SysDB/tagChinItem.txt       |   10 ++++++----
 5 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index a48cb35..9ca9f7a 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -11,6 +11,7 @@
 305	290	260	1	1	40	1	4	13968	GetMount7
 306	288	258	1	1	50	1	5	21168	GetMount8
 307	291	261	1	1	30	1	3	2116	GetMount11
-308	292	262	1	1	50	1	5	13968	GetMount12
+308	292	262	1	1	40	1	4	13968	GetMount12
 309	293	263	1	1	30	1	3	21168	GetMount13
-310	294	264	1	1	50	1	5	2116	GetMount14
+310	294	264	1	1	40	1	4	2116	GetMount14
+311	295	265	1	1	20	1	2	2116	GetMount15
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index cd45f76..8a9c545 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -589,3 +589,23 @@
 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	1945	6|7|23	10584|529|80	0	
+311	2	2111	6|7|23	12140|607|80	0	
+311	3	2291	6|7|23	13776|688|80	0	
+311	4	2486	6|7|23	15495|774|80	49150	
+311	5	2694	6|7|23	17297|864|80	0	
+311	6	2915	6|7|23	19183|959|80	0	
+311	7	3151	6|7|23	21204|1060|80	0	
+311	8	3400	6|7|23	23366|1168|80	0	
+311	9	3663	6|7|23	25675|1283|80	0	
+311	10	3940	6|7|23	28137|1406|80	49155	
+311	11	4231	6|7|23	30757|1537|80	0	
+311	12	4535	6|7|23	33501|1675|80	0	
+311	13	4853	6|7|23	36368|1818|80	0	
+311	14	5185	6|7|23	39355|1967|80	0	
+311	15	5531	6|7|23	42462|2123|80	0	
+311	16	5891	6|7|23	45684|2284|80	0	
+311	17	6264	6|7|23	49018|2450|80	0	
+311	18	6651	6|7|23	52461|2623|80	0	
+311	19	7052	6|7|23	56006|2800|80	0	
+311	20	7467	6|7|23	59649|2982|80	49160	
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index c8ef5e2..1d8f97e 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -769,3 +769,23 @@
 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
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index e189fe9..31293b7 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -13,10 +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
+50106308	2	GetPet13	4216	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
 50106311	3	GetPet16	4219	1	1000	1	30	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
 50106312	3	GetPet17	4220	1	1000	1	30	6	48395|48400|48405	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1440
 50106313	4	GetPet18	4221	1	1000	1	40	6	48440|48445|48450	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	14400
 50106314	4	GetPet19	4222	1	1000	1	40	6	48425|48430|48435	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	7200
-50106315	5	GetPet20	4223	1	1000	1	50	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
+50106315	4	GetPet20	4223	1	1000	1	40	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index ce11c3e..dc8aae9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -114,9 +114,10 @@
 258	1	0	坐骑:八宝葫芦	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	6000	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 260	1	0	坐骑:地狱冥虎	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	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
 261	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
-262	1	0	坐骑:白玉兽	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	6000	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+262	1	0	坐骑:白玉兽	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	6000	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	2000	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	5	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
 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
 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
@@ -132,6 +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	5	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	5	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	5	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
@@ -588,14 +590,14 @@
 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	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	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
+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
 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	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
 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
 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	5	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
 4251	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	4210	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
 4252	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	4213	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

--
Gitblit v1.8.0