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

chenxin

2020-10-27 1c693485cc0492d78ae4e120bb10f82a4aac9539

 Assets/Scripts/Guide/GuideCtrl.cs

@@ -32,7 +32,9 @@

    private void Start()
    {
        Init();
        //int step = PlayerPrefs.GetInt("GemBattleGuide");

        Init(0);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.AddCard, AddCard);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFireLv2, CreateFireLv2);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.ChargingEnd, ChargingEnd);
@@ -57,11 +59,28 @@


    }
    public void Init()
    public void Init(int step)
    {
        //Time.timeScale = 0;//游戏暂停,这样会导致协程停止了

        ChangeStep(GuideEnum.Step0);
        // switch (step)
        // {
        //     case 2:
        //     case 3:
        //         //生成两个火元素
        //         break;
        //     case 4:
        //         //生成1个2级火元素，标记上阵位置

        //         break;
        //     case 5:
        //         //生成2级火元素塔，第一关小怪出木元素小怪

        //         break;

        // }
        // ChangeStep((GuideEnum)(step + 1));

    }

    /// <summary>
@@ -154,6 +173,7 @@
        isShowing = true;
        if (currentIndex == -1)//初始化本步
        {
            CommonDebugHelper.DebugError("第1步开始");
            currentIndex = 0;
            needIndex = 2;
            panel.SetGuideUI(true);
@@ -168,6 +188,8 @@
    {
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第2步开始");

            currentIndex = 0;
            needIndex = 2;
            panel.SetGuideUI(false);
@@ -211,6 +233,7 @@
        isShowing = true;
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第3步开始");
            currentIndex = 0;
            needIndex = 2;
            panel.Step2(currentIndex);
@@ -230,6 +253,8 @@
    {
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第4步开始");

            currentIndex = 0;
            needIndex = 2;
            panel.Step3(currentIndex, allGuideDic[currentStep][currentIndex]);
@@ -259,6 +284,8 @@
    {
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第5步开始");

            currentIndex = 0;
            panel.Step4(currentIndex, allGuideDic[currentStep][currentIndex]);
        }
@@ -276,6 +303,8 @@
    {
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第6步开始");

            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateFirstWave);
            panel.Step5(currentIndex, "");
        }
@@ -301,6 +330,8 @@
    {
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第7步开始");

            panel.SetGuideUI(false);
            //恢复出怪
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.RestartWave);
@@ -330,6 +361,8 @@
    {
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第8步开始");

            currentIndex = 0;
            needIndex = 1;
            panel.SetGuideUI(false);
@@ -353,6 +386,8 @@
        isShowing = true;
        if (currentIndex == -1)//初始化本步
        {
            CommonDebugHelper.DebugError("第9步开始");

            currentIndex = 0;
            needIndex = 2;
            panel.Step8();
@@ -370,6 +405,8 @@
    {
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第10步开始");

            currentIndex = 0;
            needIndex = 2;
            panel.SetGuideUI(false);
@@ -407,6 +444,8 @@
        isShowing = true;
        if (currentIndex == -1)//初始化本步
        {
            CommonDebugHelper.DebugError("第11步开始");

            currentIndex = 0;
            needIndex = 2;
            panel.SetGuideUI(true);
@@ -424,6 +463,8 @@
    {
        if (currentIndex == -1)
        {
            CommonDebugHelper.DebugError("第12步开始");

            currentIndex = 0;
            needIndex = 1;

@@ -457,6 +498,8 @@
        isShowing = true;
        if (currentIndex == -1)//初始化本步
        {
            CommonDebugHelper.DebugError("第13步开始");

            currentIndex = 0;
            needIndex = 3;
            panel.Step12();