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

CeHua_ZWJ

2018-10-22 84272f2db09e6d95d9e232442821bf8d3ed1a69e

1
2
3
4
5
6
7
#֪ʶ´ïÈ˸ø¾­Ñé 
#playerReExpµÈ¼¶²Î¿¼¾­Ñé 
#playerMarkÍæ¼Ò·ÖÊý 
( 
  int(reExp*0.83) 
 
)