From 9c11bde90925be7a0dd4f1acd89f41d69b7132be Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 24 六月 2025 21:18:09 +0800
Subject: [PATCH] 0312 优化界面的缩放动画功能按曲线播放;去除客服按钮;去除安全适配代码;后续需要直接改UIBase的根节点

---
 Main/System/UIBase/UIBase.cs |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Main/System/UIBase/UIBase.cs b/Main/System/UIBase/UIBase.cs
index d8b24c0..37c3a1d 100644
--- a/Main/System/UIBase/UIBase.cs
+++ b/Main/System/UIBase/UIBase.cs
@@ -25,7 +25,7 @@
     SlideFromBottom, // 浠庡簳閮ㄦ粦鍏�
     SlideFromLeft, // 浠庡乏渚ф粦鍏�
     SlideFromRight, // 浠庡彸渚ф粦鍏�
-    ScaleOverInOut,// 缂╂斁锛堣秴杩囷級涔嬪悗鍐嶈繑鍥�
+    ScaleOverInOut,// 缂╂斁鏍规嵁鏇茬嚎
 
 }
 
@@ -401,9 +401,9 @@
                     canvasGroup.alpha = 0f;
                     canvasGroup.blocksRaycasts = false;
                 }
-                if (canvasScaler != null)
+                if (_rectTransform != null)
                 {
-                    canvasScaler.scaleFactor = 1f;
+                    _rectTransform.localScale = Vector3.one;
                 }
                 break;
 
@@ -413,9 +413,9 @@
                     canvasGroup.alpha = 1f;
                     canvasGroup.blocksRaycasts = false;
                 }
-                if (canvasScaler != null)
+                if (_rectTransform != null)
                 {
-                    canvasScaler.scaleFactor = 0.3f;
+                    _rectTransform.localScale = Vector3.one * 0.3f;
                 }
                 break;
 
@@ -464,9 +464,9 @@
                     canvasGroup.alpha = 1f;
                     canvasGroup.blocksRaycasts = false;
                 }
-                if (canvasScaler != null)
+                if (_rectTransform != null)
                 {
-                    canvasScaler.scaleFactor = 0.3f;
+                    _rectTransform.localScale = Vector3.one * 0.3f;
                 }
                 break;
         }
@@ -489,7 +489,7 @@
                 case UIAnimationType.ScaleInOut:
                     if (_rectTransform != null)
                     {
-                        currentAnimation.Append(DOVirtual.Float(0.3f, 1f, animeDuration, (value) => {canvasScaler.scaleFactor = value;}).SetEase(animationEase));
+                        currentAnimation.Append(DOVirtual.Float(0.3f, 1f, animeDuration, (value) => {_rectTransform.localScale = Vector3.one * value;}).SetEase(animationEase));
                     }
                     break;
 
@@ -505,19 +505,19 @@
                 case UIAnimationType.ScaleOverInOut:
                     if (_rectTransform != null)
                     {
-                        if (null == scaleOverInOutCurve)
-                        {
-                            currentAnimation.Append(DOVirtual.Float(0.3f, 1.2f, animeDuration, 
-                            (value) => {canvasScaler.scaleFactor = value;}).SetEase(animationEase));
-                        }
-                        else
-                        {
-                            currentAnimation.Append(DOVirtual.Float(0.3f, 1.2f, animeDuration, 
-                                (value) => {canvasScaler.scaleFactor = value;}).SetEase(scaleOverInOutCurve.curve));
-                        }
+                        float startScale = scaleOverInOutCurve.curve.Evaluate(0f);
+                        _rectTransform.localScale = Vector3.one * startScale;
+                        currentAnimation.Append(
+                            DOTween.To(
+                                () => _rectTransform.localScale.x,
+                                (value) => _rectTransform.localScale = Vector3.one * value,
+                                1f, 
+                                animeDuration
+                            )
+                            .SetEase(scaleOverInOutCurve.curve)
+                            .OnComplete(() => _rectTransform.localScale = Vector3.one) // 纭繚鏈�缁堝��1姝g‘
+                        );
                         
-
-                        // currentAnimation.Append(DOVirtual.Float(1.2f, 1f, 0.1f, (value) => {canvasScaler.scaleFactor = value;}).SetEase(scaleOverInOutCurve));
                     }
                     break;
             }
@@ -567,9 +567,9 @@
             canvasGroup.alpha = 1f;
             canvasGroup.blocksRaycasts = true;
         }
-        if (canvasScaler != null)
+        if (_rectTransform != null)
         {
-            canvasScaler.scaleFactor = 1f;
+            _rectTransform.localScale = Vector3.one;
         }
 
         if (_rectTransform != null)
@@ -613,7 +613,7 @@
                 case UIAnimationType.ScaleOverInOut:
                     if (_rectTransform != null)
                     {
-                        currentAnimation.Append(DOVirtual.Float(1f, 0.3f, animeDuration, (value) => {canvasScaler.scaleFactor = value;}).SetEase(animationEase));
+                        currentAnimation.Append(DOVirtual.Float(1f, 0.3f, animeDuration, (value) => {_rectTransform.localScale = Vector3.one * value;}).SetEase(animationEase));
                     }
                     break;
 

--
Gitblit v1.8.0