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

chenxin

2020-12-12 899beb99be4dcff08cade5656b9bf6354b3eaef7

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -140,8 +140,11 @@
        skillSliderVStartP = skillSliderValueRect.anchoredPosition;
        skillSliderVStartHeight = skillSliderValueRect.sizeDelta;

        skillPS1 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao/03").GetComponent<ParticleSystem>();
        skillPS2 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao_02/03").GetComponent<ParticleSystem>();
        skillPS1 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao/03").gameObject;
        skillPS2 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao_02/03").gameObject;

        skillPS1.SetActive(false);
        skillPS2.SetActive(false);

        transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(false);
        transform.Find("Panel/SwitchSpeed").gameObject.SetActive(false);
@@ -166,7 +169,7 @@
        int guide = PlayerPrefs.GetInt("GemBattleGuide");
        GameConfig.IsNewbie = guide == 0;

        //GameConfig.IsNewbie = false;
        //GameConfig.IsNewbie = true;

        GameConfig.IsNewbieStart = GameConfig.IsNewbie;

@@ -486,7 +489,7 @@
    private Color disColor = new Color(1.0f, 1.0f, 1.0f, 0);
    private Text fireSkillLevelText;
    private Image fireSkillBgImg;
    private ParticleSystem skillPS1, skillPS2;
    private GameObject skillPS1, skillPS2;

    /// <summary>
    /// 点击火技能
@@ -539,14 +542,16 @@
        {
            if (GameConfig.EnergyCount == energyMax)
            {

                //Debug.Log("能量已满");
                if (fireSkillBgImg.color != disColor)
                {
                    fireSkillBgImg.color = disColor;
                }
                skillPS1.Play();
                skillPS2.Play();
                if (!skillPS1.activeSelf) skillPS1.SetActive(true);
                if (!skillPS2.activeSelf) skillPS2.SetActive(true);

                //skillPS1.Play();
                //skillPS2.Play();
            }
            else
            {
@@ -555,8 +560,10 @@
                {
                    fireSkillBgImg.color = normalColor;
                }
                if (skillPS1.isPlaying) skillPS1.Stop();
                if (!skillPS2.isPlaying) skillPS2.Play();
                if (skillPS1.activeSelf) skillPS1.SetActive(false);
                if (!skillPS2.activeSelf) skillPS2.SetActive(true);
                //if (skillPS1.isPlaying) skillPS1.Stop();
                //if (!skillPS2.isPlaying) skillPS2.Play();
            }
        }
        else
@@ -566,8 +573,10 @@
            {
                fireSkillBgImg.color = normalColor;
            }
            if (skillPS1.isPlaying) skillPS1.Stop();
            if (skillPS2.isPlaying) skillPS2.Stop();
            if (skillPS1.activeSelf) skillPS1.SetActive(false);
            if (skillPS2.activeSelf) skillPS2.SetActive(false);
            // if (skillPS1.isPlaying) skillPS1.Stop();
            // if (skillPS2.isPlaying) skillPS2.Stop();

        }
    }