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

cehua_wcy

2018-11-10 ec8e9d53198d1939777f6fd1745e729907b1dbec

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