Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

hch

2018-12-25 c739456f905e109263db69a5977708aca20a2dc6

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