Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_wcy

2018-12-25 494b25f3da72f84c607553d248cf174e7ebe3d1e

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt

@@ -196,7 +196,7 @@
195    ['金']

196    ['精忠报国']

197    ['119']

198    ['4','四']

198    ['4','四','4年','四年']

199    ['施耐庵']

200    ['宋朝','宋']

201    ['隋朝','隋']


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -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))    {"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    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

GatherSoulPackCount    150