Merge commit 'd8cf63f1b6ab597f279ee106527379a50bfb63d2'

wangguan

2020-12-10 5f6fb6dccd1330b5b0bcb2d721167a6ac062f3ad

 Assets/Scripts/Guide/GuidePanelNew.cs

@@ -140,6 +140,7 @@
        skillBtn.interactable = false;

        finishPS = transform.Find("Effect_UI_YinDaoJieShu/Particle System (3)").GetComponent<ParticleSystem>();
        towerBuyBtn.gameObject.SetActive(false);
    }


@@ -186,6 +187,8 @@
    {
        //关闭对话框
        SetGuideUI(false);
        towerBuyBtn.gameObject.SetActive(true);

        //开箱
        boxPanel.ChangeType(GuideBoxType.Wood, Step1Finish);
    }
@@ -217,6 +220,7 @@
    {
        strArray = str;
        tmpMask.enabled = false;

        AddButtonListener(towerBuyBtn, Step2_1);
        Image btnImg = towerBuyBtn.GetComponent<Image>();
        InitRectGuidance(btnImg, 159, 73.5f, Vector2.one);
@@ -230,7 +234,6 @@
    private void Step2_1()
    {
        Wood1Appear();

    }

    private void Wood1Appear()
@@ -254,6 +257,9 @@
    private void Step2_2()
    {
        Wood2Appear();



        //StartCoroutine(ShowRimTip(strArray[2]));
    }

@@ -266,6 +272,8 @@
            wood2PS2.Play();
            //fire2.enabled = false;
            DestoryButtonListener(towerBuyBtn);
            towerBuyBtn.gameObject.SetActive(false);

            SetRimActive(false);
            CloseGuidance();
            tmpMask.enabled = true;
@@ -353,6 +361,8 @@
    {
        //关闭对话框
        SetGuideUI(false);
        towerBuyBtn.gameObject.SetActive(true);

        //开箱
        boxPanel.ChangeType(GuideBoxType.Fire, cb);
    }
@@ -372,7 +382,6 @@
        InitRectGuidance(btnImg, 159, 73.5f, Vector2.one);
        SetRimPos(towerBuyBtn);
        StartCoroutine(ShowRimTip(strArray[0]));

    }

    /// <summary>
@@ -393,6 +402,8 @@
            firePS1.Play();
            firePS1.Play();
            RemoveButtonListener(towerBuyBtn);
            towerBuyBtn.gameObject.SetActive(false);

            Step4_2();
        }
    }
@@ -501,6 +512,8 @@
    {
        //关闭对话框
        SetGuideUI(false);
        towerBuyBtn.gameObject.SetActive(true);

        //开箱
        boxPanel.ChangeType(GuideBoxType.Water, cb);
    }
@@ -528,7 +541,6 @@
    private void Step6_1()
    {
        WaterAppear();

    }

    private void WaterAppear()
@@ -541,6 +553,8 @@
            waterPS1.Play();
            waterPS2.Play();
            RemoveButtonListener(towerBuyBtn);
            towerBuyBtn.gameObject.SetActive(false);

            Step6_2();
        }
    }