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
---
db/PyMongoDataServer/MergeServer_LogicProcess.pyc | 0
db/PyMongoDataServer/MergeProxyClientMgr.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt | 16 ++++++++--------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
4 files changed, 10 insertions(+), 10 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 ['儒家','儒']
diff --git a/db/PyMongoDataServer/MergeProxyClientMgr.pyc b/db/PyMongoDataServer/MergeProxyClientMgr.pyc
index 4f76687..dbc21e4 100644
--- a/db/PyMongoDataServer/MergeProxyClientMgr.pyc
+++ b/db/PyMongoDataServer/MergeProxyClientMgr.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/MergeServer_LogicProcess.pyc b/db/PyMongoDataServer/MergeServer_LogicProcess.pyc
index 1fc26ba..9340e5b 100644
--- a/db/PyMongoDataServer/MergeServer_LogicProcess.pyc
+++ b/db/PyMongoDataServer/MergeServer_LogicProcess.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9f9be64..c2c3c4b 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -263,7 +263,7 @@
TJG int(min((min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(attackEff/10000.0)/(npcMaxHP*1.0),1)*2.9*0.320833333333333+min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(150000/10000.0)/(npcMaxHP*1.0),1)*15*0.0166666666666667+skill2*min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(50000/10000.0)/(npcMaxHP*1.0),1)*2.1*0.041667+min((((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(10000.0/10000.0)+(petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25))/(npcMaxHP*1.0),0.78)*2.06*(60*math.sqrt(atkSpeed/10000)-(4+60/8+60/12+60/16+60/20))/60*1)+max(min((petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25)/(npcMaxHP*1.0),1)-0.5,0)*0.47*math.sqrt(atkSpeed/10000),5*math.sqrt(atkSpeed/10000.0))*npcExp*(1+max(min(0.14*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.9),0.12),0)+max(min((0.15*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.95)-0.12),0),0)))*times 300 72000 {1:[50900, 50902],2:[55900,55902]} 48215|48235|48245|48260|48275|48320|48290
AutoUseGuardian 4101|4106 300
TJGGiftTime 36000
-ItemTimeOut {"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688],"4106":[4106,668,0],"4107":[4101,468,0]}
+ItemTimeOut {"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688],"4106":[4106,668,0],"4107":[4107,468,0]}
OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/400.0) + 0.1*pow((lv/400.0), 2) +0.15*pow((lv/400.0), 3) + 0.699*pow((lv/400.0), 4))))
BossStoneDelayTime 1500
DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
@@ -325,5 +325,5 @@
CrossRealmPKFB [30, 3, 60,30,10] [[15,20,20,15,0], [33,25,25,33,0]] 2
GatherSoulHole 0_300|1_300|2_305|3_310|4_315|5_320|6_330 0_62|1_62|2_62|3_62|4_62|5_62|6_63
GatherSoulMaxLevel 1_50|2_50|3_50|4_50|5_50
-GatherSoulLevelUp 2960210*(0+0.3*((level-1)/49.0)+0.35*pow((level-1)/49.0,2)+0.25*pow((level-1)/49.0,3)+0.1*pow((level-1)/49.0,4))-2960210*(0+0.3*((level-2)/49.0)+0.35*pow((level-2)/49.0,2)+0.25*pow((level-2)/49.0,3)+0.1*pow((level-2)/49.0,4)) {"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.33,"2":0.47,"3":0.53,"4":0.6,"5":0.67}} 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
+GatherSoulLevelUp int(4529520*(0+0.02*(level/49.0)+0.08*pow(level/49.0,2)+0.2*pow(level/49.0,3)+0.3*pow(level/49.0,4)+0.4*pow(level/49.0,5))-4529520*(0+0.02*((level-1)/49.0)+0.08*pow((level-1)/49.0,2)+0.2*pow((level-1)/49.0,3)+0.3*pow((level-1)/49.0,4)+0.4*pow((level-1)/49.0,5))) {"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.33,"2":0.47,"3":0.53,"4":0.6,"5":0.67}} 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
GatherSoulPackCount 150
--
Gitblit v1.8.0