From 07974c882e246180606ba2823f1d02685652a12b Mon Sep 17 00:00:00 2001 From: cehua-HWJ35 <hwj35@163.com> Date: 星期三, 09 一月 2019 15:08:49 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt | 16 ++++++++-------- CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 8 ++++++++ db/PyMongoDataServer/SysDB/tagChinNPC.txt | 8 ++++++++ CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 16 ++++++++-------- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt index 29ba17c..7f011c5 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt @@ -77,11 +77,11 @@ 50103005 21070 0 [] 0 0 0 0 骑宠争夺 50103006 21100 0 [] 0 0 0 0 骑宠争夺 50103007 10080 0 [] 0 0 0 0 骑宠争夺 -40103001 32020 1920 [] 0 0 2040 100 跨服Boss -40103002 32020 2880 [] 0 0 2041 100 跨服Boss -40103003 32020 3600 [] 0 0 2042 100 跨服Boss -40103004 32020 4800 [] 0 0 2043 100 跨服Boss -40103005 32020 5760 [] 0 0 2044 100 跨服Boss -40103006 32020 5760 [] 0 0 2045 100 跨服Boss -40103007 32020 7200 [] 0 0 2046 100 跨服Boss -40103008 32020 9600 [] 0 0 2047 100 跨服Boss +40103001 32020 1920 [] 0 0 2078 100 跨服Boss +40103002 32020 2880 [] 0 0 2079 100 跨服Boss +40103003 32020 3600 [] 0 0 2080 100 跨服Boss +40103004 32020 4800 [] 0 0 2081 100 跨服Boss +40103005 32020 5760 [] 0 0 2082 100 跨服Boss +40103006 32020 5760 [] 0 0 2083 100 跨服Boss +40103007 32020 7200 [] 0 0 2084 100 跨服Boss +40103008 32020 9600 [] 0 0 2085 100 跨服Boss diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 248de4f..a05186b 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -110,6 +110,14 @@ 2075 墓碑 1 2076 墓碑 1 2077 墓碑 1 +2078 墓碑 1 +2079 墓碑 1 +2080 墓碑 1 +2081 墓碑 1 +2082 墓碑 1 +2083 墓碑 1 +2084 墓碑 1 +2085 墓碑 1 10000 静心灯 1 10104001 若雨 400 10104002 道尘 400 diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt index 1f0124b..a632f23 100644 --- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt @@ -77,11 +77,11 @@ 50103005 21070 99 0 1 17 0 50103006 21100 99 0 1 17 0 50103007 10080 99 0 1 17 0 -40103001 32020 180 0 0 0 2040 -40103002 32020 181 0 0 0 2041 -40103003 32020 182 0 0 0 2042 -40103004 32020 183 0 0 0 2043 -40103005 32020 184 0 0 0 2044 -40103006 32020 185 0 0 0 2045 -40103007 32020 186 0 0 0 2046 -40103008 32020 187 0 0 0 2047 +40103001 32020 180 0 0 0 2078 +40103002 32020 181 0 0 0 2079 +40103003 32020 182 0 0 0 2080 +40103004 32020 183 0 0 0 2081 +40103005 32020 184 0 0 0 2082 +40103006 32020 185 0 0 0 2083 +40103007 32020 186 0 0 0 2084 +40103008 32020 187 0 0 0 2085 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 4d99a19..d26be25 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -110,6 +110,14 @@ 2075 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 2076 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 2077 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 +2078 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 +2079 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 +2080 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 +2081 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 +2082 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 +2083 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 +2084 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 +2085 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1 10000 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 2 0 0 0 0 0 0 0 214 0 1 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 -- Gitblit v1.8.0