From 9ff71df4ad459e75235c643438e5a66eb11084b8 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期三, 12 十二月 2018 10:35:59 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

---
 db/PyMongoDataServer/SysDB/tagChinSkill.txt |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 95ec074..44cc8e0 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -766,16 +766,16 @@
 48110	气吞山河	48110	1	1	0	7	0	7	1	0	0	0	0	0	0	30000	0	0	0	0	0	4032	610	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	3500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48120	无量真言	48120	1	1	0	7	0	7	1	0	0	0	0	0	0	30000	0	0	0	0	0	4032	610	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	4000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48130	蝶舞飞花	48130	1	1	0	7	0	7	1	0	0	0	0	0	0	30000	0	0	0	0	0	4032	610	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	4500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48040	神光护体	48040	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	807	500	0	0	4004	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	5400	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48045	金甲御敌	48045	1	1	0	7	0	7	1	0	0	0	10	0	0	30000	0	0	0	0	0	4065	1	20	2000	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	14284	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48050	须弥真界	48050	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	0	0	802	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	55798	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48055	长空之撼	48055	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4004	10000	0	0	520	9	500	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	8100	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48060	锋芒之威	48060	1	1	0	7	0	7	1	0	0	0	10	0	0	30000	0	0	0	0	0	4066	2	20	2000	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	21426	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48065	鏖战之意	48065	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	0	0	4502	4000	48066	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	83696	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48040	神光护体	48040	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	807	500	0	0	4004	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48045	金甲御敌	48045	1	1	0	7	0	7	1	0	0	0	10	0	0	30000	0	0	0	0	0	4065	1	20	2000	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	34425	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48050	须弥真界	48050	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	0	0	802	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	94320	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48055	长空之撼	48055	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4004	10000	0	0	520	9	500	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48060	锋芒之威	48060	1	1	0	7	0	7	1	0	0	0	10	0	0	30000	0	0	0	0	0	4066	2	20	2000	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	34425	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48065	鏖战之意	48065	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	0	0	4502	4000	48066	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	94320	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48066	眩晕	48066	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	10000	1500	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	3	511	511	3	2	0	0	0	0	0	0
-48070	清风化气	48070	1	1	0	7	0	7	1	0	30	0	10	0	0	30000	0	0	0	0	0	0	0	0	0	4067	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	13500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48075	般若无间	48075	1	1	0	7	0	18	1	0	0	0	41	0	0	30000	0	0	0	0	0	4067	5000	0	0	4012	7	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	35710	0	0	0	3	511	511	3	2	0	0	0	0	0	0
-48080	万世不竭	48080	1	1	0	7	0	7	1	0	8	0	10	0	0	30000	0	0	0	0	0	1000	4000	0	1	4067	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	139494	0	0	0	0	0	0	0	2	0	0	0	0	0	0
+48070	清风化气	48070	1	1	0	7	0	7	1	0	30	0	10	0	0	30000	0	0	0	0	0	0	0	0	0	4067	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48075	般若无间	48075	1	1	0	7	0	18	1	0	0	0	41	0	0	30000	0	0	0	0	0	4067	5000	0	0	4012	7	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	34425	0	0	0	3	511	511	3	2	0	0	0	0	0	0
+48080	万世不竭	48080	1	1	0	7	0	7	1	0	8	0	10	0	0	30000	0	0	0	0	0	1000	4000	0	1	4067	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	94320	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 48200	道法	48200	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	500	1200	50	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	1497	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 48205	强击	48205	1	1	0	6	0	1	2	0	2	8	81	9	0	500	0	0	0	0	0	1010	10000	0	0	1200	4	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	2249	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48210	风雷之变	48210	1	1	0	6	0	5	0	0	0	0	111	0	0	45000	0	0	0	0	0	2102	5000	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	500	0	0	0	0	0	0	0	0	0	0	0	0	2	4057	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0