From cb4ec28d83ba847f362392936b20e52e17b03081 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 31 十月 2025 19:30:45 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/Component/UI/Effect/ScriptableObject/FloatingConfig.cs | 6 ++++--
Main/System/Battle/UIComp/BattleFloatingUIController.cs | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Main/Component/UI/Effect/ScriptableObject/FloatingConfig.cs b/Main/Component/UI/Effect/ScriptableObject/FloatingConfig.cs
index 3541651..c11a00b 100644
--- a/Main/Component/UI/Effect/ScriptableObject/FloatingConfig.cs
+++ b/Main/Component/UI/Effect/ScriptableObject/FloatingConfig.cs
@@ -26,14 +26,16 @@
public Vector3 normalBeginScale = new Vector3(2f, 2f, 2f);
[Tooltip("鏅�氶瀛楃粨鏉熺缉鏀�")]
public Vector3 normalEndScale = new Vector3(1f, 1f, 1f);
+ [Tooltip("鏅�氱缉鏀惧彉鍖栨洸绾� (X杞�=鏃堕棿杩涘害0-1, Y杞�=鎻掑�艰繘搴�0-1)")]
+ public AnimationCurve normalScaleCurve = AnimationCurve.Linear(0, 0, 1, 1);
[Header("Critical Animation Settings")]
[Tooltip("鏆村嚮椋樺瓧鍒濆缂╂斁")]
public Vector3 critBeginScale = new Vector3(3f, 3f, 3f);
[Tooltip("鏆村嚮椋樺瓧缁撴潫缂╂斁")]
public Vector3 critEndScale = new Vector3(1.5f, 1.5f, 1.5f);
- [Tooltip("缂╂斁鍙樺寲鏇茬嚎 (X杞�=鏃堕棿杩涘害0-1, Y杞�=鎻掑�艰繘搴�0-1)")]
- public AnimationCurve scaleCurve = AnimationCurve.Linear(0, 0, 1, 1);
+ [Tooltip("鏆村嚮缂╂斁鍙樺寲鏇茬嚎 (X杞�=鏃堕棿杩涘害0-1, Y杞�=鎻掑�艰繘搴�0-1)")]
+ public AnimationCurve critScaleCurve = AnimationCurve.Linear(0, 0, 1, 1);
[Header("Color Settings")]
[Tooltip("鍒濆棰滆壊鍜岄�忔槑搴�")]
diff --git a/Main/System/Battle/UIComp/BattleFloatingUIController.cs b/Main/System/Battle/UIComp/BattleFloatingUIController.cs
index a881ff4..64df818 100644
--- a/Main/System/Battle/UIComp/BattleFloatingUIController.cs
+++ b/Main/System/Battle/UIComp/BattleFloatingUIController.cs
@@ -270,8 +270,9 @@
{
float timeProgress = timer / config.scaleChangeTime;
- // 浣跨敤鏇茬嚎鏉ヨ皟鏁寸缉鏀炬彃鍊艰繘搴�
- float scaleProgress = config.scaleCurve.Evaluate(timeProgress);
+ // 鏍规嵁鏄惁鏆村嚮閫夋嫨瀵瑰簲鐨勭缉鏀炬洸绾�
+ AnimationCurve scaleCurve = isCritical ? config.critScaleCurve : config.normalScaleCurve;
+ float scaleProgress = scaleCurve.Evaluate(timeProgress);
Vector3 currentScale = Vector3.Lerp(GetBeginScale(), GetEndScale(), scaleProgress);
rectTransform.localScale = currentScale * scaleRatio;
--
Gitblit v1.8.0