From fb40110101693deafb19ab1c95d630ccd0ae31b0 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 22 十月 2018 20:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 4 ++--
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt | 8 +++-----
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 1 +
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 07f02d5..2800503 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -438,9 +438,9 @@
20203007 荒漠巨兽 405
20302001 小宝箱 1
20302002 大宝箱 1
-20302003 秘境守卫 260
+20302003 金甲蛮牛 260
20302004 食灵鱼 275
-20302005 金甲蛮牛 290
+20302005 秘境守卫 290
20302006 灵鲛斗士 310
20302007 紫炎灵狮 330
20302008 金甲剑士 350
diff --git a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
index ef5788c..c4e9f37 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
@@ -116,7 +116,7 @@
115 ['烟囱']
116 ['黑白']
117 ['老虎','虎']
-118 ['黑色,'黑'']
+118 ['黑色','黑']
119 ['龙']
120 ['苏州']
121 ['酸']
@@ -216,7 +216,7 @@
215 ['东北虎']
216 ['丹麦']
217 ['金庸']
-218 ['大象']
+218 ['大象','象']
219 ['屈原']
220 ['青铜']
221 ['独孤九剑']
@@ -251,11 +251,9 @@
250 ['木兰辞']
251 ['关羽']
252 ['杜甫']
-253 ['妻子',,'老婆']
-254 ['观沧海']
+253 ['妻子','老婆']
255 ['望庐山瀑布']
256 ['白居易']
-257 ['王羲之']
258 ['贵州']
259 ['匡衡']
260 ['诸葛亮']
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 978153e..2385f78 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -297,3 +297,4 @@
SamboSpecialUnlock 9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018
BindJadeWheelCfg 88 {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588} [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,4)],30:[(10000,9)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
BindJadeWheelNotice 150
+WishingWellCfg 7200 refreshCnt+10 8 5
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index a039218..c8e36ae 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -438,9 +438,9 @@
20203007 2 0 荒漠巨兽 405 0 69355 69355 0 22 0 0 10000 72854 0 1 0 0 0 0 0 3 3000 1992925 143 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 98607095 17 10000 0 0 5 0 0 186 1 1
20302001 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
20302002 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
-20302003 2 0 秘境守卫 260 0 3677 3677 0 9 0 0 0 844 0 0 0 0 0 0 0 3 3000 896463 56 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8490386 0 0 0 0 1 435165 22 1 1 1
+20302003 2 0 金甲蛮牛 260 0 3677 3677 0 9 0 0 0 844 0 0 0 0 0 0 0 3 3000 896463 56 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8490386 0 0 0 0 1 435165 22 1 1 1
20302004 2 0 食灵鱼 275 0 4904 4904 0 11 0 0 0 1009 0 0 0 0 0 0 0 3 3000 973332 62 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 11271884 0 0 0 0 1 528050 25 1 1 1
-20302005 2 0 金甲蛮牛 290 0 5984 5984 0 12 0 0 0 1021 0 0 0 0 0 0 0 3 3000 1067387 69 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 13824218 0 0 0 0 1 539535 29 1 1 1
+20302005 2 0 秘境守卫 290 0 5984 5984 0 12 0 0 0 1021 0 0 0 0 0 0 0 3 3000 1067387 69 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 13824218 0 0 0 0 1 539535 29 1 1 1
20302006 2 0 灵鲛斗士 310 0 11085 11085 0 14 0 0 0 1309 0 0 0 0 0 0 0 3 3000 1347152 92 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 26647019 0 0 0 0 1 546410 33 1 1 1
20302007 2 0 紫炎灵狮 330 0 12801 12801 0 15 0 0 0 1634 0 0 0 0 0 0 0 3 3000 1461649 101 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 38316205 0 0 0 0 1 602510 38 1 1 1
20302008 2 0 金甲剑士 350 0 15108 15108 0 16 0 0 0 2028 0 0 0 0 0 0 0 3 3000 1566210 109 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 53722283 0 0 0 0 1 809985 22 1 1 1
--
Gitblit v1.8.0