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

cehua_wcy

2018-11-20 94b3cb6089a8f7c3cda3c85798df8003ba2bea58

1
2
3
4
5
6
7
8
9
#ÈÎÎñÖØÖôÎÊývipµÈ¼¶ÏÞÖÆ{ÖØÖôÎÊý:[ÏûºÄÊýÁ¿, ÀàÐÍ]} 
( 
{ 
0:[0, 1], 
1:[50, 1], 
2:[100, 1] 
 
} 
)