Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

 HDL_ON/Entity/Function/Curtain.cs

@@ -31,7 +31,7 @@
                {
                    if(trait_percent==null)
                    {
                        trait_percent = function.Find((obj) => obj.key == "percent");
                        trait_percent = attributes.Find((obj) => obj.key == "percent");
                        if (trait_percent == null)
                        {
                            trait_percent = new FunctionAttributes()