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

cehua-TT

2018-11-13 08ae922084291712c0b2d65339a2e498b07f4aad

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