Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-24 6ce4ae16561fd205c8bb3f530d5a20033f207f4f

 System/SystemSetting/SystemSetWin.cs

@@ -15,6 +15,7 @@
        [SerializeField] Toggle m_HighQuality;

        [SerializeField] Toggle m_MediumQuality;

        [SerializeField] Toggle m_LowQuality;

        [SerializeField] OnOffToggle m_SixtyFrame;



        [SerializeField] Toggle m_OtherPlayer;

        [SerializeField] Toggle m_Monster;

@@ -49,6 +50,8 @@
            m_HighQuality.AddListener(OnSetQualityHigh);

            m_MediumQuality.AddListener(OnSetQualityMedium);

            m_LowQuality.AddListener(OnSetQualityLow);

            m_SixtyFrame.AddListener(SwitchGameFrame);



            m_OtherPlayer.AddListener(OnShowOrHideOtherPlayers);

            m_Monster.AddListener(OnShowOrHideMonsters);



@@ -78,6 +81,8 @@
            UpdateToggleSkin(m_LowQuality);

            UpdateToggleSkin(m_OtherPlayer);

            UpdateToggleSkin(m_Monster);



            m_SixtyFrame.isOn = SystemSetting.Instance.GetGameFrame() == GameFrame.FullFrame;



            var serverName = ServerListCenter.Instance.GetServerData(ServerListCenter.Instance.currentServer.region_flag).name;

            var playerAccount = PlayerDatas.Instance.baseData.AccID.Split('@');

@@ -111,6 +116,7 @@


            loginModel.accountBindOkEvent += UpdateAccountBindTitle;

            SDKUtility.Instance.onFreePlatfromDoIDAuthenticationOk += OnAuthenticationOk;

            SystemSetting.Instance.gameFrameChangeEvent += OnSwitchGameFrame;

            SystemSetting.Instance.playerSyncCountChangeEvent += OnPlayerSyncCountChange;



            isInited = true;

@@ -121,6 +127,7 @@
            isInited = false;

            loginModel.accountBindOkEvent -= UpdateAccountBindTitle;

            SDKUtility.Instance.onFreePlatfromDoIDAuthenticationOk -= OnAuthenticationOk;

            SystemSetting.Instance.gameFrameChangeEvent -= OnSwitchGameFrame;

            SystemSetting.Instance.playerSyncCountChangeEvent -= OnPlayerSyncCountChange;

            SystemSetting.Instance.SetPlayerSyncCount(playerSyncCountRef);

        }

@@ -175,6 +182,7 @@
                SystemSetting.Instance.SetQualityLevel(GameQuality.Low);

                if (isInited)

                {

                    SystemSetting.Instance.SetGameFrame(GameFrame.HalfFrame);

                    SystemSetting.Instance.SetPlayerSyncCount(5);

                }

            }

@@ -182,6 +190,25 @@
            UpdateToggleSkin(m_LowQuality);

        }



        private void SwitchGameFrame()

        {

            var gameFrame = SystemSetting.Instance.GetGameFrame();



            if (gameFrame==GameFrame.HalfFrame)

            {

                SystemSetting.Instance.SetGameFrame(GameFrame.FullFrame);

            }

            else

            {

                SystemSetting.Instance.SetGameFrame(GameFrame.HalfFrame);

            }

        }



        private void OnSwitchGameFrame()

        {

            m_SixtyFrame.isOn = SystemSetting.Instance.GetGameFrame() == GameFrame.FullFrame;

        }



        private void OnShowOrHideOtherPlayers(bool _value)

        {

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