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

cehua-TT

2018-12-13 f42d124fbba8069bda9567f55c574de4d31d50f4

1
2
3
4
#Á¬Õ¶Ê±¼ä¼ä¸ô#curCaromCnt µ±Ç°Á¬Õ¶Êý 
( 
max(1,(15000-min(300,curCaromCnt)*20)/math.pow(2,curCaromCnt/600.0)) 
)