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

client_Hale

2019-04-15 c79dbe6647429b864d15a21b3baa77ffa8d48768

 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -231,13 +231,14 @@
                }

            }



            m_Switch.gameObject.SetActive(IsShowButton());

        }



        public bool IsShowButton()//是否显示切换按钮

        bool IsShowButton()

        {

            foreach (var grid in m_GridGroup1)

            {

                if (!grid.alwayShow)

                if (!grid.alwayShow && grid.gameObject.activeSelf)

                {

                    return true;

                }

@@ -245,7 +246,7 @@


            foreach (var grid in m_GridGroup2)

            {

                if (!grid.alwayShow)

                if (!grid.alwayShow && grid.gameObject.activeSelf)

                {

                    return true;

                }