From c98f521bd2f13cd8a9973b85644241ddff2282b9 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 09 Dec 2020 17:52:32 +0800
Subject: [PATCH] 打包
---
Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
index 20b0c90..553a0a0 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
@@ -30,14 +30,14 @@
public Text DoubleHitText;
- public GameObject OneTimeKillObj;
+ public Image OneTimeKillObj;
public Text OneTimeKillText;
/// <summary>
/// 连击的CD时间
/// </summary>
- private float doubleHitCD = 3f;
+ private float doubleHitCD = 0.8f;
private float remainTime;
@@ -67,7 +67,7 @@
private void Start()
{
Init();
- EventCenter.Ins.Add<Agent>((int)KTGMGemClient.EventType.EndlessAgentDead, AgentDead);
+ EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EndlessAgentDead, AgentDead);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.EndlessOneHit, OnHit);
EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, OnTimeKill);
canvasGroup = DoubleHit.GetComponent<CanvasGroup>();
@@ -82,25 +82,25 @@
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);
}
}
- private void AgentDead(Agent agent)
+ private void AgentDead(int point)
{
if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
- AddScore(agent.EnemyData.point);
+ AddScore(point);
}
// Update is called once per frame
@@ -127,23 +127,24 @@
++DoubleHitCount;
openDoubleHit = true;
DoubleHitText.text = $"{DoubleHitCount}";
- ShowDoubleHit();
+ if (DoubleHitCount >= 10)
+ ShowDoubleHit();
remainTime = doubleHitCD;
// 策划说先写死吧
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);
}
}
@@ -180,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