From 097f470536ecbecb1f94f4ad6bbbe2487c6f63ae Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 01 九月 2018 15:33:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/SysDB/tagChinSkill.txt      |    6 +
 db/PyMongoDataServer/PySysDB/tagPetClassCost.txt |  180 ++++++++++++++++++++++----------------------
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt      |    2 
 3 files changed, 97 insertions(+), 91 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index eddfe77..259ad93 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -509,93 +509,93 @@
 50106307	38	13165	20951
 50106307	39	13717	21794
 50106307	40	0	22642
-50106309	1	2468	2479
-50106309	2	2679	2825
-50106309	3	2908	3193
-50106309	4	3154	3586
-50106309	5	3418	4004
-50106309	6	3700	4448
-50106309	7	3999	4922
-50106309	8	4315	5426
-50106309	9	4649	5961
-50106309	10	5000	6528
-50106309	11	5369	7128
-50106309	12	5755	7767
-50106309	13	6159	8446
-50106309	14	6581	9167
-50106309	15	7019	9931
-50106309	16	7476	10738
-50106309	17	7950	11590
-50106309	18	8441	12489
-50106309	19	8950	13434
-50106309	20	9476	14427
-50106309	21	10020	15470
-50106309	22	10581	16542
-50106309	23	11160	17643
-50106309	24	11756	18770
-50106309	25	12370	19922
-50106309	26	13001	21097
-50106309	27	13650	22293
-50106309	28	14316	23508
-50106309	29	15000	24740
-50106309	30	15701	25985
-50106309	31	16420	27241
-50106309	32	17157	28522
-50106309	33	17910	29825
-50106309	34	18682	31151
-50106309	35	19470	32496
-50106309	36	20277	33859
-50106309	37	21100	35238
-50106309	38	21941	36630
-50106309	39	22800	38035
-50106309	40	23676	39448
-50106309	41	24570	40869
-50106309	42	25481	42343
-50106309	43	26410	43872
-50106309	44	27356	45457
-50106309	45	28320	47098
-50106309	46	29301	48797
-50106309	47	30300	50555
-50106309	48	31316	52374
-50106309	49	32392	54252
-50106309	50	0	56194
-50106310	1	2468	2479
-50106310	2	2679	2825
-50106310	3	2908	3193
-50106310	4	3154	3586
-50106310	5	3418	4004
-50106310	6	3700	4448
-50106310	7	3999	4922
-50106310	8	4315	5426
-50106310	9	4649	5961
-50106310	10	5000	6528
-50106310	11	5369	7128
-50106310	12	5755	7767
-50106310	13	6159	8446
-50106310	14	6581	9167
-50106310	15	7019	9931
-50106310	16	7476	10738
-50106310	17	7950	11590
-50106310	18	8441	12489
-50106310	19	8950	13434
-50106310	20	9476	14427
-50106310	21	10020	15470
-50106310	22	10581	16542
-50106310	23	11160	17643
-50106310	24	11756	18770
-50106310	25	12370	19922
-50106310	26	13001	21097
-50106310	27	13650	22293
-50106310	28	14316	23508
-50106310	29	15000	24740
-50106310	30	15701	25985
-50106310	31	16420	27241
-50106310	32	17157	28522
-50106310	33	17910	29825
-50106310	34	18682	31151
-50106310	35	19470	32496
-50106310	36	20277	33859
-50106310	37	21100	35238
-50106310	38	21941	36630
-50106310	39	22800	38035
-50106310	40	23676	39448
+50106309	1	1480	720
+50106309	2	1607	927
+50106309	3	1745	1148
+50106309	4	1892	1384
+50106309	5	2051	1634
+50106309	6	2220	1901
+50106309	7	2399	2185
+50106309	8	2589	2488
+50106309	9	2789	2809
+50106309	10	3000	3149
+50106309	11	3221	3509
+50106309	12	3453	3892
+50106309	13	3695	4300
+50106309	14	3948	4732
+50106309	15	4211	5190
+50106309	16	4485	5675
+50106309	17	4770	6186
+50106309	18	5064	6725
+50106309	19	5370	7292
+50106309	20	5685	7888
+50106309	21	6012	8514
+50106309	22	6349	9157
+50106309	23	6696	9818
+50106309	24	7054	10494
+50106309	25	7422	11185
+50106309	26	7801	11890
+50106309	27	8190	12608
+50106309	28	8590	13337
+50106309	29	9000	14076
+50106309	30	9421	14823
+50106309	31	9852	15576
+50106309	32	10294	16345
+50106309	33	10746	17127
+50106309	34	11209	17923
+50106309	35	11682	18730
+50106309	36	12166	19547
+50106309	37	12660	20375
+50106309	38	13165	21210
+50106309	39	13717	22053
+50106309	40	0	22901
+50106310	1	2468	1440
+50106310	2	2679	1785
+50106310	3	2908	2154
+50106310	4	3154	2546
+50106310	5	3418	2964
+50106310	6	3700	3409
+50106310	7	3999	3882
+50106310	8	4315	4386
+50106310	9	4649	4921
+50106310	10	5000	5489
+50106310	11	5369	6089
+50106310	12	5755	6728
+50106310	13	6159	7407
+50106310	14	6581	8127
+50106310	15	7019	8891
+50106310	16	7476	9698
+50106310	17	7950	10551
+50106310	18	8441	11449
+50106310	19	8950	12394
+50106310	20	9476	13388
+50106310	21	10020	14430
+50106310	22	10581	15502
+50106310	23	11160	16603
+50106310	24	11756	17730
+50106310	25	12370	18882
+50106310	26	13001	20057
+50106310	27	13650	21254
+50106310	28	14316	22469
+50106310	29	15000	23700
+50106310	30	15701	24945
+50106310	31	16420	26201
+50106310	32	17157	27482
+50106310	33	17910	28786
+50106310	34	18682	30111
+50106310	35	19470	31456
+50106310	36	20277	32819
+50106310	37	21100	34198
+50106310	38	21941	35591
+50106310	39	22800	36995
+50106310	40	23676	38409
+50106310	41	24570	39829
+50106310	42	25481	41304
+50106310	43	26410	42832
+50106310	44	27356	44417
+50106310	45	28320	46058
+50106310	46	29301	47758
+50106310	47	30300	49516
+50106310	48	31316	51334
+50106310	49	32392	53213
+50106310	50	0	55154
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index f13c200..2470b09 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -13,5 +13,5 @@
 50106305	3	GetPet11	4213	1	1000	1	30	6	48380|48385|48390	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2470
 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	40	6	48395|48400|48405	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1400
