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

CeHua_ZWJ

2018-11-13 499417dcdd39e4f0a6b1d1ad7f6eca27c085a56f

1
2
3
4
5
6
7
#¾ÙÆå²»¶¨¸ø¾­Ñé 
#playerReExpµÈ¼¶²Î¿¼¾­Ñé 
#playerMarkÍæ¼Ò·ÖÊý 
( 
  playerReExp*(800+playerMark*6) 
 
)