From e327510c7329aa9a95e62a460ec659ea0c9563ad Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 19:05:47 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
old mode 100644
new mode 100755
index c1fb7ac..01ae7e2
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -83,24 +83,7 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
MusicFragment();
break;
- case FunctionCategory.Scene:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
- if ((function as Scene).sceneType == SceneType.MovieScene)
- {
- var movieIcon = new Button()
- {
- X = Application.GetRealWidth(52),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(16),
- Height = Application.GetRealWidth(16),
- UnSelectedImagePath = "FunctionIcon/Scene/MovieMark.png",
- };
- bodyDiv.AddChidren(movieIcon);
- btnName.X = Application.GetRealWidth(52 + 16);
- }
- //鍔犺浇鍦烘櫙鎺у埗浜嬩欢
- LoadEvent_ControlScene();
- break;
+
}
}
else
@@ -243,9 +226,14 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = function.collection
+ IsSelected = function.collect
};
- bodyDiv.AddChidren(btnCollectionIcon);
+ //bodyDiv.AddChidren(btnCollectionIcon);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ bodyDiv.AddChidren(btnCollectionIcon);
+ }
}
/// <summary>
@@ -262,7 +250,7 @@
{
X = Application.GetRealWidth(14),
Y = Application.GetRealHeight(85),
- Width = Application.GetRealWidth(22),
+ Width = Application.GetRealWidth(30),
Height = Application.GetRealHeight(21),
Text = "0%",
TextAlignment = TextAlignment.CenterLeft,
@@ -294,7 +282,7 @@
{
X = Application.GetRealWidth(14 + 22+180),
Y = Application.GetRealHeight(85),
- Width = Application.GetRealWidth(35),
+ Width = Application.GetRealWidth(45),
Height = Application.GetRealHeight(21),
Text = "100%",
TextAlignment = TextAlignment.CenterLeft,
--
Gitblit v1.8.0