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

cehua_LC

2018-11-15 b929c66128b064a985bfc0bacb2b1a841bdf7fb3

1
2
3
4
5
6
7
8
 
 
( 
[ 
5,         #Ò»Ìì×î¶à¿ÉÇÀ¸öÊý 
'min(0 if goldCnt< 100 else int(100+(goldCnt-100)*0.4),500)',  #Éú³Éºì°ü¶î¶È¼ÆË㹫ʽ ²ÎÊý goldCnt-³äÖµÊýÁ¿£¨×êʯ£©³äÖµ<100µÄʱºò£¬ÔòΪ0£¬·ñÔòËÍ100°ó×ê 
] 
)