From e9bfcb2cd0ee08c54974ba9052316f0ccf5e022d Mon Sep 17 00:00:00 2001 From: Maxim-Godovikov Date: Sun, 17 Oct 2021 19:25:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D1=8B:=20?= =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=D0=B8=D1=81=D1=82=D0=B8=D0=BA=D0=B0=20?= =?UTF-8?q?GameManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Level_1.unity | 2 +- Assets/Scripts/Global/GameManager.cs | 28 ++++++++++++---------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index 64cbea23..0ae0a7a8 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -2784,7 +2784,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 51375d97c071d8c4f93cf2aa6881d048, type: 3} m_Name: m_EditorClassIdentifier: - coinText: {fileID: 6614787374390785080} + _coinText: {fileID: 6614787374390785080} --- !u!114 &1102420991 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Global/GameManager.cs b/Assets/Scripts/Global/GameManager.cs index c08908e7..75a09b66 100644 --- a/Assets/Scripts/Global/GameManager.cs +++ b/Assets/Scripts/Global/GameManager.cs @@ -1,42 +1,37 @@ -using System; -using System.Collections; using System.Collections.Generic; -using UnityEngine; using TMPro; +using UnityEngine; public class GameManager : MonoBehaviour { - public static List players = new List(); + #region Static Fields + public static List players = new List(); public static List activePlayers = new List(); public static List tempDeadPlayers = new List(); - public static List deadPlayers = new List(); - public static List deadOwners = new List(); - public static int coinsPerTree = 50; - [SerializeField] - private TextMeshProUGUI coinText; + #endregion + + [SerializeField] private TextMeshProUGUI _coinText; private void Awake() { activePlayers.Clear(); tempDeadPlayers.Clear(); - deadPlayers.Clear(); players.Clear(); DeathChecker.OnPlayerDeath += KillPlayer; DeathChecker.OnPlayerRes += ResPlayer; DeathChecker.OnPlayerDeathPermanent += DestroyPermanent; GameData.OnCoinsCollected += UpdateCoinUI; players = FindPlayers(); - SetupActivePlayers(players); - //playersNOnStatic = players; + SetupActivePlayers(players); } private void UpdateCoinUI() { - coinText.text = GameData.coins.ToString(); + _coinText.text = GameData.coins.ToString(); } private void SetupActivePlayers(List allPlayers) @@ -68,18 +63,19 @@ public class GameManager : MonoBehaviour { player.ResetEnemies(); } + deadOwners.Add(deadPlayer.ownerIndex); - //deadPlayers.Add(deadPlayer); } private List FindPlayers() { List resultPlayerList = new List(); var players = FindObjectsOfType(); - foreach(var player in players) + foreach (var player in players) { resultPlayerList.Add(player); } + return resultPlayerList; } } @@ -91,4 +87,4 @@ public enum TileOwner Ragnar = 2, Emir = 3, Asvald = 4, -} +} \ No newline at end of file