From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index ba2ba9a..7498456 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/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()
{
--
Gitblit v1.8.0