From 39dc1cad04426eeb07f8c7fc123840c7b31928b7 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Sat, 12 Dec 2020 16:35:07 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 236 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 157 insertions(+), 79 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 51b8c19..2400d53 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -48,15 +48,13 @@
private bool isPause;
public bool beginDragStep = false;
- public bool guideThirdWaveStep = false;
+ public bool guideFourthWaveStep = false;
public GameObject darkGroundImg;
- private TextMeshProUGUI energyText;//显示能量的TEXT
- private Image fireEnergyImg, bombEnergyImg;
- private Image fireEnergyBgImg, bombEnergyBgImg;
+ private CanvasGroup canvasGroup;
- public Sprite energyNormal, energyDisplay;//能量够买，能量不够
+ public GameObject GMBtn;
/// <summary>
/// Awake is called when the script instance is being loaded.
@@ -89,6 +87,7 @@
InitSDK();
bGameStart = false;
bFirstLoaded = false;
+ GameConfig.IsUpgradeTowerLevel = false;
GameConfig.CreateRandomTower = true;
bVibrate = new bool[4];
@@ -112,6 +111,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;
@@ -134,26 +134,30 @@
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);
+ fireSkillBgImg = transform.Find("Panel/Energy/FireSkillBg").GetComponent<Image>();
+ 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);
+ 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);
+ GMBtn.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>();
+ //CalculateSkillSliderValue();
+ transform.Find("Panel/Energy").gameObject.SetActive(false);
- transform.Find("Panel/Energy/BombSkillBtn").gameObject.SetActive(false);//手动关闭了电按钮
+ canvasGroup = transform.Find("Panel").GetComponent<CanvasGroup>();
EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EnergyUp, EnergyUp);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillLevelUpBuff, SkillLevelUpBuff);
@@ -163,22 +167,35 @@
private void CheckIsNewbie()
{
- //GameConfig.IsNewbie = false;
+ int guide = PlayerPrefs.GetInt("GemBattleGuide");
+ GameConfig.IsNewbie = guide == 0;
+
+ //GameConfig.IsNewbie = true;
+
+ GameConfig.IsNewbieStart = GameConfig.IsNewbie;
+
if (GameConfig.IsNewbie)
{
+ EndlessRandomTower.instance.SetCountDown(false);
+
Debug.Log("开始新手引导");
GameConfig.CanDragTower = false;
Pause();
HideUIMask();
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
-
- GameObject guideObj = Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform.Find("Panel"));
+ GameObject prefab = Resources.Load<GameObject>("UI/Guide/GuidePanel");
+ GameObject guideObj = Instantiate(prefab, transform.Find("Panel"));
guideObj.GetComponent<RectTransform>().offsetMin += tmpOffect;
AddGuideEvent();
-
- transform.Find("Panel/SwitchSpeed").gameObject.SetActive(false);
}
+ }
+
+ public void GameOver()
+ {
+ canvasGroup.alpha = 0;
+ canvasGroup.interactable = false;
+ GuideEnergyUp(0);
}
/// <summary>
@@ -186,14 +203,23 @@
/// </summary>
private void JsonDataReadDone()
{
+ Debug.Log("设置激活");
transform.Find("Panel/Energy").gameObject.SetActive(true);
+
+ if (!GameConfig.IsNewbie)
+ {
+ transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(true);
+ transform.Find("Panel/SwitchSpeed").gameObject.SetActive(true);
+ GMBtn.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);
}
@@ -233,14 +259,18 @@
/// </summary>
private void AddGuideEvent()
{
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFireLv2, CreateFireLv2);
+ EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWoodLv2, CreateWoodLv2);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFirstWave, CreateFirstWave);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.RestartWave, RestartWave);
EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.AddGold, AddGold);
+ EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFireLv1, CreateFireLv1);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
+
EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateSecondWave, CreateSecondWave);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateThirdWave, CreateThirdWave);
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateThirdWaveDone, CreateThirdWaveDone);
+
+ EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFourthWave, CreateFourthWave);
+ EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFourthWaveDone, CreateFourthWaveDone);
EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.GuideEnergyUp, GuideEnergyUp);
@@ -254,9 +284,13 @@
/// <summary>
/// 在（2，3）位置放置一个火元素的塔
/// </summary>
- private void CreateFireLv2()
+ private void CreateWoodLv2()
{
- Tower aTower = EndlessRandomTower.instance.getTowerByName("GrowUpTower");
+ //GrowUpTower 火
+ //BlinkTower 木
+ //CopyCatTower 水
+
+ Tower aTower = EndlessRandomTower.instance.getTowerByName("BlinkTower");
EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(2, 3), 2);
}
@@ -266,7 +300,7 @@
private void CreateFirstWave()
{
Restart();
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.FireTowerChargeEnd, OnFireTowerChargeEnd);
+ //EventCenter.Ins.Add((int)KTGMGemClient.EventType.FireTowerChargeEnd, OnFireTowerChargeEnd);
}
/// <summary>
@@ -276,8 +310,8 @@
{
Pause();
EndlessLevelManager.instance.PauseWave();
- EventCenter.Ins.Remove((int)KTGMGemClient.EventType.FireTowerChargeEnd, OnFireTowerChargeEnd);
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ChargingEnd);
+ //EventCenter.Ins.Remove((int)KTGMGemClient.EventType.FireTowerChargeEnd, OnFireTowerChargeEnd);
+ //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ChargingEnd);
}
/// <summary>
@@ -317,10 +351,19 @@
/// <summary>
/// 在攻击位置上创建一个1级的木塔
/// </summary>
+ private void CreateFireLv1()
+ {
+ Tower aTower = EndlessRandomTower.instance.getTowerByName("GrowUpTower");
+ EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(1, 3), 1);
+ }
+
+ /// <summary>
+ /// 在攻击位置上创建一个1级的木塔
+ /// </summary>
private void CreateWaterLv1()
{
- Tower aTower = EndlessRandomTower.instance.getTowerByName("BlinkTower");
- EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(1, 3), 1);
+ Tower aTower = EndlessRandomTower.instance.getTowerByName("CopyCatTower");
+ EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(3, 3), 1);
}
/// <summary>
@@ -341,18 +384,26 @@
EndlessLevelManager.instance.NewbieUpdateLevel();
beginDragStep = false;
- guideThirdWaveStep = true;
}
/// <summary>
/// 第三关出兵完毕，暂停出兵
/// </summary>
- private void CreateThirdWaveDone()
+ private void CreateFourthWaveDone()
{
EndlessLevelManager.instance.PauseWave();
}
+ /// <summary>
+ /// 开始第四关
+ /// </summary>
+ private void CreateFourthWave()
+ {
+ CommonDebugHelper.Debug($"开始下一关");
+ EndlessLevelManager.instance.NewbieUpdateLevel();
+ guideFourthWaveStep = true;
+ }
/// <summary>
@@ -385,7 +436,7 @@
EndlessLevelManager.instance.RestartWave();
GameConfig.IsNewbie = false;
transform.Find("Panel/SwitchSpeed").gameObject.SetActive(true);
-
+ transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(true);
}
/// <summary>
@@ -436,15 +487,24 @@
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 Text fireSkillLevelText, bombSkillLevelText;
+ private Color disColor = new Color(1.0f, 1.0f, 1.0f, 0);
+ private Text fireSkillLevelText;
+ private Image fireSkillBgImg;
+ private GameObject skillPS1, skillPS2;
/// <summary>
/// 点击火技能
/// </summary>
private void OnClickFireSkillBtn()
{
+ if (GameConfig.InfiniteSkill)
+ {
+ GuideEnergyUp(200);
+ EndlessWaveLineManager.instance.PlayAllWaveLineEffect();
+ AgentInsManager.instance.ExecAllWavelineAttack(fireSkillID, GameConfig.SkillLevel, false);
+ return;
+ }
+
//Debug.Log("释放了火技能:" + GameConfig.EnergyCount + " fireSkillCost:" + fireSkillCost);
if (GameConfig.EnergyCount >= fireSkillCost)
{
@@ -455,21 +515,9 @@
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)
+ else
{
- EnergyUp(-bombSkillCost);
-
- Debug.Log("释放了电技能");
+ AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
}
}
@@ -489,42 +537,64 @@
{
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;
- }
- }
- else
- {
- if (fireEnergyBgImg.color != disColor)
- {
- fireEnergyImg.sprite = energyDisplay;
- fireEnergyBgImg.color = disColor;
- }
- }
+ //Debug.Log("能量已满");
+ if (fireSkillBgImg.color != disColor)
+ {
+ fireSkillBgImg.color = disColor;
+ }
+ if (!skillPS1.activeSelf) skillPS1.SetActive(true);
+ if (!skillPS2.activeSelf) skillPS2.SetActive(true);
- if (GameConfig.EnergyCount >= bombSkillCost)
- {
- if (bombEnergyBgImg.color != normalColor)
+ //skillPS1.Play();
+ //skillPS2.Play();
+ }
+ else
{
- bombEnergyImg.sprite = energyNormal;
- bombEnergyBgImg.color = normalColor;
+ //Debug.Log("能量达到一次使用");
+ if (fireSkillBgImg.color != normalColor)
+ {
+ fireSkillBgImg.color = normalColor;
+ }
+ if (skillPS1.activeSelf) skillPS1.SetActive(false);
+ if (!skillPS2.activeSelf) skillPS2.SetActive(true);
+ //if (skillPS1.isPlaying) skillPS1.Stop();
+ //if (!skillPS2.isPlaying) skillPS2.Play();
}
}
else
{
- if (bombEnergyBgImg.color != disColor)
+ //Debug.Log("能量不够");
+ if (fireSkillBgImg.color != normalColor)
{
- bombEnergyImg.sprite = energyDisplay;
- bombEnergyBgImg.color = disColor;
+ fireSkillBgImg.color = normalColor;
}
+ if (skillPS1.activeSelf) skillPS1.SetActive(false);
+ if (skillPS2.activeSelf) skillPS2.SetActive(false);
+ // if (skillPS1.isPlaying) skillPS1.Stop();
+ // if (skillPS2.isPlaying) skillPS2.Stop();
+
}
}
+ 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>
@@ -537,9 +607,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;
}
}
@@ -560,6 +629,8 @@
public bool IsGameRunning { get { return !isPause; } }
+ private bool isUpgradeTowerLevel;
+
// Update is called once per frame
void Update()
{
@@ -578,6 +649,13 @@
if (bGameStart)
{
startTime += Time.deltaTime;
+
+ // if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME)
+ // {
+ // EndlessRandomTower.instance.UpdateDescDisplay();
+ // isUpgradeTowerLevel = true;
+ // }
+
timeTextNew.text = ConvertTime((float)Math.Ceiling(startTime));
}
--
Gitblit v1.9.1