From df178fec76b6f6fed0326ff9f07bef2206dd75f9 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 04 Dec 2020 18:11:17 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Guide/GuidePanelNew.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/Guide/GuidePanelNew.cs b/Assets/Scripts/Guide/GuidePanelNew.cs
index fc88ffd..3f45779 100644
--- a/Assets/Scripts/Guide/GuidePanelNew.cs
+++ b/Assets/Scripts/Guide/GuidePanelNew.cs
@@ -603,6 +603,7 @@
/// </summary>
public void GuideEnergyUp()
{
+ GameObject.Find("UICamera/MainUI/BloodUI").SetActive(false);
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuideEnergyUp, 100);
tmpMask.enabled = false;
@@ -619,15 +620,23 @@
public void SkillRelease(string[] str, Action ac)
{
+ GameObject.Find("UICamera/MainUI/BloodUI").SetActive(true);
+
RemoveButtonListener(skillBtn.gameObject);
SetRimActive(false);
CloseGuidance();
SetGuideUI(true);
- StartShowWord(str, ac);
- finishPS.Play();
+ //StartShowWord(str, ac);
+
+ charForeach.StartFinalShowWord(str, ac, () =>
+ {
+ finishPS.Play();
+ });
+
}
+
public void FinishGuide()
{
towerBuyBtn.gameObject.SetActive(true);
--
Gitblit v1.9.1