Skip to content

Commit

Permalink
reformatted some code to make it easier to read
Browse files Browse the repository at this point in the history
Signed-off-by: rodude123 <[email protected]>
  • Loading branch information
rodude123 committed Mar 30, 2022
1 parent 2732260 commit c714c21
Show file tree
Hide file tree
Showing 634 changed files with 254,870 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Assets/Scripts/Enemy/Enemy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private void Update()
public void TakeDamage(float damage)
{
health -= damage;
if (!(health <= 0))
if (health >= 0)
{
return;
}
Expand Down
10 changes: 5 additions & 5 deletions Assets/Scripts/Enemy/EnemyManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ public class EnemyManager : MonoBehaviour
[Min(1)]
public float timeBetweenSpawnsSeconds = 10.0f;
[ConditionalHide(true, false, "spawnMode", "spawnSystem")]
public bool enableGUI;
public bool enableUI;

[ConditionalHide(true, false, "spawnMode", "spawnSystem", "enableGUI")]
[ConditionalHide(true, false, "spawnMode", "spawnSystem", "enableUI")]
public Canvas canvasUI;

[ConditionalHide(true, false, "spawnMode", "spawnSystem", "enableGUI")]
[ConditionalHide(true, false, "spawnMode", "spawnSystem", "enableUI")]
public Color32 textColour;
private GameObject _counterGb;
private int _currRound;
Expand Down Expand Up @@ -83,7 +83,7 @@ private void Start()
if (spawnSystem == SpawnSystem.RoundBased)
{
StartCoroutine(nameof(RoundBased));
if (enableGUI)
if (enableUI)
{
StartCoroutine(nameof(RoundCounterUI));
}
Expand All @@ -108,7 +108,7 @@ private void Start()
// Update is called once per frame
private void Update()
{
if (enableGUI)
if (enableUI)
{
_counterGb.GetComponent<TextMeshProUGUI>().text = "Round: " + (_currRound + 1);
}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Testing Assets/AI Configs/zombieAI 1.asset
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MonoBehaviour:
canCrouch: 0
crouchWalkParameterName:
attackParameterName: attack
attackRange: 2.5
attackRange: 3.22
damage: 10
attackDelay: 2
dieParameterName: die
8 changes: 8 additions & 0 deletions Assets/Testing Assets/Asset Store Assets/Testing Assets.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Loading

0 comments on commit c714c21

Please sign in to comment.