From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/Entity/Function/Light.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index 2092e93..df73832 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -32,7 +32,7 @@
{
if (trait_brightness == null)
{
- trait_brightness = function.Find((obj) => obj.key == "brightness");
+ trait_brightness = attributes.Find((obj) => obj.key == "brightness");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_brightness == null)
{
@@ -46,6 +46,10 @@
}
trait_brightness.curValue = trait_brightness.min;
}
+ if(trait_brightness.curValue.ToString() == "")
+ {
+ trait_brightness.curValue = 0;
+ }
return Convert.ToInt32(trait_brightness.curValue);
}
set
@@ -54,7 +58,7 @@
{
if (trait_brightness == null)
{
- trait_brightness = function.Find((obj) => obj.key == "brightness");
+ trait_brightness = attributes.Find((obj) => obj.key == "brightness");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_brightness == null)
{
@@ -90,7 +94,7 @@
{
if (trait_fadeTime == null)
{
- trait_fadeTime = function.Find((obj) => obj.key == "fade_time");
+ trait_fadeTime = attributes.Find((obj) => obj.key == "fade_time");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_fadeTime == null)
{
@@ -102,7 +106,7 @@
min = 0,
};
trait_fadeTime.curValue = 0;
- function.Add(trait_fadeTime);
+ attributes.Add(trait_fadeTime);
}
}
int result = 0;
@@ -115,7 +119,7 @@
{
if (trait_fadeTime == null)
{
- trait_fadeTime = function.Find((obj) => obj.key == "fade_time");
+ trait_fadeTime = attributes.Find((obj) => obj.key == "fade_time");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_fadeTime == null)
{
@@ -127,7 +131,7 @@
min = 0,
};
trait_fadeTime.curValue = 0;
- function.Add(trait_fadeTime);
+ attributes.Add(trait_fadeTime);
}
}
trait_fadeTime.curValue = value;
@@ -151,7 +155,7 @@
{
if (trait_color == null)
{
- trait_color = function.Find((obj) => obj.key == "color");
+ trait_color = attributes.Find((obj) => obj.key == "color");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_color == null)
{
--
Gitblit v1.8.0