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

cehua-TT

2018-09-07 d41d2b6ff432bf615beb2981cf0b09e96c3d31d3

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