设置界面定位
Merge branch 'master' of https://github.com/Multimillionaires/MonsterD

Conflicts:
	Classes/SettingLayer.cpp