diff --git a/Assets/TEngine/Runtime/GameFramework/Shader/TShader.cs b/Assets/TEngine/Runtime/GameFramework/Shader/TShader.cs index 4b8b3974..664f1b1e 100644 --- a/Assets/TEngine/Runtime/GameFramework/Shader/TShader.cs +++ b/Assets/TEngine/Runtime/GameFramework/Shader/TShader.cs @@ -11,8 +11,8 @@ namespace TEngine private bool _loaded; private Shader _shader; private readonly string _shaderPath; - private readonly List _keywordOn = new(); - private readonly List _keywordOff = new(); + private readonly List _keywordOn = new List(); + private readonly List _keywordOff = new List(); /// /// Shader scripts used for all rendering. diff --git a/Assets/TEngine/Runtime/GameSettings/Framework/FrameworkGlobalSettings.cs b/Assets/TEngine/Runtime/GameSettings/Framework/FrameworkGlobalSettings.cs index 81e20911..5fdfb61c 100644 --- a/Assets/TEngine/Runtime/GameSettings/Framework/FrameworkGlobalSettings.cs +++ b/Assets/TEngine/Runtime/GameSettings/Framework/FrameworkGlobalSettings.cs @@ -261,32 +261,28 @@ public class FrameworkGlobalSettings [SerializeField] private List scriptGenerateRule = new List() { - new("m_go", "GameObject"), - new("m_item", "GameObject"), - new("m_tf", "Transform"), - new("m_rect", "RectTransform"), + new ScriptGenerateRuler("m_go", "GameObject"), + new ScriptGenerateRuler("m_item", "GameObject"), + new ScriptGenerateRuler("m_tf", "Transform"), + new ScriptGenerateRuler("m_rect", "RectTransform"), + new ScriptGenerateRuler("m_text", "Text"), + new ScriptGenerateRuler("m_richText", "RichTextItem"), + new ScriptGenerateRuler("m_btn", "Button"), + new ScriptGenerateRuler("m_img", "Image"), + new ScriptGenerateRuler("m_rimg", "RawImage"), + new ScriptGenerateRuler("m_scrollBar", "Scrollbar"), + new ScriptGenerateRuler("m_scroll", "ScrollRect"), + new ScriptGenerateRuler("m_input", "InputField"), + new ScriptGenerateRuler("m_grid", "GridLayoutGroup"), + new ScriptGenerateRuler("m_hlay", "HorizontalLayoutGroup"), + new ScriptGenerateRuler("m_vlay", "VerticalLayoutGroup"), + new ScriptGenerateRuler("m_red", "RedNoteBehaviour"), + new ScriptGenerateRuler("m_slider", "Slider"), + new ScriptGenerateRuler("m_group", "ToggleGroup"), + new ScriptGenerateRuler("m_curve", "AnimationCurve"), + new ScriptGenerateRuler("m_canvasGroup", "CanvasGroup"), #if ENABLE_TEXTMESHPRO - {"m_textPro","TextMeshProUGUI"}, -#else - new("m_text", "Text"), -#endif - new("m_richText", "RichTextItem"), - new("m_btn", "Button"), - new("m_img", "Image"), - new("m_rimg", "RawImage"), - new("m_scrollBar", "Scrollbar"), - new("m_scroll", "ScrollRect"), - new("m_input", "InputField"), - new("m_grid", "GridLayoutGroup"), - new("m_hlay", "HorizontalLayoutGroup"), - new("m_vlay", "VerticalLayoutGroup"), - new("m_red", "RedNoteBehaviour"), - new("m_slider", "Slider"), - new("m_group", "ToggleGroup"), - new("m_curve", "AnimationCurve"), - new("m_canvasGroup", "CanvasGroup"), -#if ENABLE_TEXTMESHPRO - new("m_tmp","TextMeshProUGUI"), + new ScriptGenerateRuler("m_tmp","TextMeshProUGUI"), #endif };