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

chenxin

2020-11-25 554eda43e00d5817cd3e06a60e39d4bd882ee584

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -47,7 +47,8 @@

    private bool isPause;

    public bool beginSkillStep = false;
    public bool beginDragStep = false;
    public bool guideThirdWaveStep = false;

    public GameObject darkGroundImg;

@@ -120,14 +121,16 @@
        int guide = PlayerPrefs.GetInt("GemBattleGuide");
        GameConfig.IsNewbie = guide == 0;
        // cx test
        GameConfig.IsNewbie = false;
        //GameConfig.IsNewbie = false;
        if (GameConfig.IsNewbie)
        {
            Debug.Log("开始新手引导");
            GameConfig.CanDragTower = false;
            Pause();
            HideUIMask();
            countDownTextNew.text = "";
            countDownTextNew.gameObject.SetActive(false);


            GameObject guideObj = Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform.Find("Panel"));
            guideObj.GetComponent<RectTransform>().offsetMin += tmpOffect;
@@ -156,6 +159,10 @@
        GameConfig.SkillLevel = 1;

        energyText.text = GameConfig.EnergyCount.ToString();
        fireSkillLevelText = transform.Find("Panel/Energy/FireSkillBtn/Level/Text").GetComponent<Text>();
        bombSkillLevelText = transform.Find("Panel/Energy/BombSkillBtn/Level/Text").GetComponent<Text>();

        transform.Find("Panel/Energy/BombSkillBtn").gameObject.SetActive(false);//手动关闭了电按钮

        EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EnergyUp, EnergyUp);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillLevelUpBuff, SkillLevelUpBuff);
@@ -171,6 +178,8 @@
        transform.Find("Panel/Energy").gameObject.SetActive(true);
        fireSkillCost = JsonDataCenter.GetSkillLevelInfo(fireSkillID, GameConfig.SkillLevel).cost;
        bombSkillCost = JsonDataCenter.GetSkillLevelInfo(bombSkillID, GameConfig.SkillLevel).cost;

        energyMax = JsonDataCenter.GetById<battle>(22).value;

        transform.Find("Panel/Energy/FireSkillBtn/Image/EnergyText").GetComponent<TextMeshProUGUI>().text = fireSkillCost.ToString();
        transform.Find("Panel/Energy/BombSkillBtn/Image/EnergyText").GetComponent<TextMeshProUGUI>().text = bombSkillCost.ToString();
@@ -219,7 +228,12 @@
        EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.AddGold, AddGold);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateSecondWave, CreateSecondWave);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateThirdWave, CreateThirdWave);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateThirdWaveDone, CreateThirdWaveDone);
        EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.GuideEnergyUp, GuideEnergyUp);


        //EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.GuideFinish, NewbieGuideEnd);

        EventCenter.Ins.Add<Vector3>((int)KTGMGemClient.EventType.PlayAppearEffect, GuidePlayAppearEffect);
@@ -290,11 +304,11 @@
    }

    /// <summary>
    /// 在攻击位置上创建一个1级的水塔
    /// 在攻击位置上创建一个1级的木塔
    /// </summary>
    private void CreateWaterLv1()
    {
        Tower aTower = EndlessRandomTower.instance.getTowerByName("CopyCatTower");
        Tower aTower = EndlessRandomTower.instance.getTowerByName("BlinkTower");
        EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(1, 3), 1);
    }

@@ -304,8 +318,29 @@
    private void CreateSecondWave()
    {
        EndlessLevelManager.instance.NewbieUpdateLevel();
        beginSkillStep = true;
        beginDragStep = true;
    }

    /// <summary>
    /// 开始第三关
    /// </summary>
    private void CreateThirdWave()
    {
        EndlessLevelManager.instance.NewbieUpdateLevel();
        beginDragStep = false;
        guideThirdWaveStep = true;
    }

    /// <summary>
    /// 第三关出兵完毕，暂停出兵
    /// </summary>
    private void CreateThirdWaveDone()
    {
        EndlessLevelManager.instance.PauseWave();
    }




    /// <summary>
    /// 在第三条兵线释放技能宝石
@@ -384,9 +419,11 @@
    private int fireSkillCost, bombSkillCost;//两个技能花费
    private int fireSkillID = 99902;
    private int bombSkillID = 99901;
    private int energyMax = 200;//能量最大值，目前写死
    private int energyMax = 0;//能量最大值，目前写死
    private Color normalColor = new Color(1.0f, 1.0f, 1.0f, 1.0f);
    private Color disColor = new Color(0.78f, 0.78f, 0.78f, 0.5f);

    private Text fireSkillLevelText, bombSkillLevelText;

    /// <summary>
    /// 点击火技能
@@ -419,6 +456,12 @@

            Debug.Log("释放了电技能");
        }
    }

    public void GuideEnergyUp(int count)
    {
        GameConfig.EnergyCount = count;
        EnergyUp(0);
    }

    /// <summary>
@@ -477,9 +520,11 @@
        if (GameConfig.SkillLevel <= 5)
        {
            GameConfig.SkillLevel++;
            Debug.Log("技能最高5级,当前技能等级：" + GameConfig.SkillLevel);
            fireSkillCost = JsonDataCenter.GetSkillLevelInfo(fireSkillID, GameConfig.SkillLevel).cost;
            bombSkillCost = JsonDataCenter.GetSkillLevelInfo(bombSkillID, GameConfig.SkillLevel).cost;
            Debug.Log($"技能最高5级,当前技能等级：{GameConfig.SkillLevel}  fireSkillCost:{fireSkillCost}  ");
            fireSkillLevelText.text = "Lv." + GameConfig.SkillLevel;
            bombSkillLevelText.text = "Lv." + GameConfig.SkillLevel;
        }
    }

@@ -591,6 +636,8 @@
                EndlessLevelManager.instance.StartLevel();
                timeTextNew.gameObject.SetActive(true);

                JsonDataReadDone();

                if (bgMusic != null)
                    bgMusic.Play();
            }