1.ResideMenu setScaleValue,valid scale factor is between 0.0f and 1.0f.
Fix conflict.
Merge branch 'Haoxiqiang-master'