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

cehua_LC

2018-11-19 bd59ce1c79d42c60f726df8f7deab5a3e7583881

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