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

hwj35

6 天以前 dcd5fc9c1f2344b56aad535f3ca1d5f098f0bf3a

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