From 992686b453d7e0fcb6b471a24262677db9d1e8b5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 23 十一月 2018 22:42:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

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

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 04b75a8..01db16b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -331,6 +331,7 @@
 50105023	剑元素	1
 50105024	火元素	1
 50105025	水元素	1
+50105026	助战机器人	1
 50107001	召唤元素	1
 50107002	治疗图腾	65
 50108001	遗失物资(大)	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index b21ed97..6a22b01 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -331,6 +331,7 @@
 50105023	3	0	剑元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	1000	1	1	0	100	0	10	0	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50105024	4	0	火元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	1000	1	1	0	100	0	10	50949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50105025	4	0	水元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	1000	1	1	0	100	0	10	55949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
+50105026	20	0	助战机器人	1	0	24	24	4	0	0	0	0	0	0	0	0	0	0	0	0	0	1000	1	0	0	100	2	6	0	0	0	0	0	0	0	0	0	10	2	35	0	0	0	0	0	0	0	20	1	1
 50107001	3	0	召唤元素	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	100	0	10	0	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50107002	3	10002	治疗图腾	65	0	727	757	16	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	432	46	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	6395	0	0	0	0	0	0	0	62	1	1
 50108001	14	0	遗失物资(大)	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	0	0	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	214	0	1

--
Gitblit v1.8.0