Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/Component/UI/Core/TextEx.cs

@@ -42,6 +42,25 @@
        }
    }

    public override string text
    {
        get { return base.text; }
        set
        {
            if (value != base.text)
            {
                base.text = value;

                #if UNITY_EDITOR
                if (material != null)
                {
                    material.shader = Shader.Find(material.shader.name);
                }
                #endif
            }
        }
    }

    [SerializeField]
    private BackGroundColorType m_BGColorType = BackGroundColorType.Dark;
    public BackGroundColorType bgColorType