From 5a9482fdbc9cacae435c15ec634e8d082fd6fecf Mon Sep 17 00:00:00 2001 From: Sehyeon Date: Fri, 2 May 2025 17:23:54 +0900 Subject: [PATCH] =?UTF-8?q?DEG-124=20[Fix]=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/JAY/Scripts/PlayerController.cs | 7 +++++++ Assets/KSH/DungeonTestScene.unity | 4 ++-- Assets/KSH/ReHousing.unity | 4 ++-- Assets/Scripts/Common/GameManager.cs | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs index 28677f11..1f75cbcb 100644 --- a/Assets/JAY/Scripts/PlayerController.cs +++ b/Assets/JAY/Scripts/PlayerController.cs @@ -1,8 +1,10 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Runtime.CompilerServices; using UnityEditor.TextCore.Text; using UnityEngine; +using UnityEngine.SceneManagement; public enum PlayerState { None, Idle, Move, Win, Hit, Dead } @@ -62,6 +64,11 @@ public class PlayerController : CharacterBase, IObserver hitEffectController = GetComponentInChildren(); PlayerInit(); + + // isBattle 초기화 (임시) + /*bool isHousingScene = SceneManager.GetActiveScene().name.Contains("Housing"); + _isBattle = !isHousingScene; + Debug.Log("_isBattle: " + _isBattle);*/ } private void Update() diff --git a/Assets/KSH/DungeonTestScene.unity b/Assets/KSH/DungeonTestScene.unity index 092d4a60..c989bd81 100644 --- a/Assets/KSH/DungeonTestScene.unity +++ b/Assets/KSH/DungeonTestScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00f0c3d6c23235a6f83ce7bedb6039d9eea0912c97ab6fc1483c7a960331f710 -size 240564 +oid sha256:e8f4c71fd34803f60b2857ac16f2216c6a3983ea0ca835980b44d7b6c9ffc4b3 +size 364214 diff --git a/Assets/KSH/ReHousing.unity b/Assets/KSH/ReHousing.unity index 71147c98..0e6b5a4c 100644 --- a/Assets/KSH/ReHousing.unity +++ b/Assets/KSH/ReHousing.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd8639934b59522601780b9ad75366ad695d2517866f42ddc40ccc4bcb6b1fbb -size 558426 +oid sha256:9e54daa14aeeeec6847639b11d814efaeecf9d8ba89f66ece837b662625ccca0 +size 606383 diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index 0915e1c0..a5f209b6 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -80,7 +80,8 @@ public partial class GameManager : Singleton private void OnDestroy() { - PlayerStats.Instance.OnDayEnded -= AdvanceDay; // 이벤트 구독 해제 + if(PlayerStats.Instance != null) + PlayerStats.Instance.OnDayEnded -= AdvanceDay; // 이벤트 구독 해제 } private void OnApplicationQuit()