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

CeHua_ZWJ

2018-11-12 8a67accbc7b575037551721ed6c6296a65a8c3e7

1
2
3
4
5
6
7
8
9
10
#¸ù¾ÝÖ°ÒµÏÔʾµñÏñ 
#Ö°Òµ:µñÏñNPC 
{ 
    0:11145, 
    1:11146, 
    2:11147, 
    4:11145, 
    5:11146, 
    6:11147 
}