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

cehua-TT

2018-12-16 c69b2215eb6c82f16cc603241287fc87f41c4c4c

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -100,7 +100,7 @@
GodWeapon2   104|105|106   0   0   0   0

GodWeapon3   107|108|109   0   0   0   0

GodWeapon4   110|111|112   int(46870+maxHP*proDefPer/10000.0)   0   0   0

GodWeaponActive   1   {"2":[[1,100]],  "4":[[2,150]]}   {"2":250,  "4":320}   0   0

GodWeaponActive   1   {"2":[[1,100]],  "4":[[2,100]]}   {"2":250,  "4":320}   0   0

GodWeaponSys   {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}            

GodMagicExp   {"1":[1,10],"2":[1,10],"4":[1,10]}            

MagicExterior   {"1":0,"2":0,"3":0,"4":35470}   0   500      

@@ -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