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

wangguan

2020-11-27 6c547fcd89adf90eb67a2d077934eca97ecd1959

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -106,6 +106,7 @@
        transform.Find("Panel/Bottom").GetComponent<RectTransform>().anchoredPosition += tmpOffect;
        transform.Find("Panel/TowerBuyBtn").GetComponent<RectTransform>().anchoredPosition += tmpOffect;
        transform.Find("Panel/SwitchSpeed").GetComponent<RectTransform>().anchoredPosition += tmpOffect;
        transform.Find("Panel/BuffPreviewButton").GetComponent<RectTransform>().anchoredPosition += tmpOffect;

        transform.Find("Panel/BossHPBar").GetComponent<RectTransform>().anchoredPosition -= tmpOffect * 0.5f;
        transform.Find("Panel/Score").GetComponent<RectTransform>().anchoredPosition -= tmpOffect * 0.5f;
@@ -139,6 +140,7 @@
        skillPS2 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao_02/03 (16)").GetComponent<ParticleSystem>();

        transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(false);
        transform.Find("Panel/SwitchSpeed").gameObject.SetActive(false);

        GameConfig.EnergyCount = 0;
        GameConfig.SkillLevel = 1;
@@ -154,7 +156,10 @@

    private void CheckIsNewbie()
    {
        //GameConfig.IsNewbie = false;
        int guide = PlayerPrefs.GetInt("GemBattleGuide");
        GameConfig.IsNewbie = guide == 0;
        GameConfig.IsNewbieStart = GameConfig.IsNewbie;
        
        if (GameConfig.IsNewbie)
        {
            Debug.Log("开始新手引导");
@@ -167,8 +172,6 @@
            GameObject guideObj = Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform.Find("Panel"));
            guideObj.GetComponent<RectTransform>().offsetMin += tmpOffect;
            AddGuideEvent();

            transform.Find("Panel/SwitchSpeed").gameObject.SetActive(false);
        }
    }

@@ -180,7 +183,12 @@
        Debug.Log("设置激活");
        transform.Find("Panel/Energy").gameObject.SetActive(true);

        transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(true);
        if (!GameConfig.IsNewbie)
        {
            transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(true);
            transform.Find("Panel/SwitchSpeed").gameObject.SetActive(true);
        }

        fireSkillCost = JsonDataCenter.GetSkillLevelInfo(fireSkillID, GameConfig.SkillLevel).cost;
        bombSkillCost = JsonDataCenter.GetSkillLevelInfo(bombSkillID, GameConfig.SkillLevel).cost;

@@ -379,7 +387,7 @@
        EndlessLevelManager.instance.RestartWave();
        GameConfig.IsNewbie = false;
        transform.Find("Panel/SwitchSpeed").gameObject.SetActive(true);

        transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(true);
    }

    /// <summary>
@@ -463,8 +471,6 @@
    /// </summary>
    private void EnergyUp(int upCount)
    {
        Debug.Log("开始检查");

        GameConfig.EnergyCount += upCount;
        if (GameConfig.EnergyCount > energyMax)
        {