From 3d13f2e8a23602aedb8adf5d2d02e377a330a61b Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 08 Dec 2020 13:55:10 +0800
Subject: [PATCH] 修复火塔攻击特效 修改结算面板BUG
---
Assets/Scripts/TowerDefense/UI/GM.cs | 73 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/GM.cs b/Assets/Scripts/TowerDefense/UI/GM.cs
index 35d7f6b..f96cd04 100644
--- a/Assets/Scripts/TowerDefense/UI/GM.cs
+++ b/Assets/Scripts/TowerDefense/UI/GM.cs
@@ -1,8 +1,8 @@
using UnityEngine;
using TowerDefense.Level;
using TowerDefense.Towers;
-using TowerDefense.UI.HUD;
using UnityEngine.UI;
+using TowerDefense.UI.HUD;
/**
* GM
@@ -17,49 +17,32 @@
public Text RandomText;
- public ToggleGroup WoodToggleGroup;
+ public Toggle WoodToggle;
- private int woodSelectedIndex;
+ public InputField WoodInput;
- public ToggleGroup FireToggleGroup;
+ public Toggle WaterToggle;
- private int fireSelectedIndex;
+ public InputField WaterInput;
- public ToggleGroup WaterToggleGroup;
+ public Toggle FireToggle;
- private int waterSelectedIndex;
+ public InputField FireInput;
+
+ public Toggle InfiniteSkillToggle;
// Start is called before the first frame update
private void Start()
{
GMPanel.SetActive(false);
- }
+ InfiniteSkillToggle.onValueChanged.AddListener((bool select) =>
+ {
+ GameConfig.InfiniteSkill = select;
- public void OnClickWood(int index)
- {
- GameObject child = WoodToggleGroup.transform.GetChild(index).gameObject;
- Toggle toggle = child.GetComponent<Toggle>();
-
- if (toggle.isOn)
- woodSelectedIndex = index;
- }
-
- public void OnClickFire(int index)
- {
- GameObject child = FireToggleGroup.transform.GetChild(index).gameObject;
- Toggle toggle = child.GetComponent<Toggle>();
-
- if (toggle.isOn)
- fireSelectedIndex = index;
- }
-
- public void OnClickWater(int index)
- {
- GameObject child = WaterToggleGroup.transform.GetChild(index).gameObject;
- Toggle toggle = child.GetComponent<Toggle>();
-
- if (toggle.isOn)
- waterSelectedIndex = index;
+ if (select)
+ EndlessUIStart.instance.GuideEnergyUp(200);
+ });
+ InfiniteSkillToggle.isOn = GameConfig.InfiniteSkill;
}
/// <summary>
@@ -91,7 +74,7 @@
Tower aTower = EndlessRandomTower.instance.getTowerByName("CopyCatTower");
int level = 0;
- if (waterSelectedIndex == 0)
+ if (WaterToggle.isOn)
{
if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
{
@@ -99,7 +82,11 @@
}
}
else
- level = waterSelectedIndex - 1;
+ {
+ int result = 0;
+ int.TryParse(WaterInput.text, out result);
+ level = Mathf.Clamp(result - 1, 0, ElfUpgradeData.MaxTowerLevel - 1);
+ }
EndlessRandomTower.instance.RandomPlaceTower(aTower, level, 0);
}
@@ -112,7 +99,7 @@
Tower aTower = EndlessRandomTower.instance.getTowerByName("GrowUpTower");
int level = 0;
- if (fireSelectedIndex == 0)
+ if (FireToggle.isOn)
{
if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
{
@@ -120,7 +107,11 @@
}
}
else
- level = waterSelectedIndex - 1;
+ {
+ int result = 0;
+ int.TryParse(FireInput.text, out result);
+ level = Mathf.Clamp(result - 1, 0, ElfUpgradeData.MaxTowerLevel - 1);
+ }
EndlessRandomTower.instance.RandomPlaceTower(aTower, level, 0);
}
@@ -133,7 +124,7 @@
Tower aTower = EndlessRandomTower.instance.getTowerByName("BlinkTower");
int level = 0;
- if (woodSelectedIndex == 0)
+ if (WoodToggle.isOn)
{
if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
{
@@ -141,7 +132,11 @@
}
}
else
- level = woodSelectedIndex - 1;
+ {
+ int result = 0;
+ int.TryParse(WoodInput.text, out result);
+ level = Mathf.Clamp(result - 1, 0, ElfUpgradeData.MaxTowerLevel - 1);
+ }
EndlessRandomTower.instance.RandomPlaceTower(aTower, level, 0);
}
--
Gitblit v1.9.1