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

cehua_hzl

2018-12-12 9ff71df4ad459e75235c643438e5a66eb11084b8

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