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

cehua_LC

2018-11-15 b929c66128b064a985bfc0bacb2b1a841bdf7fb3

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