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

client_Zxw

2018-09-26 cbe3d7c2cb4fbf96f3a2295351fa03ea14035499

 System/MainInterfacePanel/HighSettingTip.cs

@@ -341,7 +341,7 @@


            _ColseBtn.gameObject.SetActive(true);

            _ShowBtn.gameObject.SetActive(false);

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                m_HighSettingFadeInFadeOut.FadeOut();//淡出

            }

@@ -351,7 +351,7 @@


        public void ColseButton()//向下

        {

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                _ShowBtn.gameObject.SetActive(true);

                _ColseBtn.gameObject.SetActive(false);

@@ -362,7 +362,7 @@
        }

        public void ColseButtonNow()//向下（立刻隐藏）

        {

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                _ShowBtn.gameObject.SetActive(true);

                _ColseBtn.gameObject.SetActive(false);

@@ -376,7 +376,7 @@


            _ColseBtn.gameObject.SetActive(true);

            _ShowBtn.gameObject.SetActive(false);

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                m_HighSettingFadeInFadeOut.PositionNow();//立刻出现

            }