From c49c0e39e4c11a438014a0b0732ecf0968fceb5e Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 27 Nov 2020 20:58:36 +0800
Subject: [PATCH] 出二级宝石的时间不对的bug

---
 Assets/Scripts/Guide/GuidePanel.cs |  264 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 230 insertions(+), 34 deletions(-)

diff --git a/Assets/Scripts/Guide/GuidePanel.cs b/Assets/Scripts/Guide/GuidePanel.cs
index fa756b2..b9eba13 100644
--- a/Assets/Scripts/Guide/GuidePanel.cs
+++ b/Assets/Scripts/Guide/GuidePanel.cs
@@ -31,9 +31,14 @@
     Image tmpMask;//自身的遮罩
     GameObject offectBackground;//适配需要的黑色背景
     ImageFire1 fire1;
-    ImageFire2 fire2;//两个用来合成的火元素
+    ParticleSystem fire1PS1, fire1PS2;//出现的特效
 
-    ImageWater water1;
+    ImageFire2 fire2;//两个用来合成的火元素
+    ParticleSystem fire2PS1, fire2PS2;
+
+    ImageWater wood1;
+
+    ParticleSystem woodPS1, woodPS2;
 
     ImageSkill skill;
 
@@ -45,6 +50,11 @@
     Image backgroundImg;//用来接受空白点击事件的图片
 
     RectTransform dragHandImg;//拖动标识手指
+
+    Button skillBtn;//
+    Vector2 skillBtnPos = new Vector2(459, 44.6f);
+
+    private Image warningImg;//大波敌人来袭提示
     /// <summary>
     /// 关闭所有UI
     /// </summary>
@@ -66,12 +76,14 @@
 
         backgroundImg = transform.Find("Button").GetComponent<Image>();
 
+        skillBtn = GameObject.Find("UICamera/BottomCanvas/Panel/Energy/FireSkillBg/SkillBtn").GetComponent<Button>();
+        skillBtn.interactable = false;
         towerBuyBtn = GameObject.Find("UICamera/BottomCanvas/Panel/TowerBuyBtn");
         RectTransform tmpTs = towerBuyBtn.GetComponent<RectTransform>();
 
         RectTransform canvasUI = transform.parent.parent.GetComponent<RectTransform>();
         float tmpOffect = tmpTs.anchoredPosition.y - (canvasUI.sizeDelta.y * 0.5f);
-        towerBuyBtnPos = new Vector2(215, tmpOffect);
+        towerBuyBtnPos = new Vector2(tmpTs.anchoredPosition.x, tmpOffect);
 
         tipsUI = transform.Find("Tips").gameObject;
         tipsUI.transform.SetAsLastSibling();//把tips放在最下面
@@ -110,8 +122,13 @@
 
         fire1 = transform.Find("Image_Fire1").GetComponent<ImageFire1>();
         fire1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+        fire1PS1 = fire1.transform.Find("Huo/Particle System").GetComponent<ParticleSystem>();
+        fire1PS2 = fire1.transform.Find("Huo_02/Particle System").GetComponent<ParticleSystem>();
+
         fire2 = transform.Find("Image_Fire2").GetComponent<ImageFire2>();
         fire2.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+        fire2PS1 = fire2.transform.Find("Huo/Particle System").GetComponent<ParticleSystem>();
+        fire2PS2 = fire2.transform.Find("Huo_02/Particle System").GetComponent<ParticleSystem>();
 
         fire1.gameObject.SetActive(false);
         fire2.gameObject.SetActive(false);
@@ -126,9 +143,12 @@
 
         towerPos2.enabled = false;
 
-        water1 = transform.Find("Image_Water").GetComponent<ImageWater>();
-        water1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
-        water1.gameObject.SetActive(false);
+        wood1 = transform.Find("Image_Wood").GetComponent<ImageWater>();
+        wood1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+        woodPS1 = wood1.transform.Find("Mu/Particle System").GetComponent<ParticleSystem>();
+        woodPS2 = wood1.transform.Find("Mu_02/Particle System").GetComponent<ParticleSystem>();
+
+        wood1.gameObject.SetActive(false);
 
         skill = transform.Find("Image_Skill").GetComponent<ImageSkill>();
         skill.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
@@ -137,8 +157,32 @@
 
         dragHandImg = transform.Find("ImageHand").GetComponent<RectTransform>();
         dragHandImg.gameObject.SetActive(false);
+
+        warningImg = transform.Find("Image_Warning").GetComponent<Image>();
+        warningImg.gameObject.SetActive(false);
     }
 
