1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/Entity/Function/Curtain.cs

@@ -17,7 +17,7 @@
        {
        }//percent
        [Newtonsoft.Json.JsonIgnore]
        public Trait trait_percent;
        public FunctionAttributes trait_percent;
        /// <summary>
        /// 开关百分比
        /// 0-100
@@ -31,20 +31,20 @@
                {
                    if(trait_percent==null)
                    {
                        trait_percent = function.Find((obj) => obj.name == "percent");
                        trait_percent = function.Find((obj) => obj.key == "percent");
                        if (trait_percent == null)
                        {
                            trait_percent = new Trait()
                            trait_percent = new FunctionAttributes()
                            {
                                name = "percent",
                                value_key = new List<string> { "up", "down" },
                                key = "percent",
                                value = new List<string> { "up", "down" },
                                max = 100,
                                min = 0,
                            };
                        }
                        trait_percent.value = trait_percent.min;
                        trait_percent.curValue = trait_percent.min;
                    }
                    return Convert.ToInt32( trait_percent.value);
                    return Convert.ToInt32( trait_percent.curValue);
                }
                catch
                {
@@ -56,7 +56,7 @@
            {
                try
                {
                    trait_percent.value = value;
                    trait_percent.curValue = value;
                }
                catch
                {