From c79dbe6647429b864d15a21b3baa77ffa8d48768 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 15 四月 2019 15:29:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 1ec793e..65e4d3f 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/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;
                 }

--
Gitblit v1.8.0