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

cehua_wcy

2018-11-12 7d88e830860c43efa91f46dfb1e909b377941642

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