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

cehua_hzl

2018-12-27 7e1f38275afc8a2e8b7b73fd7e1fc1ef5a34e8b5

1
2
3
4
5
#ÌìÌÝÌØÊ⹦ÄܹºÂò»¨·Ñ 
{ 
    "ClearCD" :"int(math.ceil(float(CDTime)/60000))",    #Çå³ýCD        ²ÎÊý CDTime Ê£ÓàÀäȴʱ¼ä 
    "AddCount":"int(Count/10.0+1)*5",    #¹ºÂòÌôÕ½´ÎÊý  ²ÎÊý Count  µ±Ç°¹ºÂò´ÎÊý 
}