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

cehua_hzl

2018-12-17 50743f477494254b7a11a58062bb3bb5b39f3ec0

 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

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

HelpBattleCheckIn   48   3   {3:[60010], 20:[60010], 60:[60010]}      

PlayerViewCache   100   [0,4]         

CrossRealmPKMatch   5000   3   60000   [12070,12071,12072,12073,12074]   [(20, 20), (30,30)]

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