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

CeHua_ZWJ

2018-10-23 dd9f09873bbbc5aa3a4be0d0fd30fd4f4719a927

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