From ae487b742c792c43b81cce6f060b881e5609d160 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 08 Dec 2020 11:48:26 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Guide/GuidePanelNew.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/Assets/Scripts/Guide/GuidePanelNew.cs b/Assets/Scripts/Guide/GuidePanelNew.cs
index e146cf5..91d8be3 100644
--- a/Assets/Scripts/Guide/GuidePanelNew.cs
+++ b/Assets/Scripts/Guide/GuidePanelNew.cs
@@ -140,6 +140,7 @@
skillBtn.interactable = false;
finishPS = transform.Find("Effect_UI_YinDaoJieShu/Particle System (3)").GetComponent<ParticleSystem>();
+ towerBuyBtn.gameObject.SetActive(false);
}
@@ -186,6 +187,8 @@
{
//关闭对话框
SetGuideUI(false);
+ towerBuyBtn.gameObject.SetActive(true);
+
//开箱
boxPanel.ChangeType(GuideBoxType.Wood, Step1Finish);
}
@@ -217,6 +220,7 @@
{
strArray = str;
tmpMask.enabled = false;
+
AddButtonListener(towerBuyBtn, Step2_1);
Image btnImg = towerBuyBtn.GetComponent<Image>();
InitRectGuidance(btnImg, 159, 73.5f, Vector2.one);
@@ -268,6 +272,8 @@
wood2PS2.Play();
//fire2.enabled = false;
DestoryButtonListener(towerBuyBtn);
+ towerBuyBtn.gameObject.SetActive(false);
+
SetRimActive(false);
CloseGuidance();
tmpMask.enabled = true;
@@ -355,6 +361,8 @@
{
//关闭对话框
SetGuideUI(false);
+ towerBuyBtn.gameObject.SetActive(true);
+
//开箱
boxPanel.ChangeType(GuideBoxType.Fire, cb);
}
@@ -394,6 +402,8 @@
firePS1.Play();
firePS1.Play();
RemoveButtonListener(towerBuyBtn);
+ towerBuyBtn.gameObject.SetActive(false);
+
Step4_2();
}
}
@@ -502,6 +512,8 @@
{
//关闭对话框
SetGuideUI(false);
+ towerBuyBtn.gameObject.SetActive(true);
+
//开箱
boxPanel.ChangeType(GuideBoxType.Water, cb);
}
@@ -541,6 +553,8 @@
waterPS1.Play();
waterPS2.Play();
RemoveButtonListener(towerBuyBtn);
+ towerBuyBtn.gameObject.SetActive(false);
+
Step6_2();
}
}
--
Gitblit v1.9.1