From 613aec6974fccad5e4c07f745b58b3e93d4e8b82 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 06 十一月 2023 16:17:07 +0800
Subject: [PATCH] bug fix
---
HDL_ON/Entity/Function/Scene.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 9065ef5..1e92f33 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -87,6 +87,14 @@
/// 鏄惁鍏佽鍒犻櫎
/// </summary>
public bool can_delete = true;
+ /// <summary>
+ /// 鏄惁鍏佽缂栬緫
+ /// </summary>
+ public bool can_edit = true;
+ /// <summary>
+ /// 鏄惁鏄綉鍏虫湰鍦板満鏅�
+ /// </summary>
+ public bool local = false;
/// <summary>
/// 鍒涘缓璇ュ満鏅殑鐢ㄦ埛ID
@@ -562,25 +570,24 @@
/// <returns></returns>
private Function ConvertFunctionObject()
{
+ Function temp = null;
if (type == "7")
{
var logic = Logic.LogicList.Find((obj) => obj.sid == sid);
if (logic != null) {
- _localFunction = new Function()
- {
- name = logic.name
- };
+ temp = new Function();
+ temp.name = logic.name;
}
}
else
{
- var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
- if (localFunction == null)
+ temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
+ if (temp == null)
{
- localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ temp = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
}
}
- return localFunction;
+ return temp;
}
--
Gitblit v1.8.0