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

cehua_wcy

2018-11-23 6174295afe9803e7f041fe3068cb738014345c73

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