Merge branch 'main' of...

Merge branch 'main' of https://gitlab.informatika.org/mikeleo03/if3210-2024-unity-dor into fix/freeze-mechanism

Assets/Prefabs/Player.prefab

@@ -185,7 +185,6 @@ GameObject:
   - component: {fileID: 11400002}
   - component: {fileID: 13600000}
   - component: {fileID: 8200002}
-  - component: {fileID: 1666025366709550463}
   - component: {fileID: 7588598180635152441}
   m_Layer: 0
   m_Name: Player
@@ -415,21 +414,6 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 0
---- !u!114 &1666025366709550463
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 100006}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 08df75ef7b6a74349bcf1f8ac6d06c0b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  healingPet: {fileID: 7022846624846827769, guid: f86d09f168862644d8d36c6929850322, type: 3}
-  attackingPet: {fileID: 7022846624846827769, guid: 89d690d2254d9714f88745a7913a6bf3, type: 3}
-  enemyPet: {fileID: 7022846624846827769, guid: b72eb3b0ce197e843ab3106ef6048505, type: 3}
 --- !u!114 &7588598180635152441
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -442,6 +426,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8c07b35243918104da53773333c73e60, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  balance: 0
 --- !u!1 &100008
 GameObject:
   m_ObjectHideFlags: 0

Assets/ShopManager.cs

 using UnityEngine;
-using System.Collections;
 using UnityEngine.UI;
-using UnityEngine.Audio;
 using System;
-using UnityEditor.VersionControl;
 
 
 #if UNITY_EDITOR
@@ -70,7 +67,7 @@ public class ShopManager : MonoBehaviour {
 	{
 		balanceText.text = playerCurrency.Balance().ToString();
 		messageTimer -= Time.deltaTime;
-		if (isAccessible && Input.GetKeyDown(KeyCode.Space)) 
+		if (isAccessible && Input.GetKeyDown(KeyCode.B)) 
 		{
 			if (shopPanel.activeSelf)
 			{
@@ -85,10 +82,10 @@ public class ShopManager : MonoBehaviour {
 		else if (isAccessible && !shopPanel.activeSelf) 
 		{
 			resetCanvas();
-			showMessage("Press key Space to open shop");
+			showMessage("Press key E to open shop");
 			return;
 		}   
-		else if (!isAccessible && Input.GetKeyDown(KeyCode.Space)) 
+		else if (!isAccessible && Input.GetKeyDown(KeyCode.B)) 
 		{
 			messageTimer = messageDelay; 
 			resetCanvas();