From 8ac39f2f962329f30ee61ee8a7abe6d6b5940dd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 13:45:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-LC' into wxr4
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index 184482a..111d2f4 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -281,7 +281,9 @@
items.Add("60", "1min");
items.Add("120", "2min");
items.Add("300", "5min");
- new PublicAssmebly().SetSceneDelayDialog(items, action ,scene.delay);
+ new PublicAssmebly().SetSceneDelayDialog( action ,scene.delay);
+
+
};
contentView.AddChidren(new Button()
@@ -802,6 +804,7 @@
}
/// <summary>
+ /// 鍒涘缓鍦烘櫙
/// 瀹屾垚鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
void LoadEvent_CompleteEvent()
--
Gitblit v1.8.0