Merge branch 'master' into leonard

leonard Wu

2018-08-03 7cc84329c52b6e39cd979eb33a126e059b9bf36c

 System/SystemSetting/SystemSetting.cs

@@ -110,7 +110,7 @@
    public void SetQualityLevel(GameQuality _quality, bool _disabeCamera = true)
    {
        LocalSave.SetInt(QUALITY_LEVEL_KEY, Mathf.Clamp((int)_quality, 0, 2));
        QualitySettings.SetQualityLevel((int)_quality);
        QualitySettings.SetQualityLevel((int)GameQuality.High);

        switch (_quality)
        {