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

cehua-TT

2018-09-12 a40feaef8e23aeae042c62b08b7da16e1c55e760

1
2
3
4
5
6
7
8
9
10
#ÉÌÈ˵ȼ¶ÌáÉýÏûºÄ{µ±Ç°ÉÌÈ˵ȼ¶:[½ðÇ®, ½ðÇ®ÀàÐÍ]} 
( 
{ 
    0:[100, 1], 
    1:[500, 1], 
    2:[3000, 1], 
    3:[0 , 1], 
 
} 
)