wangguan
2020-12-12 b48b49bc17fe12bc6a79665d595d2ef625825630
能量条特效和按钮特效都直接关闭
4 files modified
75 ■■■■ changed files
Assets/Prefabs/UI/Endless/Energy.prefab 31 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 4 ●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 31 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 9 ●●●●● patch | view | raw | blame | history
Assets/Prefabs/UI/Endless/Energy.prefab
@@ -749,17 +749,33 @@
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 815652115, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 955858840, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 955858843, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1545029220, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 1545029223, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1927661716, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 1927661719, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2017506190226396013, guid: 5591b24d709da864d8fa54fb582b837f,
        type: 3}
@@ -881,6 +897,11 @@
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 1013707400934309631, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -971,6 +992,11 @@
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 6154103025610236667, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 6780897465785184072, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_Name
@@ -981,6 +1007,11 @@
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 8405623961553036373, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: cc9473b9d3a93c5458c8e125a8130bc2, type: 3}
--- !u!4 &5769365057982938342 stripped
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -92,7 +92,9 @@
        private void ShowGameOverPanel()
        {
            EndlessRandomTower.instance.SetCountDown(false,true);
            EndlessRandomTower.instance.SetCountDown(false);
            EndlessRandomTower.instance.SetPS(false);
            GameObject go = Instantiate(Resources.Load<GameObject>("Prefabs/GameOverPanel"), GameObject.Find("UICamera/BottomCanvas").transform);
            EventCenter.Ins.Add((int)KTGMGemClient.EventType.GameOverEnd, GameOverEnd);
        }
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();
        }
    }
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
@@ -268,6 +268,15 @@
                needClickPS.Stop();
        }
    }
    public void SetPS(bool isOn)
    {
        if (needClickPS.gameObject.activeSelf != isOn)
        {
            needClickPS.gameObject.SetActive(isOn);
        }
    }
    float countDownTime = 0f;
    float countDownLimit = 5f;
    public ParticleSystem needClickPS;//提示点击按钮