From c135877a65244706008b6215b2734bb37bbfb7f4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:59:09 +0800
Subject: [PATCH] Merge branch 'Dev-1.9' into Dev-Branch

---
 HDL_ON/Entity/Function/Scene.cs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 3b00095..fdf195b 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -560,6 +560,10 @@
         private Function ConvertFunctionObject()
         {
             var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
+            if(localFunction == null)
+            {
+                localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+            }
             return localFunction;
         }
 
@@ -629,7 +633,12 @@
             return sceneFunctionInfo;
         }
 
-
+        /// <summary>
+        /// 璁惧
+        /// 鍦烘櫙 =scene
+        /// 缇ゆ帶=5
+        /// </summary>
+        public string type = "0";
     }
 
     /// <summary>

--
Gitblit v1.8.0