Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-15 788de3fdfa8fd193ae2e1d374aa0587fc91221fb

 System/SystemSetting/SettingMgr.cs

@@ -43,8 +43,6 @@
            #endregion



            #region 初始化系统设置

            SystemSetting.Instance.SetSoundVolume(1);

            SystemSetting.Instance.SetSoundEffect(1);

            SystemSetting.Instance.SetSystemSettingSwitch(SystemSwitch.OtherPlayer, false);

            SystemSetting.Instance.SetSystemSettingSwitch(SystemSwitch.HideMonster, false);

            #endregion