From 90023c60a480d172be97eb8bdc42597d2820ab98 Mon Sep 17 00:00:00 2001
From: maikeljh <mjh191003@gmail.com>
Date: Wed, 8 May 2024 14:50:26 +0700
Subject: [PATCH] [Fix] Level01 and LevelManager Conflict
---
Assets/Scenes/Level01.unity | 3 ---
Assets/Scripts/Managers/LevelManager.cs | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity
index f9013f3..9e6ac9b 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 a2652ea..3e67030 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;
--
GitLab