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

cehua-TT

2018-12-19 654a214c683e3a48bd5c5fb2545e35e7b253534f

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

 db/PyMongoDataServer/PySysDB/tagDailyQuest.txt

@@ -26,4 +26,4 @@
27    1    17    139    1    30    30

28    1    18    108    50    1    50

29    1    20    151    1    20    20

30    2    31240    151    1    20    20

30    2    31340    156    1    20    20


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -323,7 +323,7 @@
CrossRealmPKAward    {}    {}    {"10":[[4010,2,1],[101,1,1],[3502,1,1]],"50":[[4010,2,1],[101,1,1],[3502,1,1]],"300":[[4010,2,1],[101,1,1],[3502,1,1]]}        

CrossRealmPKMatchCount    5    5    (buyCnt+1)*20        

CrossRealmPKFB    [30, 3, 60,30,10]    [[40,66,40,83], [190,66,190,81]]    2        

GatherSoulHole    0_300|1_300|2_305|3_310|4_315|5_320|6_330				
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    int(4000000*(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)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5)))    1_0.5|2_0.7|3_0.8|4_0.9|5_1    1_0.5|2_0.7|3_0.8|4_0.9    1_100|2_300|3_3000|4_15000|5_30000    

GatherSoulPackCount    150