From ea5d822687255f132217887c455592746b74822a Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Wed, 2 Jul 2025 13:50:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=94=AC=20=EB=A6=AC=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EB=B0=A9?= =?UTF-8?q?=EC=8B=9D=20->=20=EA=B2=8C=EC=9E=84=EB=A7=A4=EB=8B=88=EC=A0=80?= =?UTF-8?q?=EB=A1=9C=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_Datas/01.Scenes/01.Restaurant.unity | 13 +++++---- .../02.Scripts/Controllers/CameraManager.cs | 28 +++---------------- .../02.Scripts/Controllers/GameManager.cs | 5 +++- .../02.Scripts/Controllers/KeyManager.cs | 18 +++--------- .../02.Scripts/Controllers/UiManager.cs | 3 +- .../Addressables/Sprites.spriteatlasv2.meta | 12 ++++---- .../Sprites/Items.spriteatlasv2.meta | 12 ++++---- 7 files changed, 33 insertions(+), 58 deletions(-) diff --git a/Assets/_Datas/01.Scenes/01.Restaurant.unity b/Assets/_Datas/01.Scenes/01.Restaurant.unity index 50b91604d..dfa1702be 100644 --- a/Assets/_Datas/01.Scenes/01.Restaurant.unity +++ b/Assets/_Datas/01.Scenes/01.Restaurant.unity @@ -2526,12 +2526,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 620909d88f805ee4898b9af964a7f0e8, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: 7 - k__BackingField: 1 - k__BackingField: 20 - k__BackingField: 0.2 - k__BackingField: 0.5 + _moveSpeed: 7 + _moveSpeedMultiplier: 1 + _dashSpeed: 20 + _dashTime: 0.2 + _dashCooldown: 0.5 _dashParticle: {fileID: 0} + _walkingSfxName: TycoonPlayerWalking _dashSfxName: TycoonPlayerDashing cellManager: {fileID: 1015166837} --- !u!114 &985479691 @@ -2601,7 +2602,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1015166833 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_Datas/02.Scripts/Controllers/CameraManager.cs b/Assets/_Datas/02.Scripts/Controllers/CameraManager.cs index f1c8bd922..c8a34bc4a 100644 --- a/Assets/_Datas/02.Scripts/Controllers/CameraManager.cs +++ b/Assets/_Datas/02.Scripts/Controllers/CameraManager.cs @@ -15,7 +15,7 @@ public enum CameraType public class CameraManager : Singleton { - [ShowInInspector] + [ShowInInspector, ReadOnly] private Dictionary _cameraDict; private CinemachineBrain _cinemachineBrain; @@ -27,28 +27,10 @@ protected override void OnAwake() _cinemachineBrain = GetComponent(); } - private void Start() + public void ChangeScene(string sceneName) { - SceneManager.sceneLoaded += OnSceneLoaded; - } - - private void OnDestroy() - { - SceneManager.sceneLoaded -= OnSceneLoaded; - } - - private void OnSceneLoaded(Scene scene, LoadSceneMode mode) - { - _ = RegisterCinemachineCamerasAsync(scene); - } - - private async Task RegisterCinemachineCamerasAsync(Scene scene) - { - // 씬 로딩 직후는 Hierarchy 반영이 완료되지 않았을 수 있음 - await Task.Yield(); // 다음 프레임까지 대기 - var foundCams = FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None); - _cameraDict.Clear(); + _cameraDict = new Dictionary(foundCams.Length); foreach (var cam in foundCams) { @@ -63,9 +45,7 @@ private async Task RegisterCinemachineCamerasAsync(Scene scene) } } - Debug.Log("[CameraManager] 카메라 등록 완료"); - - if (scene.name == "01.Restaurant") + if (sceneName == "01.Restaurant") { SwitchCamera(CameraType.BaseCam); } diff --git a/Assets/_Datas/02.Scripts/Controllers/GameManager.cs b/Assets/_Datas/02.Scripts/Controllers/GameManager.cs index abad7d955..7bcc34744 100644 --- a/Assets/_Datas/02.Scripts/Controllers/GameManager.cs +++ b/Assets/_Datas/02.Scripts/Controllers/GameManager.cs @@ -36,13 +36,16 @@ public async Task ChangeScene(SceneName sceneName) while (loadSceneAsync is { isDone: false }) await Task.Yield(); + // 씬 로딩 후 초기화 작업 UiManager.Instance.ChangeScene(previousSceneName, changeSceneName); + CameraManager.Instance.ChangeScene(changeSceneName); + KeyManager.Instance.ChangeScene(changeSceneName); await Task.Delay(1000); await UiManager.Instance.FadeOut(); - Debug.Log($"씬 로드 및 전환 완료: {changeSceneName}"); + Debug.Log($"{changeSceneName} 씬으로 전환 완료"); } public void ChangeSceneByIndex(int index) diff --git a/Assets/_Datas/02.Scripts/Controllers/KeyManager.cs b/Assets/_Datas/02.Scripts/Controllers/KeyManager.cs index 517862aa2..b77c363a4 100644 --- a/Assets/_Datas/02.Scripts/Controllers/KeyManager.cs +++ b/Assets/_Datas/02.Scripts/Controllers/KeyManager.cs @@ -24,24 +24,14 @@ public class KeyManager : Singleton protected override void OnAwake() { + base.OnAwake(); + _currentPlayerInput = GetComponent(); } - - private void Start() - { - SceneManager.sceneLoaded += OnSceneLoaded; - } - - private void OnDestroy() - { - SceneManager.sceneLoaded -= OnSceneLoaded; - } - private void OnSceneLoaded(Scene scene, LoadSceneMode mode) + public void ChangeScene(string sceneName) { - string currentSceneName = SceneManager.GetActiveScene().name; - - switch (currentSceneName) + switch (sceneName) { case "00.Title": SwitchCurrentActionMap(InputActionMaps.Ui); diff --git a/Assets/_Datas/02.Scripts/Controllers/UiManager.cs b/Assets/_Datas/02.Scripts/Controllers/UiManager.cs index 0f692381a..c3e573afe 100644 --- a/Assets/_Datas/02.Scripts/Controllers/UiManager.cs +++ b/Assets/_Datas/02.Scripts/Controllers/UiManager.cs @@ -67,8 +67,9 @@ public async Task FadeOut() } _fadeOut.Restart(); + await _fadeOut.AsyncWaitForCompletion(); - + _fadePanel.SetActive(false); } diff --git a/Assets/_Datas/Addressables/Sprites.spriteatlasv2.meta b/Assets/_Datas/Addressables/Sprites.spriteatlasv2.meta index 094ab7344..fc399db44 100644 --- a/Assets/_Datas/Addressables/Sprites.spriteatlasv2.meta +++ b/Assets/_Datas/Addressables/Sprites.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 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