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

cehua_wcy

2018-11-12 e4417be43f050655c0b623b4cb52150aaaa8d524

1
2
3
4
5
#lostTick Íæ¼Ò±¾´Î´ðÌâËùÓõÄʱ¼ä ºÁÃë 
( 
   int(max(5,min(25,(18*(10 * 1000 -  lostTick)/1000)/5))) 
   
)