From 243d65af53aae9e3084f20ea9c5815f5b29df09e Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 26 Nov 2020 18:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs b/Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs
index a11cae1..9a6b69e 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs
@@ -55,7 +55,7 @@
GameObject psParent;
private void Start()
{
- if (psParent == null)
+ if (psParent == null && myPS != null)
{
psParent = myPS.transform.parent.gameObject;
}
@@ -122,12 +122,12 @@
{
DOTween.To(() => transform.localScale, (v) => transform.localScale = v, new Vector3(1f, 1f, 1f), 0.15f);
if (!psParent.activeSelf) psParent.SetActive(true);
- myPS.Play();
+ myPS?.Play();
}
else
{
DOTween.To(() => transform.localScale, (v) => transform.localScale = v, new Vector3(0.87f, 0.87f, 0.87f), 0.15f);
- myPS.Stop();
+ myPS?.Stop();
if (psParent.activeSelf) psParent.SetActive(false);
}
--
Gitblit v1.9.1