From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/Entity/Function/Fan.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Fan.cs b/HDL_ON/Entity/Function/Fan.cs
index cee20c4..6a0bc56 100644
--- a/HDL_ON/Entity/Function/Fan.cs
+++ b/HDL_ON/Entity/Function/Fan.cs
@@ -10,7 +10,7 @@
}
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_openLevel;
+ public FunctionAttributes trait_openLevel;
/// <summary>
/// 妗ｄ綅
/// </summary>
@@ -23,20 +23,20 @@
{
if (trait_openLevel == null)
{
- trait_openLevel = function.Find((obj) => obj.name == "openLevel");
+ trait_openLevel = function.Find((obj) => obj.key == "openLevel");
if (trait_openLevel == null)
{
- trait_openLevel = new Trait()
+ trait_openLevel = new FunctionAttributes()
{
- name = "openLevel",
- value_key = new List<string> { "up", "down" },
+ key = "openLevel",
+ value = new List<string> { "up", "down" },
max = 7,
min = 0,
};
}
- trait_openLevel.value = trait_openLevel.min;
+ trait_openLevel.curValue = trait_openLevel.min;
}
- return Convert.ToInt32(trait_openLevel.value);
+ return Convert.ToInt32(trait_openLevel.curValue);
}
catch
{
@@ -48,7 +48,7 @@
{
try
{
- trait_openLevel.value = value;
+ trait_openLevel.curValue = value;
}
catch
{
--
Gitblit v1.8.0