Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-10-10 01638bd36dd973e2e925b3b41045b157f3e64d4e

 System/SystemSetting/SystemSetWin.cs

@@ -24,6 +24,7 @@
        [SerializeField] Text m_SyncPlayerCount;



        [SerializeField] Button m_SwitchAccountBtn;

        [SerializeField] Button m_SwitchServer;

        [SerializeField] Text m_SwitchAccountTitle;

        [SerializeField] Button m_LockScreenBtn;

        [SerializeField] Button m_ServiceBulletinsBtn;

@@ -58,6 +59,7 @@
            m_SyncPlayerSlider.AddListener(OnPlayerSyncCountChange);



            m_SwitchAccountBtn.AddListener(ClickSwitchAccountBtn);

            m_SwitchServer.SetListener(ClickSwitchServerButton);

            m_LockScreenBtn.AddListener(ClickLockScreen);

            m_CopyBtn.AddListener(ClickCopyBtn);

            m_AntiAddition.AddListener(AntiAdditction);

@@ -249,6 +251,11 @@
            }

        }



        private void ClickSwitchServerButton()

        {

            GameNetSystem.Instance.LoginOut();

        }



        private void ClickLockScreen()

        {

            if (!WindowJumpMgr.Instance.IsJumpState)