From 5fdaee57b12810e910400ed17ee71fb9f1eccd15 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期三, 21 十一月 2018 12:06:05 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 8 ++++---- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index c71d5b1..85ccb9d 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -507,10 +507,10 @@ 30303010 潮汐巨兽 300 30303011 极炎巨兽 350 30303012 白泽 400 -30303013 极冰之心 1 -30303014 潮汐巨兽 1 -30303015 极炎巨兽 1 -30303016 白泽 1 +30303013 蜘蛛皇后 1 +30303014 巨木石人 1 +30303015 剧毒蛇王 1 +30303016 古森之灵 1 30403001 仙魔之争NPC 90 30403002 仙魔守卫 90 30403003 仙魔守卫 90 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 56790e4..064f03f 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -507,10 +507,10 @@ 30303010 2 0 潮汐巨兽 300 0 22498 22498 0 13 0 0 10000 18455 0 1 0 0 0 0 0 3 3000 1365193 93 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 57905998 3 10000 0 0 5 0 0 186 1 1 30303011 2 0 极炎巨兽 350 0 33098 33098 0 17 0 0 10000 30106 0 1 0 0 0 0 0 3 3000 1655663 116 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 23040341 8 10000 0 0 5 0 0 186 1 1 30303012 2 0 白泽 400 0 56742 56742 0 22 0 0 10000 49103 0 1 0 0 0 0 0 3 3000 1989837 143 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 27378150 15 10000 0 0 5 0 0 186 1 1 -30303013 2 0 极冰之心 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 -30303014 2 0 潮汐巨兽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 -30303015 2 0 极炎巨兽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 -30303016 2 0 白泽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 +30303013 2 0 蜘蛛皇后 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 +30303014 2 0 巨木石人 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 +30303015 2 0 剧毒蛇王 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 +30303016 2 0 古森之灵 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 30403001 2 0 仙魔之争NPC 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1 30403002 2 0 仙魔守卫 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1 30403003 2 0 仙魔守卫 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1 -- Gitblit v1.8.0