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

CeHua_ZWJ

2018-09-07 8b32ad7483685185226d751c0963ac30625bf497

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