Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

cehua-TT

2018-11-13 9181af24f7248e486c9e58706aa38e06f8f4460d

1
2
3
4
5
6
7
#±äÉ«Áú¸ø¾­Ñé 
#playerReExpµÈ¼¶²Î¿¼¾­Ñé 
#playerMarkÍæ¼Ò·ÖÊý 
( 
  playerReExp*(600+playerMark*5) 
 
)