From 69924ea692410cbea71c4076ee76744085a4911d Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 26 Nov 2020 17:22:20 +0800
Subject: [PATCH] 调整右侧技能进度条

---
 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs |  112 +++++++++++++++++--------------------------------------
 1 files changed, 35 insertions(+), 77 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 75b170d..c37c16d 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -52,14 +52,6 @@
 
     public GameObject darkGroundImg;
 
-    private TextMeshProUGUI energyText;//显示能量的TEXT
-    private Image fireEnergyImg, bombEnergyImg;
-    private Image fireEnergyBgImg, bombEnergyBgImg;
-
-    //public Sprite energyNormal, energyDisplay;//能量够买,能量不够
-
-    private ParticleSystem energyPS;//能量足够的特效
-
     /// <summary>
     /// Awake is called when the script instance is being loaded.
     /// </summary>
@@ -136,20 +128,11 @@
 
         AudioSourceManager.Ins.Play(AudioEnum.BGM2);
 
-        energyText = transform.Find("Panel/Energy/EnergyShow/EnergyText").GetComponent<TextMeshProUGUI>();
-
-        fireEnergyImg = transform.Find("Panel/Energy/FireSkillBtn/Image").GetComponent<Image>();
-        bombEnergyImg = transform.Find("Panel/Energy/BombSkillBtn/Image").GetComponent<Image>();
-
-        fireEnergyBgImg = transform.Find("Panel/Energy/FireSkillBtn").GetComponent<Image>();
-        bombEnergyBgImg = transform.Find("Panel/Energy/BombSkillBtn").GetComponent<Image>();
-
-        energyPS = transform.Find("Panel/Energy/FireSkillBtn/Effect_UI_JiNengTuBiao/03 (7)").GetComponent<ParticleSystem>();
-        fireEnergyBgImg.color = normalColor;
-
-
-        transform.Find("Panel/Energy/FireSkillBtn").GetComponent<Button>().onClick.AddListener(OnClickFireSkillBtn);
-        transform.Find("Panel/Energy/BombSkillBtn").GetComponent<Button>().onClick.AddListener(OnClickBombSkillBtn);
+        transform.Find("Panel/Energy/FireSkillBg/SkillBtn").GetComponent<Button>().onClick.AddListener(OnClickFireSkillBtn);
+        fireSkillLevelText = transform.Find("Panel/Energy/FireSkillBg/Level/Text").GetComponent<Text>();
+        skillSliderValueRect = transform.Find("Panel/Energy/FireSkillBg/SliderValue").GetComponent<RectTransform>();
+        skillSliderVStartP = skillSliderValueRect.anchoredPosition;
+        skillSliderVStartHeight = skillSliderValueRect.sizeDelta;
 
         transform.Find("Panel/Energy").gameObject.SetActive(false);
         transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(false);
@@ -157,11 +140,6 @@
         GameConfig.EnergyCount = 0;
         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);
@@ -201,8 +179,8 @@
 
         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();
+        //transform.Find("Panel/Energy/FireSkillBtn/Image/EnergyText").GetComponent<TextMeshProUGUI>().text = fireSkillCost.ToString();
+        //transform.Find("Panel/Energy/BombSkillBtn/Image/EnergyText").GetComponent<TextMeshProUGUI>().text = bombSkillCost.ToString();
 
         EnergyUp(0);
     }
@@ -446,8 +424,9 @@
     private int energyMax = 0;//能量最大值,目前写死
     private Color normalColor = new Color(1.0f, 1.0f, 1.0f, 1.0f);
     private Color disColor = new Color(1.0f, 1.0f, 1.0f, 0);
+    private Text fireSkillLevelText;
 
-    private Text fireSkillLevelText, bombSkillLevelText;
+
 
     /// <summary>
     /// 点击火技能
@@ -463,22 +442,6 @@
             EndlessWaveLineManager.instance.PlayAllWaveLineEffect();
             AgentInsManager.instance.ExecAllWavelineAttack(fireSkillID, GameConfig.SkillLevel, false);
             ++GameConfig.EndlessPortUseSkillTowerCount;
-        }
-    }
-
-    /// <summary>
-    /// 点击释放电击技能
-    /// </summary>
-    private void OnClickBombSkillBtn()
-    {
-        return;
-        Debug.Log("释放了电技能:" + GameConfig.EnergyCount + "  bombSkillCost:" + bombSkillCost);
-
-        if (GameConfig.EnergyCount >= bombSkillCost)
-        {
-            EnergyUp(-bombSkillCost);
-
-            Debug.Log("释放了电技能");
         }
     }
 
@@ -498,46 +461,42 @@
         {
             GameConfig.EnergyCount = energyMax;
         }
-        energyText.text = GameConfig.EnergyCount.ToString();
+        CalculateSkillSliderValue();
+
         if (GameConfig.EnergyCount >= fireSkillCost)
         {
-            //激活特效
-            if (!energyPS.isPlaying)
+            if (GameConfig.EnergyCount == energyMax)
             {
-                energyPS.Play();
-                fireEnergyBgImg.color = disColor;
-                fireEnergyImg.gameObject.SetActive(false);
+
+                Debug.Log("能量已满");
+
+            }
+            else
+            {
+                Debug.Log("能量达到一次使用");
+
             }
         }
         else
         {
-            //关闭特效
-            if (energyPS.isPlaying)
-            {
-                energyPS.Stop();
-                fireEnergyBgImg.color = normalColor;
-                fireEnergyImg.gameObject.SetActive(true);
-            }
+
         }
 
-        // if (GameConfig.EnergyCount >= bombSkillCost)
-        // {
-        //     if (bombEnergyBgImg.color != normalColor)
-        //     {
-        //         bombEnergyImg.sprite = energyNormal;
-        //         bombEnergyBgImg.color = normalColor;
-        //     }
-        // }
-        // else
-        // {
-        //     if (bombEnergyBgImg.color != disColor)
-        //     {
-        //         bombEnergyImg.sprite = energyDisplay;
-        //         bombEnergyBgImg.color = disColor;
-        //     }
-        // }
     }
 
+    RectTransform skillSliderValueRect;
+    Vector2 skillSliderVStartP;
+    Vector2 skillSliderVStartHeight;
+
+    private void CalculateSkillSliderValue()
+    {
+        float value = (float)GameConfig.EnergyCount / 200.0f;
+        float height = skillSliderVStartHeight.y * value;
+        float y = skillSliderVStartP.y - (skillSliderVStartHeight.y - height) * 0.5f;
+        skillSliderValueRect.sizeDelta = new Vector2(skillSliderVStartHeight.x, height);
+        skillSliderValueRect.anchoredPosition = new Vector2(skillSliderVStartP.x, y);
+
+    }
 
 
     /// <summary>
@@ -550,9 +509,8 @@
             GameConfig.SkillLevel++;
             fireSkillCost = JsonDataCenter.GetSkillLevelInfo(fireSkillID, GameConfig.SkillLevel).cost;
             bombSkillCost = JsonDataCenter.GetSkillLevelInfo(bombSkillID, GameConfig.SkillLevel).cost;
-            Debug.Log($"技能最高5级,当前技能等级:{GameConfig.SkillLevel}  fireSkillCost:{fireSkillCost}  ");
+            //Debug.Log($"技能最高5级,当前技能等级:{GameConfig.SkillLevel}  fireSkillCost:{fireSkillCost}  ");
             fireSkillLevelText.text = "Lv." + GameConfig.SkillLevel;
-            bombSkillLevelText.text = "Lv." + GameConfig.SkillLevel;
         }
     }
 

--
Gitblit v1.9.1