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

cehua_wcy

2018-09-14 d9f0ba70e87ebb55113be05d3f2303ba24b55474

1
2
3
4
5
6
7
8
#Ò°Íâboss¸±±¾ÖØÖÃÏûºÄÅäÖà 
 
( 
[ 
1, #×î´ó¿ÉÖ÷¶¯ÖØÖôÎÊý 
{0:[3,'0'],1:[1,'20'],2:[1,'40'],3:[1,'60'],4:[1,'80'],(1,100):[1,'20*(resetCnt)']},    # ÖØÖø±±¾ÏûºÄ½ðÇ®Êý¹«Ê½, ²ÎÊý: resetCnt(½ñÈÕÒÑÖ÷¶¯ÖØÖôÎÊý) {ÒѹºÂò¸öÊý:[½ðÇ®ÀàÐÍ,½ðÇ®¹«Ê½]} (0,3)±íʾÒѹºÂò0´Îµ½3´Î ¿Éµ¥¶ÀÅäÒ»¸ö´ÎÊý 
] 
)