diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity index f9013f32dcad197e5d1bcfbaf89027a1059bbd1e..9e6ac9bc8937e864cd37051842b0d54dc30c2f74 100644 --- a/Assets/Scenes/Level01.unity +++ b/Assets/Scenes/Level01.unity @@ -13658,8 +13658,6 @@ Transform: - {fileID: 384557718} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} -<<<<<<< HEAD -======= --- !u!1 &1656483645 GameObject: m_ObjectHideFlags: 0 @@ -13733,7 +13731,6 @@ MonoBehaviour: shopTimeRemaining: 0 shopKeeper: {fileID: 0} timerCanvas: {fileID: 0} ->>>>>>> 0d10b3347e008e73681d3671cd0f76ddacfec3bb --- !u!1 &1695883712 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/LevelManager.cs b/Assets/Scripts/Managers/LevelManager.cs index a2652ead0df45a42da6aadad30b9a5f6a94cd8b9..3e670308d1c5da73648316bcb8fb118f1dd8816a 100644 --- a/Assets/Scripts/Managers/LevelManager.cs +++ b/Assets/Scripts/Managers/LevelManager.cs @@ -22,8 +22,8 @@ namespace Nightmare "Cutscene08" }; - private int currentIndex = 0; - private int currentQuest = 0; + public int currentIndex = 0; + public int currentQuest = 0; private float announcementDuration = 5f; public TMPro.TextMeshProUGUI announcementText; public EnemyManager[] enemyManager;