+
+    private Vector2 tmpOffect;
+
+    /// <summary>
+    /// Start is called on the frame when a script is enabled just before
+    /// any of the Update methods is called the first time.
+    /// </summary>
+    void Start()
+    {
+        tmpOffect = GetComponent<RectTransform>().offsetMin;
+        tmpOffect = new Vector2(tmpOffect.x, tmpOffect.y * 0.5f);
+
+        image_SkillRim.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
+        fire1.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
+        fire2.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
+        towerPos.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
+        towerPos2.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
+        wood1.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
+        skill.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
+
+    }
     /// <summary>
     /// 设置引导框
     /// </summary>
@@ -172,14 +216,13 @@
     /// <param name="currentIndex">当前第几步</param>
     public void Step1(string str, int currentIndex, Action ac)
     {
-
         if (currentIndex == 0)
         {
             backgroundImg.raycastTarget = false;
             SetRimActive(true);
             AddButtonListener(towerBuyBtn, ac);
             Image btnImg = towerBuyBtn.GetComponent<Image>();
-            InitRectGuidance(btnImg, 159, 73.5f);
+            InitRectGuidance(btnImg, 159, 73.5f, Vector2.one);
             SetRimPos(towerBuyBtn);
             //maskObj.ShowImmediately();
 
@@ -191,7 +234,6 @@
         }
         text_Tip.text = str;//动态改变长度
         StartCoroutine(ShowRimTip(str));
-
     }
 
     public void Step1_1()
@@ -201,18 +243,22 @@
             fire1.gameObject.SetActive(true);
             fire1.transform.Find("Image_2").gameObject.SetActive(false);
             fire1.enabled = false;
+            fire1PS1.Play();
+            fire1PS2.Play();
 
-            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire1.transform.position);
+            //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire1.transform.position);
         }
     }
     public void Step1_2()
     {
         fire2.gameObject.SetActive(true);
+        fire2PS1.Play();
+        fire2PS2.Play();
         fire2.enabled = false;
         DestoryButtonListener(towerBuyBtn);
         SetRimActive(false);
         CloseMask();
-        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire2.transform.position);
+        //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire2.transform.position);
 
         //RemoveButtonListener(towerBuyBtn);
     }
@@ -269,7 +315,7 @@
             SetRimActive(true);
             Image btnImg = transform.Find("Image_TowerPos").GetComponent<Image>();
             towerPos.enabled = true;
-            InitRectGuidance(btnImg, 75, 80);
+            InitRectGuidance(btnImg, 75, 80, tmpOffect);
             SetRimPos(btnImg.gameObject);
             //maskObj.ShowImmediately();
             ShowDragPath(fire1.GetStartP, btnImg.rectTransform);
@@ -304,7 +350,7 @@
 
             Image btnImg = go.GetComponent<Image>();
             btnImg.raycastTarget = false;
-            InitRectGuidance(btnImg, 75, 80);
+            InitRectGuidance(btnImg, 75, 80, tmpOffect);
             SetRimPos(go);
             //maskObj.ShowImmediately();
             StartCoroutine(ShowRimTip(str));
@@ -321,7 +367,7 @@
 
 
     /// <summary>
-    /// 第九步,
+    /// 第九步,购买水元素,第二步上阵
     /// </summary>
     /// <param name="str"></param>
     /// <param name="currentIndex">当前第几步</param>
@@ -329,37 +375,33 @@
     {
         if (currentIndex == 0)
         {
-
             SetRimActive(true);
-
             image_Tip_Rect.gameObject.SetActive(false);
             //设置位置
             AddButtonListener(towerBuyBtn, ac);
-
             Image btnImg = towerBuyBtn.GetComponent<Image>();
-            InitRectGuidance(btnImg, 159, 73.5f);
+            InitRectGuidance(btnImg, 159, 73.5f, Vector2.one);
             SetRimPos(towerBuyBtn);
-            //maskObj.ShowImmediately();
         }
         else if (currentIndex == 1)
         {
             GameObject go = transform.Find("Image_TowerPos2").gameObject;
             Image btnImg = go.GetComponent<Image>();
             btnImg.raycastTarget = true;
-            InitRectGuidance(btnImg, 75, 80);
+            InitRectGuidance(btnImg, 75, 80, tmpOffect);
             SetRimPos(go);
-            //maskObj.ShowImmediately();
-            ShowDragPath(water1.GetStartP, btnImg.rectTransform);
+            ShowDragPath(wood1.GetStartP, btnImg.rectTransform);
         }
-
-        //StartCoroutine(ShowRimTip(str));
     }
 
     public void Step9_1()
     {
-        water1.gameObject.SetActive(true);
+        wood1.gameObject.SetActive(true);
+        woodPS1.Play();
+        woodPS2.Play();
         towerPos2.enabled = true;
         DestoryButtonListener(towerBuyBtn);
+        towerBuyBtn.gameObject.SetActive(false);
     }
 
 
@@ -374,7 +416,7 @@
     }
 
     /// <summary>
