Merge branch 'NewFilePath' into CJL

JLChen

2020-12-15 5d6626e390f7bccbbfbc0df1e95f8fb86a53af58

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs

@@ -140,7 +140,7 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = light.collection
                IsSelected = light.collect
            };
            controlView.AddChidren(btnCollection);

@@ -153,6 +153,10 @@
                ColorImagePath = "FunctionIcon/Light/ColorWheel.png",
            };
            controlView.AddChidren(colorPicker);
            if(light.trait_on_off.curValue.ToString() == "off")
            {
                colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
            }

            #region 亮度调节
            var btnBrightnessText = new Button()