From df8c6633500f6c1c752f8a60025cda0e9909644c Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 17 Dec 2020 14:53:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/Guide/GuidePanelNew.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/Guide/GuidePanelNew.cs b/Assets/Scripts/Guide/GuidePanelNew.cs
index 8d4d214..acad04e 100644
--- a/Assets/Scripts/Guide/GuidePanelNew.cs
+++ b/Assets/Scripts/Guide/GuidePanelNew.cs
@@ -42,8 +42,10 @@
//ParticleSystem finishPS;
Button finishBtn;
Image finishImg;
+ Canvas skillCanvasGroup;
void Awake()
{
+
tmpMask = transform.GetComponent<Image>();
tipsUI = transform.Find("Tips").gameObject;
tipsUI.transform.SetAsLastSibling();//把tips放在最下面
@@ -345,7 +347,18 @@
StopShowDragPath(true);
}
-
+ /// <summary>
+ /// 关闭技能X1的显示优先级
+ /// </summary>
+ public void CloseSkillImage()
+ {
+ GameObject go1 = GameObject.Find("UICamera/BottomCanvas/Panel/Energy/FireSkillBg/SkillCount1");
+ if (go1 != null)
+ {
+ skillCanvasGroup = go1.GetComponent<Canvas>();
+ skillCanvasGroup.overrideSorting = false;
+ }
+ }
/// <summary>
/// 步骤3 ：对话---出兵后杀光---对话---展示火鸡
@@ -605,7 +618,6 @@
{
colorCount++;
warningImg.DOFade(colorCount % 2, 1.0f).OnComplete(SetWarningColor);
- CommonDebugHelper.Debug($"执行了{colorCount}次");
}
else
{
@@ -618,6 +630,8 @@
public void Step7Talk(string[] str, Action ac)
{
callBack = ac;
+ GameObject.Find("UICamera/MainUI/BloodUI").SetActive(false);
+
SetGuideUI(true);
StartShowWord(str, GuideEnergyUp);
}
@@ -629,7 +643,6 @@
/// </summary>
public void GuideEnergyUp()
{
- GameObject.Find("UICamera/MainUI/BloodUI").SetActive(false);
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuideEnergyUp, 100);
tmpMask.enabled = false;
@@ -678,6 +691,8 @@
public void FinishGuide()
{
+ if (skillCanvasGroup != null)
+ skillCanvasGroup.overrideSorting = true;
towerBuyBtn.gameObject.SetActive(true);
}
--
Gitblit v1.9.1