版本合并冲突修改

wxr

2022-06-30 cda315b3a19919cae922bdbe96bc20eab4e29fcc

 HDL_ON/Entity/Function/Scene.cs

@@ -585,6 +585,9 @@
                case FunctionAttributeKey.FadeTime:
                    text = Language.StringByID(StringId.FadeSpeed);
                    break;
                case "angle":
                    text = Language.StringByID(StringId.Angle);
                    break;
            }
            return text;
        }