From 2a46bffcbe35d8cbc5fb5c46031346c799dab881 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期六, 24 十一月 2018 10:17:50 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 7d87449..7453de8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 6a22b01..7c35e26 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -331,7 +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 +50105026 20 0 助战机器人 1 1 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