From b37b28ed5e11c8083b8b2f50457dd8a1b47eb146 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 08 十一月 2018 16:32:54 +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 1477a72..a6bb7ef 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -97,7 +97,7 @@
 10104001	若雨	400
 10104002	道尘	400
 10104003	云若烟	4
-10104004	内务总管	5
+10104004	齐天小美	5
 10104005	玉清真人	6
 10104006	阿紫师妹	7
 10104007	神诀宗主	8
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 4545668..d2a73ac 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -97,7 +97,7 @@
 10104001	0	1	若雨	400	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
 10104002	0	1	道尘	400	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
 10104003	0	1	云若烟	4	0	272	283	555	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	838	104	10	300	0	6	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	200	1	1
-10104004	0	1	内务总管	5	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
+10104004	0	1	齐天小美	5	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
 10104005	0	1	玉清真人	6	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
 10104006	0	1	阿紫师妹	7	0	272	283	555	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	838	104	10	300	0	6	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	200	1	1
 10104007	0	1	神诀宗主	8	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1

--
Gitblit v1.8.0