From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 09 六月 2021 17:46:32 +0800 Subject: [PATCH] Merge branch 'tzy2' into wxr6 --- HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs index b75b06e..d647195 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs @@ -130,7 +130,7 @@ Height = Application.GetMinRealAverage(28), UnSelectedImagePath = "Public/AddIcon.png", }; - if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) + //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) { topView.AddChidren(btnAddIconBg); } @@ -140,7 +140,7 @@ Width = Application.GetMinRealAverage(28+30), Height = Application.GetMinRealAverage(28+29), }; - if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) + //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) { topView.AddChidren(btnAddIcon); } @@ -396,7 +396,7 @@ Width = Application.GetRealWidth(32), UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png", }; - if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) + if (scene.userId == UserInfo.Current.ID) { view.AddChidren(btnSettingIcon); } @@ -412,12 +412,12 @@ SelectedImagePath = "Collection/CollectionIcon.png", IsSelected = scene.collect, }; - //view.AddChidren(btnCollection); + view.AddChidren(btnCollection); //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳� - if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) - { - view.AddChidren(btnCollection); - } + //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) + //{ + // view.AddChidren(btnCollection); + //} btnCollection.MouseUpEventHandler = (sender, e) => { scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected; scene.CollectScene(); -- Gitblit v1.8.0