From e18e6f74e211bfb65747cac364f942b41620645c Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 14 十一月 2025 18:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/Component/UI/Core/GradientText.cs |   31 +++++++++----------------------
 1 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/Main/Component/UI/Core/GradientText.cs b/Main/Component/UI/Core/GradientText.cs
index fa91a58..72fa832 100644
--- a/Main/Component/UI/Core/GradientText.cs
+++ b/Main/Component/UI/Core/GradientText.cs
@@ -31,7 +31,6 @@
         Horizontal,     // 姘村钩娓愬彉
         Vertical,       // 鍨傜洿娓愬彉
         Diagonal,       // 瀵硅绾挎笎鍙�
-        Radial,         // 寰勫悜娓愬彉
         Custom          // 鑷畾涔夊洓瑙掗鑹�
     }
 
@@ -154,19 +153,7 @@
         SetVerticesDirty();
     }
 
-    /// <summary>
-    /// 璁剧疆寰勫悜娓愬彉棰滆壊
-    /// </summary>
-    public void SetRadialGradient(Color centerColor, Color edgeColor)
-    {
-        m_GradientType = GradientType.Radial;
-        m_TopLeftColor = edgeColor;
-        m_TopRightColor = edgeColor;
-        m_BottomLeftColor = edgeColor;
-        m_BottomRightColor = edgeColor;
-        // 寰勫悜娓愬彉闇�瑕佸湪椤剁偣鐫�鑹插櫒涓鐞�
-        SetVerticesDirty();
-    }
+
 
     protected override void OnPopulateMesh(VertexHelper vh)
     {
@@ -221,21 +208,21 @@
                 return Color.Lerp(m_TopLeftColor, m_TopRightColor, x);
                 
             case GradientType.Vertical:
-                return Color.Lerp(m_TopLeftColor, m_BottomLeftColor, y);
+                return Color.Lerp(m_TopLeftColor, m_BottomLeftColor, 1 - y);
                 
             case GradientType.Diagonal:
-                return Color.Lerp(m_TopLeftColor, m_BottomRightColor, (x + y) * 0.5f);
+                // 瀵硅绾挎笎鍙橈細浠庡乏涓婂埌鍙充笅
+                // 浣跨敤鏇村噯纭殑瀵硅绾胯绠楋紝纭繚浠庡乏涓婂埌鍙充笅鐨勬笎鍙�
+                var diagonalFactor = Mathf.Clamp01((x + (1 - y)) * 0.5f);
+                return Color.Lerp(m_TopLeftColor, m_BottomRightColor, diagonalFactor);
                 
-            case GradientType.Radial:
-                var center = new Vector2(0.5f, 0.5f);
-                var distance = Vector2.Distance(new Vector2(x, y), center);
-                return Color.Lerp(m_TopLeftColor, m_BottomRightColor, distance * 2f);
+
                 
             case GradientType.Custom:
-                // 鍙岀嚎鎬ф彃鍊�
+                // 鍙岀嚎鎬ф彃鍊硷細淇Y杞存柟鍚�
                 var topColor = Color.Lerp(m_TopLeftColor, m_TopRightColor, x);
                 var bottomColor = Color.Lerp(m_BottomLeftColor, m_BottomRightColor, x);
-                return Color.Lerp(topColor, bottomColor, y);
+                return Color.Lerp(topColor, bottomColor, 1 - y);
                 
             default:
                 return color;

--
Gitblit v1.8.0