-    /// 第12步,引导释放技能
+    /// 第12步,弃用
     /// </summary>
     public void Step11(int currentIndex, string str)
     {
@@ -390,7 +432,7 @@
 
             ShowDragPath(skill.GetStartP, image_SkillRim.rectTransform);
 
-            InitRectGuidance(image_SkillRim, 79, 265);
+            InitRectGuidance(image_SkillRim, 79, 265, tmpOffect);
 
         }
         else if (currentIndex == 1)
@@ -410,12 +452,118 @@
         SetRimActive(false);
     }
 
+
+    /// <summary>
+    /// 第12步,交换水火塔 
+    /// </summary>
+    public void Step11Drag(int currentIndex)
+    {
+        if (currentIndex == 0)
+        {
+            GameConfig.CanDragTower = true;
+            //标记水塔 引导拖动
+            towerPos.GetComponent<Image>().raycastTarget = false;
+            towerPos2.GetComponent<Image>().raycastTarget = false;
+            backgroundImg.raycastTarget = false;
+            SetRimActive(true);
+            SetGuideUI(false);
+            Image btnImg = towerPos2.GetComponent<Image>();
+            btnImg.raycastTarget = false;
+
+            InitRectGuidance(btnImg, 75, 80, tmpOffect);
+            //SetRimPos(towerPos2.gameObject);
+            SetRimPos(towerPos2.gameObject, new Vector2(0, 30));
+            StartCoroutine(ShowRimTip("交换"));
+            ShowDragPath(towerPos2.GetComponent<RectTransform>().anchoredPosition, towerPos.GetComponent<RectTransform>());
+
+        }
+        else if (currentIndex == 1)
+        {
+            Image btnImg = towerPos.GetComponent<Image>();
+            btnImg.raycastTarget = false;
+
+            InitRectGuidance(btnImg, 75, 80, tmpOffect);
+            //SetRimPos(towerPos.gameObject);
+            SetRimPos(towerPos.gameObject, new Vector2(0, 10));
+
+            StartCoroutine(ShowRimTip("交换"));
+
+        }
+        else if (currentIndex == 2)
+        {
+            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);
+        }
+    }
+
+
     public void Step12()
     {
-
-
         SetGuideUI(true);
+        backgroundImg.raycastTarget = true;
     }
+
+    public void Step13(string str, Action ac)
+    {
+        skillBtn.interactable = true;
+
+        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuideEnergyUp, 100);
+
+        SetGuideUI(false);
+
+        backgroundImg.raycastTarget = false;
+        SetRimActive(true);
+        AddButtonListener(skillBtn.gameObject, ac);
+        Image btnImg = skillBtn.GetComponent<Image>();
+        InitRectGuidance(btnImg, 79, 79f, Vector2.one);
+        //SetRimPos(skillBtn.gameObject);
+        SetRimPos(skillBtn.gameObject, new Vector2(-15, -241));
+
+        text_Tip.text = str;//动态改变长度
+        StartCoroutine(ShowRimTip(str));
+    }
+
+    public void Step14()
+    {
+        SetGuideUI(true);
+        backgroundImg.raycastTarget = true;
+        RemoveButtonListener(skillBtn.gameObject);
+    }
+
+    public void FinishGuide()
+    {
+        towerBuyBtn.gameObject.SetActive(true);
+
+    }
+
 
     #region 按钮以及提示
 
@@ -436,10 +584,17 @@
     {
         SetRimActive(true);
         RectTransform rt = target.GetComponent<RectTransform>();
-        image_Rim_Rect.anchoredPosition = rt.anchoredPosition;
         if (target.gameObject.name == "TowerBuyBtn")
         {
-            image_Rim_Rect.anchoredPosition = towerBuyBtnPos;
+            image_Rim_Rect.anchoredPosition = towerBuyBtnPos - tmpOffect;
+        }
+        else if (target.gameObject.name == "SkillBtn")
+        {
+            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)
@@ -454,8 +609,46 @@
         }
 
         if (changeTipPos)
+        {
             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 -= tmpOffect;
+        }
 
+    }
+
+    /// <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 == "SkillBtn")
+        {
+            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)
@@ -484,7 +677,7 @@
     /// 抠出来一个区域
     /// </summary>
     /// <param name="target"></param>
-    void InitRectGuidance(Image target, float x, float y)
+    void InitRectGuidance(Image target, float x, float y, Vector2 offect)
     {
         if (!maskObj.gameObject.activeSelf)
         {
@@ -496,11 +689,14 @@
         {
             maskObj.InitForCamera(target, towerBuyBtnPos, x, y);
         }
+        else if (target.gameObject.name == "SkillBtn")
+        {
+            maskObj.InitForCamera(target, skillBtnPos, x, y);
+        }
         else
         {
-            maskObj.InitForCamera(target, x, y);
+            maskObj.InitForCamera(target, x, y, offect);
         }
-
     }
 
     /// <summary>

--
Gitblit v1.9.1