From dd52e04a5b92796f15f0a22990a3d59a23f88fcf Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 12 十一月 2018 16:16:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

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

diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 948446e..8b3be37 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -1698,7 +1698,7 @@
 50913	起死回生	50913	1	1	2	2	0	7	0	0	8	1	10	0	0	100000	0	0	0	0	0	1000	1500	0	1	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	50947	0	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	18	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	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
+50947	起死回生眩晕	50947	1	1	0	0	0	18	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
 50949	召唤兽攻击	50949	1	1	0	4	0	1	0	0	1	0	41	8	0	500	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 51200	魔枪突刺	51200	1	1	2	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	1033	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 51250	天威陨石	51250	1	1	2	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	1240	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -3110,7 +3110,7 @@
 55913	起死回生	55913	1	1	4	2	0	7	0	0	8	1	10	0	0	100000	0	0	0	0	0	1000	1500	0	1	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	55947	0	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	18	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	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
+55947	起死回生眩晕	55947	1	1	0	0	0	18	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
 55949	召唤兽攻击	55949	1	1	0	4	0	1	0	0	1	0	41	8	0	500	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 56200	暴风雪	56200	1	1	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	692	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 56250	天威冰锥	56250	1	1	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	692	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0