From eab47305629d96d19626e10b649ba4247d1f55f5 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Sat, 23 Dec 2023 21:20:31 +0000
Subject: [PATCH] Added loading screen, moved tilemap generation to coroutine
---
Assets/Scripts/Managers/GameManager.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs
index d4b9e44..6c12eb4 100644
--- a/Assets/Scripts/Managers/GameManager.cs
+++ b/Assets/Scripts/Managers/GameManager.cs
@@ -1,10 +1,6 @@
using Assets.Scripts.Enums;
-using System.Collections;
-using System.Collections.Generic;
using TMPro;
using UnityEngine;
-using UnityEngine.InputSystem;
-using UnityEngine.SceneManagement;
using UnityEngine.Tilemaps;
public class GameManager : SettingsManager
@@ -13,13 +9,39 @@
public GameObject healthTextPrefab;
public Canvas playerUI;
public Canvas pauseMenuUI;
+ public GameObject levelChanger;
public Tilemap tilemap;
+ GenerateTileMap generateTileMap;
private void Awake()
{
SoundManager.instance.ChangeMusic(SoundName.MusicHappy);
+ LoadTileMaps(SaveSystem.isGameLoaded);
}
+
+ private void LoadTileMaps(bool loadFromSave)
+ {
+ pauseMenuUI.GetComponent<PauseMenu>().Pause();
+ levelChanger.GetComponent<Animator>().SetBool("SceneLoading", true);
+ generateTileMap = tilemap.GetComponent<GenerateTileMap>();
+ Debug.Log("waiting for async");
+ StartCoroutine(generateTileMap.GenerateTiles(LoadTileMapsFinished));
+ }
+
+ public void LoadTileMapsFinished()
+ {
+ Debug.Log("done async");
+ levelChanger.GetComponent<Animator>().SetBool("SceneLoading", false);
+ GameLoaded();
+ }
+ public void GameLoaded()
+ {
+ pauseMenuUI.GetComponent<PauseMenu>().Resume();
+ pauseMenuUI.GetComponent<Animator>().SetTrigger("GameLoaded");
+ }
+
+ #region characterEvents
private void OnEnable()
{
// add listen events
@@ -85,8 +107,6 @@
CharacterEvents.characterDrillingToPosition.Invoke(moveToPosition);
}
}
- public void GameLoaded()
- {
- pauseMenuUI.GetComponent<Animator>().SetTrigger("GameLoaded");
- }
+ #endregion
+
}
--
Gitblit v1.9.3