From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL
---
HDL_ON/Entity/Function/Light.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index 0a95c65..2dfa921 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -105,7 +105,9 @@
function.Add(trait_fadeTime);
}
}
- return Convert.ToInt32(trait_fadeTime.value);
+ int result = 0;
+ int.TryParse(trait_fadeTime.value.ToString(), out result);
+ return result;
}
set
{
@@ -158,7 +160,7 @@
name = "color",
value_key = new List<string> { "FFFFFF" },
max = 0xFFFFFF,
- min = 0x000000,
+ min = 0x00000F,
};
}
trait_color.value = trait_color.min;
--
Gitblit v1.8.0