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

cehua_hzl

2018-12-27 7e1f38275afc8a2e8b7b73fd7e1fc1ef5a34e8b5

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