From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index b75b06e..b6247cd 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);
}
--
Gitblit v1.8.0