From 2f83639bdc8b4b20245eb9d5fb4973df2f63cebb Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 13 六月 2025 10:31:34 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建 漏提交的文件

---
 Main/System/UIBase/UIBase.cs |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Main/System/UIBase/UIBase.cs b/Main/System/UIBase/UIBase.cs
index a6bc9d2..35878f9 100644
--- a/Main/System/UIBase/UIBase.cs
+++ b/Main/System/UIBase/UIBase.cs
@@ -52,6 +52,7 @@
     [SerializeField] protected RectTransform _rectTransform; //鐣岄潰榛樿娣诲姞鏍硅妭鐐圭敤浜庤〃鐜扮晫闈㈠紑鍚叧闂姩鐢�
     
     [SerializeField]/*[HideInInspector]*/ public float animeDuration = 0.2f;
+    [SerializeField]public TweenCurve scaleOverInOutCurve;
     [SerializeField][HideInInspector] public Ease animationEase = Ease.OutQuad; // 纭繚浣跨敤 DG.Tweening.Ease
 
     // 杩愯鏃剁姸鎬�
@@ -619,8 +620,19 @@
                 case UIAnimationType.ScaleOverInOut:
                     if (_rectTransform != null)
                     {
-                        currentAnimation.Append(DOVirtual.Float(0.3f, 1.2f, animeDuration, (value) => {canvasScaler.scaleFactor = value;}).SetEase(animationEase));
-                        currentAnimation.Append(DOVirtual.Float(1.2f, 1f, 0.1f, (value) => {canvasScaler.scaleFactor = value;}).SetEase(animationEase));
+                        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));
+                        }
+                        
+
+                        // currentAnimation.Append(DOVirtual.Float(1.2f, 1f, 0.1f, (value) => {canvasScaler.scaleFactor = value;}).SetEase(scaleOverInOutCurve));
                     }
                     break;
             }
@@ -629,7 +641,7 @@
             currentAnimation.OnComplete(() =>
             {
                 isAnimating = false;
-
+                _ResetToBegin();
                 OnOpenAnimationComplete();
 
                 // 鍚敤浜や簰

--
Gitblit v1.8.0