From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
index 96b418d..1cd087c 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
@@ -30,10 +30,14 @@
/// </summary>
public List<GameObject> HeartList;
+ public Text hpTxt;
+ public ParticleSystem ps;
+
// Start is called before the first frame update
private void Start()
{
CurrentHP = TotalHP = HeartList.Count;
+ hpTxt.text = "x" + CurrentHP.ToString();
EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EndlessLoseHeart, LoseHeart);
}
@@ -51,26 +55,29 @@
{
if (CurrentHP == 0) return;
- int preHP = CurrentHP;
- int i = TotalHP - CurrentHP;
CurrentHP = Mathf.Max(0, CurrentHP - count);
- int num = preHP - CurrentHP;
- int end = i + num;
+ // int preHP = CurrentHP;
+ // int i = TotalHP - CurrentHP;
+ // int num = preHP - CurrentHP;
+ // int end = i + num;
- while (i < end)
- {
- Image img = HeartList[i].GetComponent<Image>();
- Color c = img.color;
- c.a = 0.17f;
- img.color = c;
+ // while (i < end)
+ // {
+ // Image img = HeartList[i].GetComponent<Image>();
+ // Color c = img.color;
+ // c.a = 0.17f;
+ // img.color = c;
- GameObject psObj = HeartList[i].transform.GetChild(0).gameObject;
- ParticleSystem ps = psObj.transform.GetChild(0).GetComponent<ParticleSystem>();
- ps.Play();
- ++i;
- }
+ // GameObject psObj = HeartList[i].transform.GetChild(0).gameObject;
+ // ParticleSystem ps = psObj.transform.GetChild(0).GetComponent<ParticleSystem>();
+ // ps.Play();
+ // ++i;
+ // }
- ViewPortAdj.instance.cachedCamera.DOShakePosition(0.25f, 1.5f, 4);
+ hpTxt.text = "x" + CurrentHP.ToString();
+ //ps.Play();
+
+ ViewPortAdj.instance.cachedCamera.DOShakePosition(0.25f, 1.5f, 4);//这里只可以震动3D场景中的东西
MMVibrationManager.Haptic(HapticTypes.HeavyImpact);
if (CurrentHP == 0)
--
Gitblit v1.9.1