From 330e3ae4cdd1e9facb14b6ea2b3e609166c04fd3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 12 一月 2021 16:00:27 +0800
Subject: [PATCH] 2021-1-12-1
---
HDL_ON/Entity/Function/Light.cs | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
old mode 100755
new mode 100644
index c3ae4b8..34d5363
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -153,6 +153,8 @@
}
}
}
+
+ #region RGB
/// <summary>
/// 鑾峰彇rgb棰滆壊
/// </summary>
@@ -174,10 +176,10 @@
}
if (trait_color.curValue.ToString() == "{}")
trait_color.curValue = "255,255,255";
- int.TryParse(trait_color.curValue.ToString().Split(",")[0], out redColor);
- int.TryParse(trait_color.curValue.ToString().Split(",")[1], out greenColor);
- int.TryParse(trait_color.curValue.ToString().Split(",")[2], out blueColor);
}
+ int.TryParse(trait_color.curValue.ToString().Split(",")[0], out redColor);
+ int.TryParse(trait_color.curValue.ToString().Split(",")[1], out greenColor);
+ int.TryParse(trait_color.curValue.ToString().Split(",")[2], out blueColor);
int recolor = redColor * 256 * 256 + greenColor * 256 + blueColor;
@@ -200,6 +202,7 @@
redColor = color[0];
greenColor = color[1];
blueColor = color[2];
+ trait_color.curValue = redColor + "," + greenColor + "," + blueColor;
}
[Newtonsoft.Json.JsonIgnore]
@@ -227,5 +230,38 @@
return blueColor;
}
}
+ #endregion
+
+ #region CCT
+ FunctionAttributes attr_CCT;
+ /// <summary>
+ /// 鑹叉俯
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public FunctionAttributes Attr_CCT
+ {
+ get
+ {
+ if(attr_CCT == null)
+ {
+ attr_CCT = attributes.Find((obj) => obj.key == FunctionAttributeKey.CCT);
+ if(attr_CCT== null)
+ {
+ attr_CCT = new FunctionAttributes()
+ {
+ key = FunctionAttributeKey.CCT,
+ value = new List<string> (),
+ max = 6500,
+ min = 2700,
+ curValue = 2700
+ };
+ }
+ }
+ var result = 2700;
+ int.TryParse(attr_CCT.curValue.ToString(), out result);
+ return attr_CCT;
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.8.0