From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d8cb65e..83713a1 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -738,12 +738,12 @@
                     SelectedImagePath = "Collection/CollectionWhiteIcon.png",
                     UnSelectedImagePath = "Collection/CollectionIcon.png",
                 };
-                //view.AddChidren(btnCollection);
+                view.AddChidren(btnCollection);
                 //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
-                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
-                {
-                    view.AddChidren(btnCollection);
-                }
+                //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+                //{
+                //    view.AddChidren(btnCollection);
+                //}
 
                 LoadEvent_FunctionCollection(btnCollection, function);
                 if (//SPK.CurtainSpkList().Contains(function.spk))
@@ -1012,7 +1012,7 @@
                     Width = Application.GetRealWidth(32),
                     UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
                 };
-                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+                if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
                 {
                     view.AddChidren(btnSettingIcon);
                 }
@@ -1057,12 +1057,12 @@
                     SelectedImagePath = "Collection/CollectionWhiteIcon.png",
                     UnSelectedImagePath = "Collection/CollectionIcon.png",
                 };
-                //view.AddChidren(btnCollection);
+                view.AddChidren(btnCollection);
                 //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
-                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
-                {
-                    view.AddChidren(btnCollection);
-                }
+                //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+                //{
+                //    view.AddChidren(btnCollection);
+                //}
 
                 LoadEvent_SceneCollection(btnCollection, scene);
 

--
Gitblit v1.8.0