fixed conflict

main
Matthew Kalahiki 4 years ago
parent 62dfd0b748
commit 2f5c25ae0f

@ -12,7 +12,7 @@ public class GameManager : MonoBehaviour
{
public static GameManager Instance { get; private set; }
public GameObject foregroundCanvas;
public GameObject foregroundCanvas;
public GameObject backgroundCanvas;
public GameObject spriteToFade;
@ -74,7 +74,7 @@ public class GameManager : MonoBehaviour
{
Instance = this;
DontDestroyOnLoad(gameObject);
DontDestroyOnLoad(foregroundCanvas);
DontDestroyOnLoad(foregroundCanvas);
DontDestroyOnLoad(backgroundCanvas);
DontDestroyOnLoad(events);
DontDestroyOnLoad(player);
@ -82,7 +82,7 @@ public class GameManager : MonoBehaviour
else
{
Destroy(gameObject);
Destroy(foregroundCanvas);
Destroy(foregroundCanvas);
Destroy(backgroundCanvas);
Destroy(events);
@ -100,7 +100,7 @@ public class GameManager : MonoBehaviour
sound = GetComponent<AudioSource>();
//GameManager.Instance.enablePowerup(3);
GameManager.Instance.enablePowerup(3);
//GameManager.Instance.enablePowerup(3);
artActivated = new bool[art.Length];
for (int i = 0; i < art.Length; i++)
@ -180,9 +180,9 @@ public class GameManager : MonoBehaviour
public void HideDialog()
{
dialogBox.SetActive(false);
artImage.SetActive(false);
//hideGalleryButton.SetActive(false);
artImage.SetActive(false);
//hideGalleryButton.SetActive(false);
}
@ -196,7 +196,7 @@ public class GameManager : MonoBehaviour
healthbar.SetActive(true);
powerUps.SetActive(true);
pauseButton.SetActive(true);
disableAllPowerups();
disableAllPowerups();
player.SetActive(true);
LoadLevel(sceneToLoad, positionToLoad);
disableAllPowerups();
@ -318,9 +318,9 @@ public class GameManager : MonoBehaviour
healthbar.SetActive(false);
powerUps.SetActive(false);
HideDialog();
}
public bool isPaused()

Loading…
Cancel
Save