Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-12-07 8b6088ac4bc2a789f70fd7ac7b2bb0f73b68c753

 Assets/Scripts/Guide/GuidePanelNew.cs

@@ -230,9 +230,7 @@
    private void Step2_1()
    {
        Wood1Appear();
        RemoveButtonListener(towerBuyBtn);
        AddButtonListener(towerBuyBtn, Step2_2);
        StartCoroutine(ShowRimTip(strArray[1]));

    }

    private void Wood1Appear()
@@ -244,6 +242,9 @@
            wood1.enabled = false;
            wood1PS1.Play();
            wood1PS2.Play();
            RemoveButtonListener(towerBuyBtn);
            AddButtonListener(towerBuyBtn, Step2_2);
            StartCoroutine(ShowRimTip(strArray[1]));
        }
    }

@@ -253,27 +254,28 @@
    private void Step2_2()
    {
        Wood2Appear();

        offectBackground.SetActive(true);
        wood1.enabled = true;
        wood2.enabled = true;
        ShowDragPath(wood2.GetStartP, wood1.GetRect);
        RimWood2();
        image_Tip_Rect.gameObject.SetActive(false);

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

    private void Wood2Appear()
    {
        wood2.gameObject.SetActive(true);
        wood2PS1.Play();
        wood2PS2.Play();
        //fire2.enabled = false;
        DestoryButtonListener(towerBuyBtn);
        SetRimActive(false);
        CloseGuidance();
        tmpMask.enabled = true;
        if (!wood2.gameObject.activeSelf)
        {
            wood2.gameObject.SetActive(true);
            wood2PS1.Play();
            wood2PS2.Play();
            //fire2.enabled = false;
            DestoryButtonListener(towerBuyBtn);
            SetRimActive(false);
            CloseGuidance();
            tmpMask.enabled = true;
            offectBackground.SetActive(true);
            wood1.enabled = true;
            wood2.enabled = true;
            ShowDragPath(wood2.GetStartP, wood1.GetRect);
            RimWood2();
            image_Tip_Rect.gameObject.SetActive(false);
        }
    }


@@ -379,8 +381,6 @@
    private void Step4_1()
    {
        FireAppear();
        RemoveButtonListener(towerBuyBtn);
        Step4_2();
    }

    private void FireAppear()
@@ -392,6 +392,8 @@
            fire.enabled = true;
            firePS1.Play();
            firePS1.Play();
            RemoveButtonListener(towerBuyBtn);
            Step4_2();
        }
    }

@@ -476,6 +478,8 @@
        }
        else if (currentIndex == 2)
        {
            tmpMask.enabled = true;

            SetRimActive(false);
            StopShowDragPath(true);
            CloseGuidance();
@@ -524,8 +528,7 @@
    private void Step6_1()
    {
        WaterAppear();
        RemoveButtonListener(towerBuyBtn);
        Step6_2();

    }

    private void WaterAppear()
@@ -537,6 +540,8 @@
            water.enabled = true;
            waterPS1.Play();
            waterPS2.Play();
            RemoveButtonListener(towerBuyBtn);
            Step6_2();
        }
    }
    /// <summary>