From fac697773b8cb65b3ab54569413e15fca03ad1d7 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 20:21:14 +0800
Subject: [PATCH] Merge commit '31f0c1761b37dfd47408a93df9ed18468b50ef40' into master
---
Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
index d2a300e..553a0a0 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
@@ -30,7 +30,7 @@
public Text DoubleHitText;
- public GameObject OneTimeKillObj;
+ public Image OneTimeKillObj;
public Text OneTimeKillText;
@@ -82,17 +82,17 @@
Debug.Log($"--------------------- 一次性击杀个数：{count} ---------------------");
if (count >= 10)
{
- AddScore(500);
+ AddScore(0);
ShowOneTimeKill(10, 500);
}
else if (count >= 8)
{
- AddScore(200);
+ AddScore(0);
ShowOneTimeKill(8, 200);
}
else if (count >= 5)
{
- AddScore(100);
+ AddScore(0);
ShowOneTimeKill(5, 100);
}
}
@@ -134,17 +134,17 @@
// 策划说先写死吧
if (DoubleHitCount == 50)
{
- AddScore(200);
+ AddScore(0);
FloatDoubleHitReward(200);
}
else if (DoubleHitCount == 100)
{
- AddScore(500);
+ AddScore(0);
FloatDoubleHitReward(500);
}
else if (DoubleHitCount == 200)
{
- AddScore(1500);
+ AddScore(0);
FloatDoubleHitReward(1500);
}
}
@@ -181,18 +181,10 @@
/// <param name="score"></param>
private void ShowOneTimeKill(int count, int score)
{
- // OneTimeKillText.text = $"{count}连杀 +{score}";
- // OneTimeKillObj.transform.localScale = Vector3.zero;
- // OneTimeKillObj.SetActive(true);
- // CanvasGroup cg = OneTimeKillObj.GetComponent<CanvasGroup>();
- // DOTween.To(() => OneTimeKillObj.transform.localScale, (Vector3 v) => OneTimeKillObj.transform.localScale = v, Vector3.one, 0.2f);
- // Tween t1 = DOTween.To(() => cg.alpha, (float v) => cg.alpha = v, 0f, 0.2f).SetDelay(2f);
- // t1.OnComplete(OnShowOneTimeKillComplete);
- }
-
- private void OnShowOneTimeKillComplete()
- {
- OneTimeKillObj.SetActive(false);
+ Image obj = Instantiate(OneTimeKillObj);
+ obj.transform.SetParent(GameObject.Find("Panel").transform, false);
+ obj.sprite = Resources.Load<Sprite>($"UI/DoubleHit/hit_{count}");
+ Destroy(obj.gameObject, 2.05f);
}
/// <summary>
--
Gitblit v1.9.1