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

CeHua_ZWJ

2018-11-20 44640bf045f1ede41168f19b6b61d6366353044e

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