Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua-HWJ35

2019-03-05 6cf655814c23b00a663a7f1e36e6f88a47963a88

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