From 5c2e064313f64da97fbb5bc8dec7626d82dd48cd Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 25 十二月 2018 15:34:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
index a1bac70..adce420 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
@@ -69,7 +69,7 @@
 68	['风力','风']
 69	['曹植']
 70	['亚洲','亚']
-71	['二十岁','20','20岁']
+71	['二十岁','20','20岁','二十']
 72	['荔枝']
 73	['宙斯']
 74	['美杜莎']
@@ -86,7 +86,7 @@
 85	['鸽子']
 86	['骆驼']
 87	['芭蕾舞']
-88	['一万年']
+88	['一万年','10000年']
 89	['大象','象']
 90	['眼睛']
 91	['蜡烛']
@@ -128,7 +128,7 @@
 127	['长春']
 128	['绿色','绿']
 129	['三亚']
-130	['法国','法']
+130	['法国','法','法兰西']
 131	['乔布斯']
 132	['青海']
 133	['藏族','藏']
@@ -164,7 +164,7 @@
 163	['错']
 164	['重蹈覆辙']
 165	['不知道']
-166	['火箭']
+166	['火箭','火箭队']
 167	['林青霞']
 168	['梅兰竹菊']
 169	['卢浮宫']
@@ -178,10 +178,10 @@
 177	['泰国','泰']
 178	['李时珍']
 179	['成吉思汗']
-180	['安徽']
-181	['山西']
+180	['安徽','安徽省']
+181	['山西','山西省']
 182	['无间道']
-183	['四川']
+183	['四川','四川省']
 184	['上海']
 185	['大海']
 186	['对']
@@ -253,5 +253,5 @@
 252	['白居易']
 253	['贵州']
 254	['匡衡']
-255	['诸葛亮']
+255	['诸葛亮','诸葛孔明']
 256	['儒家','儒']

--
Gitblit v1.8.0