From f79f61b93d8061d89dde18063526e417ffc409d2 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 27 Oct 2020 13:54:15 +0800
Subject: [PATCH] 简单修改新手引导

---
 Assets/Scripts/Guide/GuidePanel.cs |   53 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/Assets/Scripts/Guide/GuidePanel.cs b/Assets/Scripts/Guide/GuidePanel.cs
index d5b1744..7af2a97 100644
--- a/Assets/Scripts/Guide/GuidePanel.cs
+++ b/Assets/Scripts/Guide/GuidePanel.cs
@@ -57,8 +57,9 @@
     void Awake()
     {
         tmpMask = GetComponent<Image>();
+        tmpMask.enabled = false;
         backgroundImg = transform.Find("Button").GetComponent<Image>();
-        backgroundImg.color = new Color(1.0f, 1.0f, 1.0f, 0);
+
         towerBuyBtn = GameObject.Find("MainUI/TowerBuyBtn");
         tipsUI = transform.Find("Tips").gameObject;
         tipsUI.transform.SetAsLastSibling();//把tips放在最下面
@@ -111,8 +112,10 @@
     /// <param name="active"></param>
     public void SetGuideUI(bool active)
     {
-        if (backgroundImg.raycastTarget != active) backgroundImg.raycastTarget = active;
-        tipsUI.SetActive(active);
+        if (backgroundImg.enabled != active)
+            backgroundImg.enabled = active;
+        if (tipsUI.activeSelf != active)
+            tipsUI.SetActive(active);
     }
 
     //开始打印文字
@@ -143,7 +146,7 @@
             SetRimActive(true);
             AddButtonListener(towerBuyBtn, ac);
             Image btnImg = towerBuyBtn.GetComponent<Image>();
-            InitRectGuidance(btnImg);
+            InitRectGuidance(btnImg, 189, 73.5f);
             SetRimPos(towerBuyBtn);
             maskObj.ShowImmediately();
 
@@ -171,6 +174,8 @@
     {
         fire2.gameObject.SetActive(true);
         fire2.enabled = false;
+        DestoryButtonListener(towerBuyBtn);
+        //RemoveButtonListener(towerBuyBtn);
     }
 
     /// <summary>
@@ -180,9 +185,7 @@
     public void Step2(int currentIndex)
     {
         backgroundImg.raycastTarget = true;
-
-        RemoveButtonListener(towerBuyBtn);
-
+        //RemoveButtonListener(towerBuyBtn);
         SetRimActive(false);
         CloseMask();
     }
@@ -194,8 +197,8 @@
     {
         if (currentIndex == 0)
         {
-            backgroundImg.raycastTarget = false;
-            backgroundImg.color = new Color(1.0f, 1.0f, 1.0f, 1.0f);
+            tmpMask.enabled = true;
+
             SetGuideUI(false);
 
             SetRimPos(fire2.gameObject);
@@ -219,10 +222,12 @@
     {
         if (currentIndex == 0)
         {
+            tmpMask.enabled = false;
+
             SetRimActive(true);
             Image btnImg = transform.Find("Image_TowerPos").GetComponent<Image>();
             towerPos.enabled = true;
-            InitRectGuidance(btnImg);
+            InitRectGuidance(btnImg, 75, 80);
             SetRimPos(btnImg.gameObject);
             maskObj.ShowImmediately();
             StartCoroutine(ShowRimTip(str));
@@ -238,7 +243,7 @@
         {
             CloseMask();
             SetRimActive(false);
-            backgroundImg.color = new Color(1.0f, 1.0f, 1.0f, 0);
+
         }
     }
 
@@ -254,7 +259,7 @@
             GameObject go = transform.Find("Image_TowerPos2").gameObject;
 
             Image btnImg = go.GetComponent<Image>();
-            InitRectGuidance(btnImg);
+            InitRectGuidance(btnImg, 75, 80);
             SetRimPos(go);
             maskObj.ShowImmediately();
             StartCoroutine(ShowRimTip(str));
@@ -264,7 +269,6 @@
     //介绍水元素
     public void Step8()
     {
-        backgroundImg.color = new Color(1.0f, 1.0f, 1.0f, 0);
         SetGuideUI(true);
         SetRimActive(false);
         CloseMask();
@@ -285,7 +289,7 @@
             AddButtonListener(towerBuyBtn, ac);
 
             Image btnImg = towerBuyBtn.GetComponent<Image>();
-            InitRectGuidance(btnImg);
+            InitRectGuidance(btnImg, 189, 73.5f);
             SetRimPos(towerBuyBtn);
             maskObj.ShowImmediately();
         }
@@ -293,7 +297,7 @@
         {
             GameObject go = transform.Find("Image_TowerPos2").gameObject;
             Image btnImg = go.GetComponent<Image>();
-            InitRectGuidance(btnImg);
+            InitRectGuidance(btnImg, 75, 80);
             SetRimPos(go);
             maskObj.ShowImmediately();
         }
@@ -303,9 +307,9 @@
 
     public void Step9_1()
     {
-        RemoveButtonListener(towerBuyBtn);
         water1.gameObject.SetActive(true);
         towerPos2.enabled = true;
+        DestoryButtonListener(towerBuyBtn);
     }
 
 
@@ -326,6 +330,8 @@
     {
         if (currentIndex == 0)
         {
+            tmpMask.enabled = true;
+
             SetGuideUI(false);
             SetRimActive(true);
             SetRimPos(skill.gameObject);
@@ -342,6 +348,7 @@
     public void Step12()
     {
         image_SkillRim.gameObject.SetActive(false);
+        tmpMask.enabled = false;
 
         SetGuideUI(true);
         SetRimActive(false);
@@ -399,13 +406,15 @@
     /// 抠出来一个区域
     /// </summary>
     /// <param name="target"></param>
-    void InitRectGuidance(Image target)
+    void InitRectGuidance(Image target, float x, float y)
     {
         if (!maskObj.gameObject.activeSelf)
         {
             maskObj.gameObject.SetActive(true);
         }
-        maskObj.Init(target);
+        //maskObj.Init(target);
+        maskObj.InitForCamera(target, x, y);
+
     }
 
     /// <summary>
@@ -439,6 +448,14 @@
         eventTriggerListener.RemoveListener(go);
     }
 
+    private void DestoryButtonListener(GameObject go)
+    {
+        EventTriggerListener eventTriggerListener = EventTriggerListener.GetListener(go);
+
+        if (eventTriggerListener != null)
+            Destroy(eventTriggerListener);
+    }
+
     #endregion
 
 

--
Gitblit v1.9.1