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

liuzhiwei

2020-11-25 925d4b4b286a5d8dff4b62be0ceb25db0c45fedc

 Assets/Scripts/Guide/GuideCtrl.cs

@@ -43,6 +43,7 @@
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
        //EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillStep, SkillStep);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.DragStep, DragStep);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.ShowWarningTips, ShowWarningTips);//开始第三关，弹一大波敌人
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateThirdWaveDone, CreateThirdWaveDone);

        //EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
@@ -524,23 +525,34 @@
        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.RestartWave);
    }

    /// <summary>
    /// 大波敌人来袭
    /// </summary>
    private void ShowWarningTips()
    {
        CommonDebugHelper.Debug("这里需要显示大波敌人来袭");
        panel.Step11_End();
        //结束后需要
        //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateThirdWave);
    }

    private void CreateThirdWaveDone()
    {
        currentIndex = -1;
        ChangeStep(GuideEnum.Step12);
    }

    private void SkillRelease()
    {
        panel.SkillRelease();
    }
    // private void SkillRelease()
    // {
    //     panel.SkillRelease();
    // }


    private void SkillReleaseDone()
    {
        currentIndex = -1;
        ChangeStep(GuideEnum.Step12);
    }
    // private void SkillReleaseDone()
    // {
    //     currentIndex = -1;
    //     ChangeStep(GuideEnum.Step12);
    // }

    private void Step12()
    {