From da04afd978cb19ebcf54d58147a3ac9284d407b6 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期二, 08 一月 2019 09:54:09 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 6 +++--- CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt | 4 ++-- db/PyMongoDataServer/SysDB/tagChinMap.txt | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt index dd82d27..ed125cb 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt @@ -27,7 +27,7 @@ 31210 仙盟BOSS 3 0 31220 仙盟联赛 4 2 31230 仙盟宴会 3 0 -31240 个人Boss 1 0 +31240 VIPBoss 1 0 31170 守卫人皇 3 0 51010 娲皇遗迹 1 0 41110 法宝副本 1 0 @@ -43,5 +43,5 @@ 32013 跨服竞技场 10 0 32014 跨服竞技场 10 0 31340 幽暗迷森 1 0 -32020 蓬莱仙境 8 0 -32021 蓬莱仙境 8 0 +32020 蓬莱仙境 0 0 +32021 蓬莱仙境 0 0 diff --git a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt index adce420..fdea4ef 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt @@ -243,12 +243,12 @@ 242 ['老子'] 243 ['孔子'] 244 ['水浒传'] -245 ['鲁迅'] +245 ['鲁迅','周树人'] 246 ['永乐大典'] 247 ['木兰辞'] 248 ['关羽'] 249 ['杜甫'] -250 ['妻子','老婆'] +250 ['妻子','老婆','夫人'] 251 ['望庐山瀑布'] 252 ['白居易'] 253 ['贵州'] diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt index 1a097b7..2c2e959 100644 --- a/db/PyMongoDataServer/SysDB/tagChinMap.txt +++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt @@ -27,7 +27,7 @@ 31210 仙盟BOSS 1 0 3600000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 31220 仙盟联赛 1 0 3600000 4 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 5 32 31230 仙盟宴会 1 0 1200000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 -31240 个人Boss 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 +31240 VIPBoss 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 31170 守卫人皇 1 0 1800000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 51010 娲皇遗迹 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 41110 法宝副本 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1 @@ -43,5 +43,5 @@ 32013 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2 32014 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2 31340 幽暗迷森 1 0 3600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 -32020 蓬莱仙境 1 260 0 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35 -32021 蓬莱仙境 1 260 0 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35 +32020 蓬莱仙境 1 260 0 0 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35 +32021 蓬莱仙境 1 260 0 0 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35 -- Gitblit v1.8.0