From 7fcfe2b029ffad2c35630d411d283c95ada7df5f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 09 Dec 2020 17:43:15 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/TextMoveDoTween.cs | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/TextMoveDoTween.cs b/Assets/Scripts/TowerDefense/UI/TextMoveDoTween.cs
index 268a687..92b7b65 100644
--- a/Assets/Scripts/TowerDefense/UI/TextMoveDoTween.cs
+++ b/Assets/Scripts/TowerDefense/UI/TextMoveDoTween.cs
@@ -12,6 +12,10 @@
public Image CritWord;
+ public Image FrostWord;
+
+ public Image RestrainWord;
+
private float scaleOffect = 1.5f;
/// <summary>
@@ -92,6 +96,40 @@
sequence.AppendCallback(() => { DestroyWord(); });
}
+ public void FloatFrostWord(float x, float y)
+ {
+ Vector3 pos = FrostWord.transform.position;
+ pos.x = x;
+ pos.y = y;
+ pos.z = 0;
+ FrostWord.transform.position = pos;
+
+ Sequence sequence = DOTween.Sequence();
+ FrostWord.color = new Color(1f, 1f, 1f, 0.8f);
+ sequence.Join(DOTween.To(() => FrostWord.transform.position, (Vector3 v) => FrostWord.transform.position = v,
+ new Vector3(FrostWord.transform.position.x - 50, FrostWord.transform.position.y + 50, FrostWord.transform.position.z), 0.2f));
+ sequence.Append(DOTween.To(() => FrostWord.color, (Color v) => FrostWord.color = v, new Color(1f, 1f, 1f, 1f), 0.2f).SetEase(Ease.OutQuart));
+ sequence.Append(DOTween.To(() => FrostWord.color, (Color v) => FrostWord.color = v, new Color(1f, 1f, 1f, 0f), 0.3f).SetDelay(1f));
+ sequence.AppendCallback(() => { DestroyWord(); });
+ }
+
+ public void FloatRestrainWord(float x, float y)
+ {
+ Vector3 pos = RestrainWord.transform.position;
+ pos.x = x;
+ pos.y = y;
+ pos.z = 0;
+ RestrainWord.transform.position = pos;
+
+ Sequence sequence = DOTween.Sequence();
+ RestrainWord.color = new Color(1f, 1f, 1f, 0.8f);
+ sequence.Join(DOTween.To(() => RestrainWord.transform.position, (Vector3 v) => RestrainWord.transform.position = v,
+ new Vector3(RestrainWord.transform.position.x - 50 + UnityEngine.Random.Range(-15, 15), RestrainWord.transform.position.y + 50 + UnityEngine.Random.Range(-15, 15), RestrainWord.transform.position.z), 0.2f));
+ sequence.Append(DOTween.To(() => RestrainWord.color, (Color v) => RestrainWord.color = v, new Color(1f, 1f, 1f, 1f), 0.2f).SetEase(Ease.OutQuart));
+ sequence.Append(DOTween.To(() => RestrainWord.color, (Color v) => RestrainWord.color = v, new Color(1f, 1f, 1f, 0f), 0.3f).SetDelay(1f));
+ sequence.AppendCallback(() => { DestroyWord(); });
+ }
+
private void WordMove(Graphic graphic, bool crit = false)
{
//获得Text的rectTransform，和颜色，并设置颜色微透明
--
Gitblit v1.9.1