Merge branch 'WJC'

wxr

2020-12-07 64dbbfe1d6488635e160189a704afccffc7d34d0

 HDL_ON/UI/UI2/2-Classification/RoomPage.cs

@@ -23,9 +23,14 @@
        static Room room;
        Action skipEditPageAction;
        Action ReloadRoomName;
        /// <summary>
        /// 删除房间事件
        /// </summary>
        Action deleteAction;

        #endregion

        public RoomPage(Room r,Action rrn)
        public RoomPage(Room r, Action rrn, Action delAction)
        {
            bodyView = this;
            room = r;
@@ -34,6 +39,7 @@
                LoadEvent_SkipEditRoomPage();
            };
            ReloadRoomName = rrn;
            deleteAction = delAction;
        }
        /// <summary>
        /// 重载界面
@@ -172,7 +178,7 @@
            };
            bodyDiv.AddChidren(btnCollectionIcon);
            btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
            if ((scene as Scene).sceneType == SceneType.MovieScene)
            if (scene.sceneType == SceneType.MovieScene)
            {
                var movieIcon = new Button()
                {