From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/Entity/Function/Fan.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Fan.cs b/HDL_ON/Entity/Function/Fan.cs
index 6a0bc56..030811d 100644
--- a/HDL_ON/Entity/Function/Fan.cs
+++ b/HDL_ON/Entity/Function/Fan.cs
@@ -23,7 +23,7 @@
{
if (trait_openLevel == null)
{
- trait_openLevel = function.Find((obj) => obj.key == "openLevel");
+ trait_openLevel = attributes.Find((obj) => obj.key == "openLevel");
if (trait_openLevel == null)
{
trait_openLevel = new FunctionAttributes()
@@ -32,9 +32,11 @@
value = new List<string> { "up", "down" },
max = 7,
min = 0,
+ curValue = 0
};
}
- trait_openLevel.curValue = trait_openLevel.min;
+ if (trait_openLevel.curValue.ToString() == "{}")
+ trait_openLevel.curValue = 0;
}
return Convert.ToInt32(trait_openLevel.curValue);
}
--
Gitblit v1.8.0