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

cjc

10 天以前 6348c9090c48ef2414e7c06bf800bc498ff19fd2

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