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

cehua_wcy

2018-12-14 7d1500d7db15ac6e3365a7367cf087a9b1996864

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