Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

hwj35

9 天以前 64c8c2fea90fbd70d1f1ba8e37f14cb87681e22f

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