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

liuzhiwei

2020-12-22 987fd66dc6d6c28e3ed08a08141ddc3dbd772cea

 Assets/Scripts/Guide/GuideCtrl.cs

@@ -32,6 +32,7 @@
    {
        //int step = PlayerPrefs.GetInt("GemBattleGuide");

        TDAA_SDKManager.Ins.Statistics(5);//埋点
        Init(0);

        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWoodLv2, CreateWoodLv2);
@@ -83,19 +84,24 @@
        allGuideDic.Add(GuideEnum.Step2, new string[] { "点击按钮购买宝石", "再购买一个" });

        allGuideDic.Add(GuideEnum.Step3, new string[] {
            "玉米枪手单体输出高，能有效克制$单位",
            "玉米枪手单体输出高，能有效克制$单位",// $ 慢速肉盾
            "看到走路慢吞吞的怪，就用玉米枪手对付它吧！" ,
                        "介绍火鸡1",
                        "介绍火鸡2"});
                        "接下来该换我亲自上阵了"});

        allGuideDic.Add(GuideEnum.Step4, new string[] { "点击按钮购买宝石" });


        allGuideDic.Add(GuideEnum.Step5, new string[] { "对付%敌人，玉米枪手就不太合适了", "用愤怒小鸡的群攻炸弹收拾它们！请试着&两个精灵的位置" ,
        "介绍水精灵1","介绍水精灵2"});
        allGuideDic.Add(GuideEnum.Step5, new string[] {
            "对付%敌人，我的`是最合适的", // % 大量    ` 群攻炸弹
            "请交换我和玉米枪手的位置！以后也可以随时交换哦" ,
        "最后的伙伴已经达到战场，看看它是谁吧"});

        allGuideDic.Add(GuideEnum.Step6, new string[] { "点击按钮购买宝石" });
        allGuideDic.Add(GuideEnum.Step7, new string[] { "敌人太多了，用技能收拾掉全部敌人！击杀敌人可以对技能充能哦" });
        allGuideDic.Add(GuideEnum.Step7, new string[] {
            "不好，敌人太多了",
        "试着用技能秒杀全部敌人吧！",
        "对付不同敌人，用&效果更好，请继续战斗吧，训练师"// & 特定的精灵
         });

    }

@@ -220,8 +226,8 @@
    /// </summary>
    private void KillDone()
    {
        string[] s2 = new string[] { allGuideDic[currentStep][2], allGuideDic[currentStep][3] };

        string[] s2 = new string[] { allGuideDic[currentStep][2] };
        panel.CloseSkillImage();
        panel.Step3(s2, OpenBoxFire);
    }

@@ -303,7 +309,7 @@

    private void KillSecondDone()
    {
        string[] s2 = new string[] { allGuideDic[currentStep][2], allGuideDic[currentStep][3] };
        string[] s2 = new string[] { allGuideDic[currentStep][2] };

        panel.Step5Talk(s2, OpenBoxWater);
    }
@@ -363,13 +369,15 @@

    private void CreateFourthWaveDone()
    {
        string[] s1 = new string[] { allGuideDic[currentStep][0], allGuideDic[currentStep][1] };

        //对话后准备引导
        panel.Step7Talk(allGuideDic[currentStep], Step7AfterTalk);
        panel.Step7Talk(s1, Step7AfterTalk);
    }

    private void Step7AfterTalk()
    {
        string[] s2 = new string[] { "对付不同敌人，用<效果更好，请继续战斗吧，训练师" };
        string[] s2 = new string[] { allGuideDic[currentStep][2] };

        panel.SkillRelease(s2, Finish);
    }
@@ -385,6 +393,7 @@
        GameConfig.CanOpenNewTower = true;
        GameConfig.CanBuyNewTower = true;
        panel.FinishGuide();
        EndlessRandomTower.instance.SetCountDown(false, true);
        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuideFinish);
        PlayerPrefs.SetInt("GemBattleGuide", 1);
        Destroy(gameObject);