diff --git a/Assets/LIN/DailyRoutine/InteractionController.cs b/Assets/LIN/DailyRoutine/InteractionController.cs index 6f27f3e3..a648e294 100644 --- a/Assets/LIN/DailyRoutine/InteractionController.cs +++ b/Assets/LIN/DailyRoutine/InteractionController.cs @@ -14,7 +14,12 @@ public class InteractionController : MonoBehaviour [SerializeField] HousingCanvasController housingCanvasController; private SuddenEventController _suddenEventController = new SuddenEventController(); - + + private void Start() + { + playerStats.OnWorked += SuddenAfterWorkEventHappen(); + } + // 상호작용 가능한 사물 범위에 들어올 때 private void OnTriggerEnter(Collider other) { @@ -46,9 +51,6 @@ public class InteractionController : MonoBehaviour if (playerStats.CanPerformByHealth(interactionType)) { playerStats.PerformAction(interactionType); - // 출퇴근에 해당하는 돌발 이벤트 호출 - if (interactionType != ActionType.Work) return; - playerStats.OnWorked += SuddenAfterWorkEventHappen(); } else { @@ -65,6 +67,7 @@ public class InteractionController : MonoBehaviour public Action SuddenAfterWorkEventHappen() { + Debug.Log("돌발이벤트 발생"); AfterWorkEvent afterWorkEvent = _suddenEventController.SuddenEventCalculator(); if (afterWorkEvent == AfterWorkEvent.None) return null; diff --git a/Assets/LIN/Housing Copy.unity b/Assets/LIN/Housing Copy.unity index 5794cb66..cf259123 100644 --- a/Assets/LIN/Housing Copy.unity +++ b/Assets/LIN/Housing Copy.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c1020d5e41346999f3bc88023790dc56428343ff0d087831367e6c2a0b5003b +oid sha256:8f764336a02a303a122209f43a83c7d017262b0f322f2024075f668031752b57 size 161697 diff --git a/Assets/LIN/HousingCanvasController.cs b/Assets/LIN/HousingCanvasController.cs index 53848740..c1fd10aa 100644 --- a/Assets/LIN/HousingCanvasController.cs +++ b/Assets/LIN/HousingCanvasController.cs @@ -84,6 +84,7 @@ public class HousingCanvasController : MonoBehaviour suddenPanel.SetActive(false); suddenText.text = ""; OnSuddenButtonPressed -= OnSuddenButtonPressed; + Debug.Log(OnSuddenButtonPressed); } public void OnSuddenConfirmButton() { diff --git a/Assets/LIN/HousingConstants.cs b/Assets/LIN/HousingConstants.cs index e00ff3c2..ee2e457b 100644 --- a/Assets/LIN/HousingConstants.cs +++ b/Assets/LIN/HousingConstants.cs @@ -12,7 +12,6 @@ public enum AfterWorkEvent public static class HousingConstants { //돌발 이벤트 확률 계산 - public static int SUDDEN_EVENT_DENOMINATOR = 5; public static int AFTER_WORK_DENOMINATOR = 4;