From bf58f5fe51a7ae50d9e69b3dde5f33fbe78fff0e Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期三, 26 九月 2018 20:35:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt |    2 +-
 db/PyMongoDataServer/SysDB/tagChinNPC.txt         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 699b57d..0b094dd 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -302,7 +302,7 @@
 50106311	海牛侍卫	441
 50106312	雷震子	1
 50106313	极炎剑客	1
-50106314	双头火狼	1
+50106314	阴雷之狼	1
 50106315	雷蛟	441
 50105001	傲世神驹	1
 50105002	枪元素	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index d1e9791..79504a2 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -302,7 +302,7 @@
 50106311	16	0	海牛侍卫	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50106312	16	0	雷震子	1	0	3	3	3	1	0	0	3	3	3	0	0	0	0	0	0	0	0	3	3	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	3	3	0	0	0	0	0	0	105	0	1
 50106313	16	0	极炎剑客	1	0	3	3	3	1	0	0	3	3	3	0	0	0	0	0	0	0	0	3	3	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	3	3	0	0	0	0	0	0	105	0	1
-50106314	16	0	双头火狼	1	0	3	3	3	1	0	0	3	3	3	0	0	0	0	0	0	0	0	3	3	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	3	3	0	0	0	0	0	0	105	0	1
+50106314	16	0	阴雷之狼	1	0	3	3	3	1	0	0	3	3	3	0	0	0	0	0	0	0	0	3	3	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	3	3	0	0	0	0	0	0	105	0	1
 50106315	16	0	雷蛟	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50105001	16	0	傲世神驹	1	0	1	2	26	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1200	100	0	300	0	2	0	0	0	0	0	0	0	0	0	10	2	203	0	0	0	0	0	0	0	105	1	2
 50105002	3	0	枪元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	50932	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1

--
Gitblit v1.8.0