From ae487b742c792c43b81cce6f060b881e5609d160 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 08 Dec 2020 11:48:26 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/UI/FinalPanel/FinalPanel.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
index a756e8e..14e3b1e 100644
--- a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
+++ b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
@@ -209,17 +209,18 @@
agentTweenSeq.Join(tsTiele.DOFade(1, 0.3f));
Image Image1 = transform.Find("Image1").GetComponent<Image>();
- agentTweenSeq.Append(Image1.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
- agentTweenSeq.Join(Image1.DOFade(1, 0.2f));
+ float imageTime = 0.3f;
+ agentTweenSeq.Append(Image1.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
+ agentTweenSeq.Join(Image1.DOFade(1, imageTime));
agentTweenSeq.Join(waveText.DOText(_waveInfo, 0.2f));
Image Image2 = transform.Find("Image2").GetComponent<Image>();
- agentTweenSeq.Append(Image2.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
- agentTweenSeq.Join(Image2.DOFade(1, 0.2f));
+ agentTweenSeq.Append(Image2.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
+ agentTweenSeq.Join(Image2.DOFade(1, imageTime));
Image Image3 = transform.Find("Image3").GetComponent<Image>();
- agentTweenSeq.Append(Image3.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
- agentTweenSeq.Join(Image3.DOFade(1, 0.2f));
+ agentTweenSeq.Append(Image3.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
+ agentTweenSeq.Join(Image3.DOFade(1, imageTime));
agentTweenSeq.Join(DOTween.To(delegate (float value)
{
var temp = Math.Floor(value);
@@ -292,7 +293,8 @@
bool goonFade;
private void ShowGoOnText()
{
- goonText.DOFade(goonFade ? 0 : 1, 0.5f).OnComplete(ShowGoOnText);
+ goonText.DOFade(goonFade ? 0 : 1, 0.8f).SetEase(Ease.InOutQuad).OnComplete(ShowGoOnText);
+ goonText.transform.DOScale(goonFade ? 0.9f : 1.1f, 0.8f);
goonFade = !goonFade;
}
--
Gitblit v1.9.1