From 3b2a6bb9047cfce9f501593b3669a9c1af6c5df4 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 05 十一月 2025 17:40:23 +0800
Subject: [PATCH] 130 战斗修改回合样式
---
Main/System/Tip/PowerAddWin.cs | 86 ++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 58 deletions(-)
diff --git a/Main/System/Tip/PowerAddWin.cs b/Main/System/Tip/PowerAddWin.cs
index 3b046a6..3bd2e58 100644
--- a/Main/System/Tip/PowerAddWin.cs
+++ b/Main/System/Tip/PowerAddWin.cs
@@ -9,26 +9,16 @@
{
[SerializeField] TextEx txtBase; //鎻愬崌鎴栭檷浣庡墠鐨勬垬鏂楀姏
[SerializeField] TextEx txtChange; //鎴樻枟鍔涘彉鍖栦簡澶氬皯
+ [SerializeField] List<Font> changeFonts; //鎴樺姏鍙樺寲鐨勫瓧浣�
[SerializeField] ImageEx imgArrow; //绠ご
[SerializeField] Transform transZhanLi; //鎴樺姏鏁翠綋妗�
[SerializeField] Transform transZhanLiNumAll; //鎴樺姏鎵�鏈夊彉鍖栭儴鍒�
[SerializeField] RectTransform transChange; //绠ご鍜屽彉鍖栨暟瀛楁暣浣撴
string uiFrameKey = "zhanli_dt";
[SerializeField] UIFrame uiFrame;
- [SerializeField] List<PowerUpPosition> powerUpPositions;
+ //[SerializeField] List<PowerUpPosition> powerUpPositions;
- [Header("娣″叆鍙樺ぇ")]
- [SerializeField] Vector3 startVector; //璧峰澶у皬
-
- [SerializeField] float fadeInToBigDuration; //娣″叆鍙樺ぇ鍔ㄧ敾瀹屾垚鏃堕棿
- [SerializeField] Ease fadeInToBigEaseType;
- [SerializeField] Vector3 fadeInToBigVector; //娣″叆鍙樺ぇ鐩爣澶у皬
-
- [Header("娣″叆鍙樺皬")]
- [SerializeField] Vector3 fadeInToSmallVector; //娣″叆鍙樺皬鐩爣澶у皬
-
- [SerializeField] float fadeInToSmallDuration; //娣″叆鍙樺皬鍔ㄧ敾瀹屾垚鏃堕棿
- [SerializeField] Ease fadeInToSmallEaseType;
+
[Header("娣″叆鍚庣Щ鍔ㄥ紑濮嬪墠绛夊緟鏃堕棿/s")]
[SerializeField] float moveStartWaitTime;
@@ -52,17 +42,7 @@
[Header("绉诲姩缁撴潫鍚庢贰鍑哄紑濮嬪墠绛夊緟鏃堕棿/s")]
[SerializeField] float moveEndWaitTime;
- [Header("娣″嚭鍙樺ぇ")]
- [SerializeField] Vector3 fadeOutToBigVector; //娣″嚭鍙樺ぇ鐩爣澶у皬
-
- [SerializeField] float fadeOutToBigDuration; //娣″嚭鍙樺ぇ鍔ㄧ敾瀹屾垚鏃堕棿
- [SerializeField] Ease fadeOutToBigEaseType;
-
- [Header("娣″嚭鍙樺皬")]
- [SerializeField] float fadeOutToSmallDuration; //娣″嚭鍙樺皬鍔ㄧ敾瀹屾垚鏃堕棿
-
- [SerializeField] Ease fadeOutToSmallEaseType;
-
+
[Header("鎴樺姏鏁板瓧浣嶇疆璁＄畻鐩稿叧")]
[SerializeField] float txtBaseMultiple; //鍓嶇疆鐨勬垬鍔涙暟瀛楀瓧姣嶈窛绂诲�嶆暟
@@ -107,7 +87,15 @@
PlayerMainDate.Instance.AddPowerEvent -= ResetToWaitMove;
}
+ protected override void OnOpenAnimationComplete()
+ {
+ fadeInEndTime = Time.time;
+ nowState = AnimeState.WaitMove;
+ uiFrame.SetActive(true);
+ uiFrame.SetLoopCount(1);
+ uiFrame.ResetFrame(uiFrameKey);
+ }
#endregion
@@ -124,7 +112,7 @@
nowState = AnimeState.Move;
sequence = DOTween.Sequence();
- sequence.Join(transChange.DOMove(new Vector3(txtBase.rectTransform.position.x, transChange.position.y, transChange.position.z) , moveDuration).SetEase(moveEaseType));
+ sequence.Join(transChange.DOMove(new Vector3(txtBase.rectTransform.position.x, transChange.position.y, transChange.position.z), moveDuration).SetEase(moveEaseType));
sequence.Join(txtChange.DOFade(0f, textFadeDuration).SetEase(textFadeEaseType));
sequence.Join(imgArrow.DOFade(0f, textFadeDuration).SetEase(textFadeEaseType));
@@ -152,9 +140,9 @@
sequence.Append(txtBase.DOText(DisplayBasePowerNum(nowValue), rollTime).SetEase(rollEaseType).OnComplete(() => { SetInitPosition(nowValue, changePower, isAdd); }));
}
}
-#if UNITY_EDITOR
- Debug.Log($"count {i} changeValue {changeValue} nowValue {nowValue} isAdd {isAdd} basePower {basePower} changePower {changePower} nowPower {nowPower} rollTime {rollTime}");
-#endif
+// #if UNITY_EDITOR
+// Debug.Log($"count {i} changeValue {changeValue} nowValue {nowValue} isAdd {isAdd} basePower {basePower} changePower {changePower} nowPower {nowPower} rollTime {rollTime}");
+// #endif
}
sequence.Join(textChangeSequence);
@@ -167,14 +155,9 @@
}
else if (nowState == AnimeState.WaitFadeOut)
{
- if (Time.time - moveEndTime > moveEndWaitTime)
- {
- nowState = AnimeState.FadeOut;
- fadeOutSequence = DOTween.Sequence();
- fadeOutSequence.Append(transZhanLi.DOScale(fadeOutToBigVector, fadeOutToBigDuration).SetEase(fadeOutToBigEaseType));
- fadeOutSequence.Append(transZhanLi.DOScale(startVector, fadeOutToSmallDuration).SetEase(fadeOutToSmallEaseType).OnComplete(CloseWindow));
- }
+ CloseWindow();
}
+
}
private void ResetToFadeIn()
@@ -185,25 +168,12 @@
uiFrame.SetActive(false);
fadeInEndTime = 0;
moveEndTime = 0;
- transZhanLi.transform.localScale = startVector;
CheckPosition();
SetNum();
SetInitPosition(basePower, changePower, isAdd);
ResetColorA();
DisplayNum();
nowState = AnimeState.FadeIn;
- transZhanLi.DOScale(fadeInToBigVector, fadeInToBigDuration).SetEase(fadeInToBigEaseType).OnComplete(() =>
- {
- transZhanLi.DOScale(fadeInToSmallVector, fadeInToSmallDuration).SetEase(fadeInToSmallEaseType).OnComplete(() =>
- {
- fadeInEndTime = Time.time;
- nowState = AnimeState.WaitMove;
-
- uiFrame.SetActive(true);
- uiFrame.SetLoopCount(1);
- uiFrame.ResetFrame(uiFrameKey);
- });
- });
}
private void ResetToWaitMove()
@@ -214,7 +184,6 @@
uiFrame.SetActive(false);
fadeInEndTime = Time.time;
moveEndTime = 0;
- transZhanLi.transform.localScale = fadeInToSmallVector;
SetNum();
SetInitPosition(basePower, changePower, isAdd);
ResetColorA();
@@ -294,6 +263,7 @@
{
txtBase.text = DisplayBasePowerNum(basePower);
txtChange.text = DisplayChangePowerNum(isAdd, changePower);
+ txtChange.font = changeFonts[isAdd ? 0 : 1];
imgArrow.SetSprite(DisplayState(isAdd));
}
@@ -340,16 +310,16 @@
private void CheckPosition()
{
- var type = WindowType.None;
+ // var type = WindowType.None;
- var _index = powerUpPositions.FindIndex((x) =>
- {
- return x.windowType == type;
- });
- if (_index != -1)
- {
- transZhanLi.transform.localPosition = powerUpPositions[_index].position;
- }
+ // var _index = powerUpPositions.FindIndex((x) =>
+ // {
+ // return x.windowType == type;
+ // });
+ // if (_index != -1)
+ // {
+ // transZhanLi.transform.localPosition = powerUpPositions[_index].position;
+ // }
}
[Serializable]
--
Gitblit v1.8.0