Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

 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,