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

cehua_hzl

2018-12-17 50743f477494254b7a11a58062bb3bb5b39f3ec0

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -322,6 +322,6 @@
HelpBattleRobot   50105026   baseHurt*hpCoefficient         

CrossRealmPKMatch   5000   3   60000   [32010,32011]   [(20, 20), (30,30)]

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]]}      

CrossRealmPKScore   int(min(max((loserScore-winnerScore)/100.0,-9),9))   (int(min(max((winnerScore-loserScore)/100.0,-9),0)) if loserScore>1200 else 0 )   200		
CrossRealmPKScore   int(min(max((loserScore-winnerScore)/100.0,-9),9))   int(min(max((winnerScore-loserScore)/100.0,-9),0)) if loserScore>1200 else 0   200		
CrossRealmPKMatchCount   5   5   (buyCnt+1)*20      

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