From 5d85d093914528927e84d9bff02393793282cc6d Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Thu, 3 Jul 2025 13:03:49 +0900 Subject: [PATCH] =?UTF-8?q?SceneType=20=EB=A1=9C=EC=A7=81=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02.Scripts/Controllers/CameraManager.cs | 4 +-- .../02.Scripts/Controllers/GameManager.cs | 35 ++++++++++++------- .../02.Scripts/Controllers/KeyManager.cs | 8 ++--- .../02.Scripts/Controllers/UiManager.cs | 10 +++--- .../Sprites/Items.spriteatlasv2.meta | 12 +++---- 5 files changed, 39 insertions(+), 30 deletions(-) diff --git a/Assets/_Datas/02.Scripts/Controllers/CameraManager.cs b/Assets/_Datas/02.Scripts/Controllers/CameraManager.cs index 8de451f88..617683359 100644 --- a/Assets/_Datas/02.Scripts/Controllers/CameraManager.cs +++ b/Assets/_Datas/02.Scripts/Controllers/CameraManager.cs @@ -26,7 +26,7 @@ protected override void OnAwake() _cinemachineBrain = GetComponent(); } - public void ChangeScene(string sceneName) + public void ChangeScene(SceneType sceneType) { var foundCams = FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None); _cameraDict = new Dictionary(foundCams.Length); @@ -44,7 +44,7 @@ public void ChangeScene(string sceneName) } } - if (sceneName == "01.Restaurant") + if (sceneType == SceneType.Restaurant) { SwitchCamera(CameraType.BaseCam); } diff --git a/Assets/_Datas/02.Scripts/Controllers/GameManager.cs b/Assets/_Datas/02.Scripts/Controllers/GameManager.cs index 7bcc34744..842860851 100644 --- a/Assets/_Datas/02.Scripts/Controllers/GameManager.cs +++ b/Assets/_Datas/02.Scripts/Controllers/GameManager.cs @@ -2,10 +2,11 @@ using System.Threading.Tasks; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.Serialization; namespace DDD { - public enum SceneName + public enum SceneType { Title = 0, Restaurant = 1 @@ -13,21 +14,27 @@ public enum SceneName public class GameManager : Singleton { - public async Task ChangeScene(SceneName sceneName) - { - string previousSceneName = SceneManager.GetActiveScene().name; - string changeSceneName; + public SceneType CurrentSceneType { get; private set; } - switch (sceneName) + private void Start() + { + CurrentSceneType = SceneType.Title; + } + + public async Task ChangeScene(SceneType sceneType) + { + string changeSceneName; + + switch (sceneType) { - case SceneName.Title: + case SceneType.Title: changeSceneName = "00.Title"; break; - case SceneName.Restaurant: + case SceneType.Restaurant: changeSceneName = "01.Restaurant"; break; default: - throw new ArgumentOutOfRangeException(nameof(sceneName), sceneName, null); + throw new ArgumentOutOfRangeException(nameof(sceneType), sceneType, null); } await UiManager.Instance.FadeIn(); @@ -37,9 +44,11 @@ public async Task ChangeScene(SceneName sceneName) await Task.Yield(); // 씬 로딩 후 초기화 작업 - UiManager.Instance.ChangeScene(previousSceneName, changeSceneName); - CameraManager.Instance.ChangeScene(changeSceneName); - KeyManager.Instance.ChangeScene(changeSceneName); + UiManager.Instance.ChangeScene(CurrentSceneType, sceneType); + CameraManager.Instance.ChangeScene(sceneType); + KeyManager.Instance.ChangeScene(sceneType); + + CurrentSceneType = sceneType; await Task.Delay(1000); @@ -50,7 +59,7 @@ public async Task ChangeScene(SceneName sceneName) public void ChangeSceneByIndex(int index) { - var sceneEnum = (SceneName)index; + var sceneEnum = (SceneType)index; _ = ChangeScene(sceneEnum); } } diff --git a/Assets/_Datas/02.Scripts/Controllers/KeyManager.cs b/Assets/_Datas/02.Scripts/Controllers/KeyManager.cs index 2bd1cee42..2b2b8916a 100644 --- a/Assets/_Datas/02.Scripts/Controllers/KeyManager.cs +++ b/Assets/_Datas/02.Scripts/Controllers/KeyManager.cs @@ -28,14 +28,14 @@ protected override void OnAwake() _currentPlayerInput = GetComponent(); } - public void ChangeScene(string sceneName) + public void ChangeScene(SceneType sceneType) { - switch (sceneName) + switch (sceneType) { - case "00.Title": + case SceneType.Title: SwitchCurrentActionMap(InputActionMaps.Ui); break; - case "01.Restaurant": + case SceneType.Restaurant: SwitchCurrentActionMap(InputActionMaps.Restaurant); break; default: diff --git a/Assets/_Datas/02.Scripts/Controllers/UiManager.cs b/Assets/_Datas/02.Scripts/Controllers/UiManager.cs index c3e573afe..56faa3ad4 100644 --- a/Assets/_Datas/02.Scripts/Controllers/UiManager.cs +++ b/Assets/_Datas/02.Scripts/Controllers/UiManager.cs @@ -73,22 +73,22 @@ public async Task FadeOut() _fadePanel.SetActive(false); } - public void ChangeScene(string previousSceneName, string changeSceneName) + public void ChangeScene(SceneType currentSceneType, SceneType changeSceneType) { - if (previousSceneName == "00.Title") + if (currentSceneType == SceneType.Title) { _titlePanel.SetActive(false); } - else if (previousSceneName == "01.Restaurant") + else if (currentSceneType == SceneType.Restaurant) { } - if (changeSceneName == "00.Title") + if (changeSceneType == SceneType.Title) { _titlePanel.SetActive(true); } - else if (changeSceneName == "01.Restaurant") + else if (changeSceneType == SceneType.Restaurant) { } diff --git a/Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta b/Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta index b9e4aff5a..01ba4302a 100644 --- a/Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta +++ b/Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta @@ -4,9 +4,9 @@ SpriteAtlasImporter: externalObjects: {} textureSettings: serializedVersion: 2 - anisoLevel: 1 - compressionQuality: 50 - maxTextureSize: 2048 + anisoLevel: 0 + compressionQuality: 0 + maxTextureSize: 0 textureCompression: 0 filterMode: 1 generateMipMaps: 0 @@ -17,10 +17,10 @@ SpriteAtlasImporter: packingSettings: serializedVersion: 2 padding: 4 - blockOffset: 1 + blockOffset: 0 allowAlphaSplitting: 0 - enableRotation: 1 - enableTightPacking: 1 + enableRotation: 0 + enableTightPacking: 0 enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1