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

cehua_wcy

2018-09-10 7c7213758e3924b17f3d0a19254904c915b748e3

1
2
3
4
5
6
#Òƶ¯ËٶȼÆË㹫ʽ 
#baseSpeed:»ù´¡ËٶȠ wingLessBaseSpeed:³á°ò¿ªÆô¼õÉٹ̶¨Öµ  horseLessBaseSpeed:×øÆ￪Æô¼õÉٹ̶¨Öµ  houseSpeedPer:×øÆïËÙ¶È¼Ó³É 
#wingSpeedPer:³á°òËٶȼӳɠ  dienstgradSpeedPer:³ÆºÅËٶȼӳɠ buffSpeedPer:buffËٶȼӳɠ collectEquipSpeedPer:×°±¸ÊÕ¼¯ËÙ¶È¼Ó³É 
( 
int(max(1,baseSpeed-wingLessBaseSpeed-horseLessBaseSpeed)*10000/max(100,(10000+min(6000,houseSpeedPer+wingSpeedPer+dienstgradSpeedPer+buffSpeedPer+collectEquipSpeedPer)*0.6))) 
)