From 46a5de6e9871c5c52ba4195576c1c2a4725abb08 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 八月 2021 09:11:51 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 59f0947..cfab368 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -289,7 +289,7 @@
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()
@@ -331,6 +331,7 @@
functionListView = new VerticalScrolViewLayout() {
Height = 0,
+ ScrollEnabled = false,
};
contentView.AddChidren(functionListView);
--
Gitblit v1.8.0