-50106309	5	GetPet	4217	1	1000	1	40	6	48410|48415|48420	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	24796
+50106309	5	GetPet	4217	1	1000	1	50	6	48410|48415|48420	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	24796
 50106310	4	GetPet	4218	1	1000	1	40	6	48395|48400|48405	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	4608
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 0170800..541bd83 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -707,6 +707,12 @@
 48410	梦魇之力	48410	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	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	6866	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48415	梦魇之殇	48415	1	1	0	6	0	16	0	0	0	0	10	0	0	0	0	0	0	0	0	4039	30	0	0	4508	0	0	0	1011	1	1	0	74	30000	3	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	17165	0	0	0	0	0	0	4	0	0	48200	0	0	0	0
 48420	梦魇附身	48420	1	1	0	6	0	5	0	0	0	0	10	0	0	60000	0	0	0	0	0	9	5000	3	0	10	5000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	60077	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48425	斗士之力	48425	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	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	7099	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
+48430	斗志昂扬	48430	1	1	0	6	0	16	0	0	0	0	111	0	0	0	0	0	0	0	0	4039	10	0	0	4508	0	0	0	1011	1	1	0	26	30000	3	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	17747	0	0	0	0	0	0	4	0	0	48200	0	0	0	0
+48435	不朽之身	48435	1	1	0	6	0	16	0	0	0	0	10	0	0	30000	0	0	0	0	0	28	4000	1	0	4040	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	62114	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48440	荒古之力	48440	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2500	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	16065	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
+48445	荒神之体	48445	1	1	0	6	0	16	0	0	0	0	10	0	0	30000	0	0	0	0	0	21	4000	1	0	4040	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	40162	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48450	荒古法身	48450	1	1	0	6	0	14	3	0	1	0	41	10	0	40000	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	5000	2500	0	0	0	0	0	0	0	0	0	0	0	0	2	140567	0	0	0	3	511	511	3	0	0	0	0	0	0	0
 49000	固本	49000	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	100	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1242	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49005	精准	49005	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	14	800	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3105	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49010	培元	49010	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	2	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	10867	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0