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

cehua-TT

2018-12-29 2e334a5b4bf09aa72ed0d3b7f81823700dc3d6ec

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -322,7 +322,7 @@
HelpBattlePoint   1400   {"1":[8, 8], "2":[8, 8]}   1|2      

HelpBattleRobot   50105026   baseHurt*hpCoefficient         

CrossRealmCfg   5            

CrossRealmPKAward   {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]}   {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]}   {"3":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "10":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "20":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}		
CrossRealmPKAward   {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]}   {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]}   {"10":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}		
CrossRealmPKMatchCount   10   10   10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*20+min(max(todayBuyCount-5,0),1)*40+min(max(todayBuyCount-7,0),1)*40      

CrossRealmPKFB   [30, 3, 60,30,10]   [[14,18,19,11,42], [30,33,36,28,50]]   2      

GatherSoulHole   0_300|1_300|2_305|3_315|4_320|5_325|6_310   0_62|1_62|2_62|3_62|4_62|5_62|6_63