Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into De...

Davin

2023-07-26 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2

 HDL_ON/Entity/Function/Function.cs

@@ -803,25 +803,27 @@
            var list = new List<FunctionAttributes>();
            if (spk == SPK.GroupControl)
            {
                var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                if (gc != null)
                lock (list)
                {
                    foreach (var temp in gc.sids)
                    var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                    if (gc != null)
                    {
                        var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
                        if (light != null)
                        foreach (var temp in gc.sids)
                        {
                            foreach (var attr in light.attributes)
                            var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
                            if (light != null)
                            {
                                if (list.Find((obj) => obj.key == attr.key) == null)
                                foreach (var attr in light.attributes)
                                {
                                    list.Add(attr);
                                    if (list.Find((obj) => obj.key == attr.key) == null)
                                    {
                                        list.Add(attr);
                                    }
                                }
                            }
                        }
                    }
                }

            }
            else
            {
@@ -1142,6 +1144,10 @@
        /// 当前值
        /// </summary>
        public object curValue = new object();
        /// <summary>
        /// 属性单位
        /// </summary>
        public string unit=string.Empty;
    }

    /// <summary>