From c4d18b3cce74fa86f0c798abae1ce721ec756df3 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期日, 21 十月 2018 14:21:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt | 109 +++++++++++++++++------------------
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 4
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 2
CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
16 files changed, 61 insertions(+), 64 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 9953aac..3f4f19b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -50,7 +50,7 @@
XMZZBetCfg {}
XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZDogFallLimit 1000
-XMZZPKPowerRange [[30,10],[50,50]] [4,5]
+XMZZPKPowerRange [[30,10],[50,50]] [4,5] 3
XMZZSpecialNPCRate min(5000,(conWinCnt*625+10)) max(0,(conWinCnt-10)*1000)
XMZZPKAward [0,10,20,30,40,50,60,70,80,90] addPer+100 + int(math.ceil(HPPer/10.0)) 50 reExp*216*(100+addPer)/100 reExp*108
XMZZPKRecord [3,5,8,10,15,20] 40
diff --git a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
index 6c82ae6..ef5788c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
@@ -30,7 +30,7 @@
29 ['无毒不丈夫']
30 ['上海']
31 ['调虎离山']
-32 ['汉族']
+32 ['汉族','汉']
33 ['拿人家的手短']
34 ['丈夫']
35 ['胡萝卜']
@@ -47,7 +47,7 @@
46 ['活到九十九','活到99']
47 ['汉界']
48 ['左']
-49 ['美国']
+49 ['美国','美']
50 ['一百年不许变']
51 ['孙悟空']
52 ['杭州']
@@ -65,11 +65,11 @@
64 ['任贤齐']
65 ['深圳']
66 ['长江']
-67 ['老鼠']
-68 ['老虎']
-69 ['风力']
+67 ['老鼠','鼠']
+68 ['老虎','虎']
+69 ['风力','风']
70 ['曹植']
-71 ['亚洲']
+71 ['亚洲','亚']
72 ['二十岁','20','20岁']
73 ['荔枝']
74 ['宙斯']
@@ -79,16 +79,16 @@
78 ['凤毛麟角']
79 ['冰雨']
80 ['李莲英']
-81 ['菊花']
+81 ['菊花','菊']
82 ['牡丹']
-83 ['桃子']
+83 ['桃子','桃']
84 ['尾巴']
85 ['包子']
86 ['鸽子']
87 ['骆驼']
88 ['芭蕾舞']
89 ['一万年']
-90 ['大象']
+90 ['大象','象']
91 ['眼睛']
92 ['蜡烛']
93 ['我爱你']
@@ -100,23 +100,23 @@
99 ['蟑螂']
100 ['植物大战僵尸']
101 ['亲']
-102 ['哭']
+102 ['哭','哭泣','难受']
103 ['龙凤胎']
104 ['乒乓球','乒乓']
105 ['快乐崇拜']
106 ['大象','象']
107 ['狼']
-108 ['诸葛亮']
+108 ['诸葛亮','诸葛孔明']
109 ['万里长城','长城']
110 ['霍比特人']
111 ['猪八戒','天蓬元帅']
-112 ['关羽']
+112 ['关羽','关云长']
113 ['长白山']
114 ['马']
115 ['烟囱']
116 ['黑白']
117 ['老虎','虎']
-118 ['黑色']
+118 ['黑色,'黑'']
119 ['龙']
120 ['苏州']
121 ['酸']
@@ -129,11 +129,11 @@
128 ['长春']
129 ['绿色','绿']
130 ['三亚']
-131 ['法国']
+131 ['法国','法']
132 ['乔布斯']
133 ['青海']
-134 ['藏族']
-135 ['川菜']
+134 ['藏族','藏']
+135 ['川菜','川']
136 ['花木兰']
137 ['反正有大把时光']
138 ['你的笑容已泛黄']
@@ -155,7 +155,7 @@
154 ['数学']
155 ['狐狸']
156 ['摸不得']
-157 ['变大']
+157 ['变大','大']
158 ['京杭大运河']
159 ['重阳节']
160 ['兰州拉面']
@@ -177,7 +177,7 @@
176 ['林黛玉']
177 ['对']
178 ['丹麦']
-179 ['泰国']
+179 ['泰国','泰']
180 ['李时珍']
181 ['成吉思汗']
182 ['安徽']
@@ -189,8 +189,8 @@
188 ['对']
189 ['今晚吃鸡']
190 ['新闻联播']
-191 ['29']
-192 ['T']
+191 ['29','二十九']
+192 ['T','t']
193 ['直鱼钩']
194 ['广州']
195 ['将进酒']
@@ -198,20 +198,20 @@
197 ['金']
198 ['精忠报国']
199 ['119']
-200 ['4']
+200 ['4','四']
201 ['施耐庵']
-202 ['宋朝']
-203 ['隋朝']
+202 ['宋朝','宋']
+203 ['隋朝','隋']
204 ['何事秋风悲画扇']
205 ['武则天']
206 ['赣']
207 ['爆炸']
-208 ['秦国']
+208 ['秦国','秦']
209 ['太阳']
210 ['肝脏']
211 ['小肠']
-212 ['隋朝']
-213 ['三']
+212 ['隋朝','隋']
+213 ['三','3']
214 ['勾践']
215 ['东北虎']
216 ['丹麦']
@@ -228,38 +228,35 @@
227 ['笔墨纸砚']
228 ['国风']
229 ['86']
-230 ['三十']
+230 ['三十','30']
231 ['唐伯虎']
232 ['围棋']
233 ['五十岁']
-234 ['孔子的弟子']
+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 ['儒家']
+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 ['儒家','儒']
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.pyc
index 0056ed7..5e547bd 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index e735f66..ef8bf66 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index bbfabc6..57e4688 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc
index 6c4d6e2..9389384 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
index 60dce0f..7046c39 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index b373a6b..7c0ecee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
index 6853af5..36f59c9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index b114ede..8bb46e5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index 077f25a..51bf66f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9cfa377..978153e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -289,7 +289,7 @@
CeremonyRecharge {"1":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"2":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]]}
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
-TJDropTaskItem {20007:[120,1104,50,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}
+TJDropTaskItem {}
SuperGiftTimeList [[651,2],[652,2],[653,2]] []
OSSaleOpenMail [1,2,3,4,5,6,7] []
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index d45b069..8ad2c41 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -66,8 +66,8 @@
31704002 0 1 0 12000 100000 0 0 2 9990 50 1 0 0 0 0
31704003 0 1 0 40000 150000 0 0 2 9990 50 1 0 0 0 0
30403001 0 1 0 1000 10000 0 8000 2 9900 50 12 0 0 0 0
-30403002 0 1 0 1000 10000 0 8000 2 9900 50 12 0 0 0 6000
-30403003 0 1 0 1200 10000 0 8000 2 9900 50 2 0 0 0 16000
+30403002 0 1 0 1000 10000 0 8000 2 9900 50 12 0 0 0 4000
+30403003 0 1 0 1200 10000 0 8000 2 9900 50 2 0 0 0 15000
30403004 0 1 0 1200 10000 0 8000 2 9900 50 2 0 0 0 22000
30903001 1 3 0 48000 10000 0 8000 2 9900 50 1 0 0 120 0
30601001 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index eda3e20..129c64d 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -218,7 +218,7 @@
wx.snqxz.198 424064855 198 206 0
wx.snqxz.328 424064855 328 207 0
wx.snqxz.648 424064855 648 208 0
-wx.snqxz.648 424064855 0.1 211 0
+wx.snqxz.01 424064855 0.1 211 0
wx.sgsbl.18 815035927 18 201 0
wx.sgsbl.6 815035927 6 202 0
wx.sgsbl.30 815035927 30 203 0
@@ -227,4 +227,4 @@
wx.sgsbl.198 815035927 198 206 0
wx.sgsbl.328 815035927 328 207 0
wx.sgsbl.648 815035927 648 208 0
-wx.sgsbl.648 815035927 0.1 211 0
+wx.sgsbl.01 815035927 0.1 211 0
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index a736f5d..11a2f4c 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -13,7 +13,7 @@
12 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000
13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28
14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24
-15 0 0 0 1 2 3 3 4 4 4 8 9 10 11 12 12
+15 0 0 0 1 2 3 3 4 4 4 4 9 10 11 12 12
16 0 0 1 1 2 2 3 3 4 4 5 5 6 6 6 6
17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4
18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 771e1bf..3e260e7 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -237,7 +237,7 @@
1101 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1102 1 0 魂印 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1103 1 0 令牌 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-1104 1 0 技能钥匙 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 10 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+1104 1 0 技能钥匙 17 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1105 1 0 钥匙 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1106 1 0 兵刃 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1107 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 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