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

hch

2018-10-23 bf7cefc032cd57c6f8f565afab3689dd87e0a044

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