Merge pull request '[Fix] 돌발 이벤트 발생 패널 버그 수정 재작업' (!68) from DEG-178-돌발이벤트패널-재작 into main

Reviewed-on: #68
This commit is contained in:
heain0122 2025-05-15 01:31:16 +00:00
commit 41e047be40
3 changed files with 13 additions and 1 deletions

View File

@ -22,6 +22,14 @@ public class InteractionController : MonoBehaviour
PlayerStats.Instance.SetHousingCanvasController(housingCanvasController); PlayerStats.Instance.SetHousingCanvasController(housingCanvasController);
} }
/// <summary>
/// 출근 후 돌발 이벤트 발생을 위한 구독 취소
/// </summary>
public void ReSetAfterWorkEvent()
{
PlayerStats.Instance.OnWorked -= SuddenAfterWorkEventHappen;
}
// 상호작용 가능한 사물 범위에 들어올 때 // 상호작용 가능한 사물 범위에 들어올 때
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {

View File

@ -13,7 +13,7 @@ public enum AfterWorkEventType
public static class HousingConstants public static class HousingConstants
{ {
//돌발 이벤트 확률 계산 //돌발 이벤트 확률 계산
public static int AFTER_WORK_DENOMINATOR = 2; public static int AFTER_WORK_DENOMINATOR = 4;
//돌발 이벤트 보여줄 시간 //돌발 이벤트 보여줄 시간
public static float SUDDENEVENT_IAMGE_SHOW_TIME = 4.0f; public static float SUDDENEVENT_IAMGE_SHOW_TIME = 4.0f;
//전환효과(Switching) 패널 애니메이션 시간 //전환효과(Switching) 패널 애니메이션 시간

View File

@ -102,6 +102,10 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
public void ChangeToGameScene() public void ChangeToGameScene()
{ {
tryStageCount++; // 던전 시도 횟수 증가 tryStageCount++; // 던전 시도 횟수 증가
InteractionController interactionController = FindObjectOfType<InteractionController>();
interactionController.ReSetAfterWorkEvent();
var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent<SwitchingPanelController>(); var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent<SwitchingPanelController>();
switchingPanel.FadeAndSceneLoad("ReDungeon"); // 던전 Scene switchingPanel.FadeAndSceneLoad("ReDungeon"); // 던전 Scene
HandleSceneAudio("Dungeon"); HandleSceneAudio("Dungeon");