From 9969ed162f8aa4bd0b977a3c1eba45358eb01f72 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Wed, 25 Nov 2020 17:36:40 +0800
Subject: [PATCH] 修改推拽BUG 调整JSON读取回调 增加新手一大波怪物提示

---
 Assets/Scripts/Guide/GuidePanel.cs |   87 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/Assets/Scripts/Guide/GuidePanel.cs b/Assets/Scripts/Guide/GuidePanel.cs
index d9ba262..5acb9c0 100644
--- a/Assets/Scripts/Guide/GuidePanel.cs
+++ b/Assets/Scripts/Guide/GuidePanel.cs
@@ -49,6 +49,7 @@
     Button skillBtn;//
     Vector2 skillBtnPos = new Vector2(459, 280);
 
+    private Image warningImg;//大波敌人来袭提示
     /// <summary>
     /// 关闭所有UI
     /// </summary>
@@ -143,6 +144,9 @@
 
         dragHandImg = transform.Find("ImageHand").GetComponent<RectTransform>();
         dragHandImg.gameObject.SetActive(false);
+
+        warningImg = transform.Find("Image_Warning").GetComponent<Image>();
+        warningImg.gameObject.SetActive(false);
     }
 
 
@@ -346,7 +350,7 @@
 
 
     /// <summary>
-    /// 第九步,
+    /// 第九步,购买水元素,第二步上阵
     /// </summary>
     /// <param name="str"></param>
     /// <param name="currentIndex">当前第几步</param>
@@ -392,7 +396,7 @@
     }
 
     /// <summary>
-    /// 第12步,引导释放技能
+    /// 第12步,弃用
     /// </summary>
     public void Step11(int currentIndex, string str)
     {
@@ -430,7 +434,7 @@
 
 
     /// <summary>
-    /// 第12步,引导释放技能
+    /// 第12步,交换水火塔 
     /// </summary>
     public void Step11Drag(int currentIndex)
     {
@@ -447,8 +451,9 @@
             btnImg.raycastTarget = false;
 
             InitRectGuidance(btnImg, 75, 80, tmpOffect);
-            SetRimPos(towerPos2.gameObject);
-            StartCoroutine(ShowRimTip("拖动"));
+            //SetRimPos(towerPos2.gameObject);
+            SetRimPos(towerPos2.gameObject, new Vector2(0, 30));
+            StartCoroutine(ShowRimTip("交换"));
             ShowDragPath(towerPos2.GetComponent<RectTransform>().anchoredPosition, towerPos.GetComponent<RectTransform>());
 
         }
@@ -458,8 +463,10 @@
             btnImg.raycastTarget = false;
 
             InitRectGuidance(btnImg, 75, 80, tmpOffect);
-            SetRimPos(towerPos.gameObject);
-            StartCoroutine(ShowRimTip("拖动"));
+            //SetRimPos(towerPos.gameObject);
+            SetRimPos(towerPos.gameObject, new Vector2(0, 10));
+
+            StartCoroutine(ShowRimTip("交换"));
 
         }
         else if (currentIndex == 2)
@@ -467,6 +474,33 @@
             SetRimActive(false);
             StopShowDragPath(true);
             CloseMask();
+        }
+    }
+
+    /// <summary>
+    /// 一大波敌人
+    /// </summary>
+    public void Step11_End()
+    {
+        warningImg.color = new Color(1.0f, 1.0f, 1.0f, 0);
+        warningImg.gameObject.SetActive(true);
+        colorCount = 0;
+        SetWarningColor();
+    }
+
+    int colorCount = 0;
+    private void SetWarningColor()
+    {
+        if (colorCount < 4)
+        {
+            colorCount++;
+            warningImg.DOFade(colorCount % 2, 1.0f).OnComplete(SetWarningColor);
+            CommonDebugHelper.Debug($"执行了{colorCount}次");
+        }
+        else
+        {
+            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateThirdWave);
+            warningImg.gameObject.SetActive(false);
         }
     }
 
@@ -490,7 +524,9 @@
         AddButtonListener(skillBtn.gameObject, ac);
         Image btnImg = skillBtn.GetComponent<Image>();
         InitRectGuidance(btnImg, 79, 79f, Vector2.one);
-        SetRimPos(skillBtn.gameObject);
+        //SetRimPos(skillBtn.gameObject);
+        SetRimPos(skillBtn.gameObject, new Vector2(-15, 10));
+
         text_Tip.text = str;//动态改变长度
         StartCoroutine(ShowRimTip(str));
     }
@@ -554,6 +590,41 @@
 
     }
 
+    /// <summary>
+    /// 设置边框的大小和位置
+    /// </summary>
+    /// <param name="target"></param>
+    private void SetRimPos(GameObject target, Vector2 offect)
+    {
+        SetRimActive(true);
+        RectTransform rt = target.GetComponent<RectTransform>();
+        if (target.gameObject.name == "TowerBuyBtn")
+        {
+            image_Rim_Rect.anchoredPosition = towerBuyBtnPos - tmpOffect;
+        }
+        else if (target.gameObject.name == "FireSkillBtn")
+        {
+            image_Rim_Rect.anchoredPosition = skillBtnPos - tmpOffect;
+        }
+        else
+        {
+            image_Rim_Rect.anchoredPosition = rt.anchoredPosition;
+        }
+        image_Rim_Rect.sizeDelta = (rt.sizeDelta * rt.localScale) + rimOffset;
+        if (image_Rim_Rect.sizeDelta.x > 200)
+        {
+            particle_1.SetActive(false);
+            particle_2.SetActive(true);
+        }
+        else
+        {
+            particle_1.SetActive(true);
+            particle_2.SetActive(false);
+        }
+        image_Tip_Rect.anchoredPosition = new Vector2(image_Rim_Rect.anchoredPosition.x, image_Rim_Rect.anchoredPosition.y + 74 / 2 + image_Rim_Rect.sizeDelta.y / 2);
+        image_Tip_Rect.anchoredPosition += offect;
+    }
+
     IEnumerator ShowRimTip(string str)
     {
         text_Tip.text = str;//动态改变长度

--
Gitblit v1.9.1