From 243d65af53aae9e3084f20ea9c5815f5b29df09e Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 26 Nov 2020 18:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 106 +++++++++++++++++++---------------------------------
1 files changed, 39 insertions(+), 67 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 736d77b..c37c16d 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -52,12 +52,6 @@
public GameObject darkGroundImg;
- private TextMeshProUGUI energyText;//显示能量的TEXT
- private Image fireEnergyImg, bombEnergyImg;
- private Image fireEnergyBgImg, bombEnergyBgImg;
-
- public Sprite energyNormal, energyDisplay;//能量够买，能量不够
-
/// <summary>
/// Awake is called when the script instance is being loaded.
/// </summary>
@@ -89,6 +83,7 @@
InitSDK();
bGameStart = false;
bFirstLoaded = false;
+ GameConfig.CreateRandomTower = true;
bVibrate = new bool[4];
bVibrate[0] = bVibrate[1] = bVibrate[2] = bVibrate[3] = false;
@@ -133,26 +128,18 @@
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>();
- fireEnergyImg.sprite = energyDisplay;
- bombEnergyImg.sprite = energyDisplay;
- 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);
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);
@@ -186,13 +173,14 @@
private void JsonDataReadDone()
{
transform.Find("Panel/Energy").gameObject.SetActive(true);
+ transform.Find("Panel/BuffPreviewButton").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();
+ //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);
}
@@ -435,9 +423,10 @@
private int bombSkillID = 99901;
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 Color disColor = new Color(1.0f, 1.0f, 1.0f, 0);
+ private Text fireSkillLevelText;
- private Text fireSkillLevelText, bombSkillLevelText;
+
/// <summary>
/// 点击火技能
@@ -453,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("释放了电技能");
}
}
@@ -488,42 +461,42 @@
{
GameConfig.EnergyCount = energyMax;
}
- energyText.text = GameConfig.EnergyCount.ToString();
+ CalculateSkillSliderValue();
+
if (GameConfig.EnergyCount >= fireSkillCost)
{
- if (fireEnergyBgImg.color != normalColor)
+ if (GameConfig.EnergyCount == energyMax)
{
- fireEnergyImg.sprite = energyNormal;
- fireEnergyBgImg.color = normalColor;
+
+ Debug.Log("能量已满");
+
+ }
+ else
+ {
+ Debug.Log("能量达到一次使用");
+
}
}
else
{
- if (fireEnergyBgImg.color != disColor)
- {
- fireEnergyImg.sprite = energyDisplay;
- fireEnergyBgImg.color = disColor;
- }
+
}
- 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>
@@ -536,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