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/Curtain.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Curtain.cs b/HDL_ON/Entity/Function/Curtain.cs
index 97c1c8c..51d2a25 100644
--- a/HDL_ON/Entity/Function/Curtain.cs
+++ b/HDL_ON/Entity/Function/Curtain.cs
@@ -31,7 +31,7 @@
{
if(trait_percent==null)
{
- trait_percent = function.Find((obj) => obj.key == "percent");
+ trait_percent = attributes.Find((obj) => obj.key == "percent");
if (trait_percent == null)
{
trait_percent = new FunctionAttributes()
@@ -40,9 +40,11 @@
value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0
};
}
- trait_percent.curValue = trait_percent.min;
+ if (trait_percent.curValue.ToString() == "{}")
+ trait_percent.curValue = 0;
}
return Convert.ToInt32( trait_percent.curValue);
}
--
Gitblit v1.8.0