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

cehua-TT

2019-02-21 0a986d7e6e45ade96bf45e6381edbeb96d83b0cb

1
2
3
4
5
#ÌìÌÝÿÈÕ¿ÉÌôÕ½´ÎÊý 
{ 
    "FightCnt":10,     #ÿÈÕ¿ÉÌôÕ½´ÎÊý 
    "CanAddCnt":1000,     #¿É¶îÍ⹺Âò´ÎÊý 
}