From a44530b67cb402f44a7c5d8c7386109d1851fb76 Mon Sep 17 00:00:00 2001 From: CeHua_ZWJ <ceh@163.com> Date: 星期二, 09 十月 2018 19:20:52 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 5 ++ CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt | 76 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 0 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt index 4f8b0ea..c688d04 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt @@ -189,3 +189,79 @@ 188 ['对'] 189 ['今晚吃鸡'] 190 ['新闻联播'] +191 ['29'] +192 ['T'] +193 ['直鱼钩'] +194 ['广州'] +195 ['将进酒'] +196 ['我'] +197 ['金'] +198 ['精忠报国'] +199 ['119'] +200 ['4'] +201 ['施耐庵'] +202 ['宋朝'] +203 ['隋朝'] +204 ['何事秋风悲画扇'] +205 ['武则天'] +206 ['赣'] +207 ['爆炸'] +208 ['秦国'] +209 ['太阳'] +210 ['肝脏'] +211 ['小肠'] +212 ['隋朝'] +213 ['三'] +214 ['勾践'] +215 ['东北虎'] +216 ['丹麦'] +217 ['金庸'] +218 ['大象'] +219 ['屈原'] +220 ['青铜'] +221 ['独孤九剑'] +222 ['香港'] +223 ['菠菜'] +224 ['疑是地上霜'] +225 ['小脑'] +226 ['翅膀'] +227 ['笔墨纸砚'] +228 ['国风'] +229 ['86'] +230 ['三十'] +231 ['唐伯虎'] +232 ['围棋'] +233 ['五十岁'] +234 ['孔子的弟子'] +235 ['老舍'] +236 ['明史'] +237 ['牲口圈'] +238 ['逗号'] +239 ['杜甫'] +240 ['不识好人心'] +241 ['摸不得'] +242 ['清明'] +243 ['各领风骚数百年'] +244 ['海日生残夜'] +245 ['新疆'] +246 ['琵琶'] +247 ['歌德'] +248 ['老子'] +249 ['孔子'] +250 ['水浒传'] +251 ['出使去楚国'] +252 ['鲁迅'] +253 ['永乐大典'] +254 ['木兰辞'] +255 ['关羽'] +256 ['杜甫'] +257 ['妻子'] +258 ['观沧海'] +259 ['六月飞雪'] +260 ['望庐山瀑布'] +261 ['白居易'] +262 ['王羲之'] +263 ['贵州'] +264 ['匡衡'] +265 ['诸葛亮'] +266 ['儒家'] diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc index ead2904..b6af0ba 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index d5d4897..b500399 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -139,6 +139,11 @@ 602 1 0 时装3 93 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 800 1 0 1200万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 400 0 20 0 1 0 0 201 12000000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 801 1 0 2500万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 400 0 20 0 1 0 0 201 25000000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +850 1 0 280绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 280 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +851 1 0 300绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +852 1 0 388绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 388 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +853 1 0 580绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 580 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +854 1 0 600绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 901 1 0 气血散（小） 9 0 1 0 0 300 1 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6000 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 902 25 0 气血散（中） 9 0 1 0 0 300 25 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6001 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 903 50 0 气血散（大） 9 0 1 0 0 300 50 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6002 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0