diff --git a/Assets/LIN/DailyRoutine/DailyRoutineBed.cs b/Assets/LIN/DailyRoutine/DailyRoutineBed.cs index 8931d110..64c9719a 100644 --- a/Assets/LIN/DailyRoutine/DailyRoutineBed.cs +++ b/Assets/LIN/DailyRoutine/DailyRoutineBed.cs @@ -4,8 +4,9 @@ using UnityEngine; public class DailyRoutineBed : DailyRoutine { - public override void RoutineEnter() + public void RoutineEnter() { + base.RoutineEnter(); Debug.Log("Its a Bed"); } diff --git a/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs b/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs index 3a886358..929cf37c 100644 --- a/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs +++ b/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs @@ -4,8 +4,9 @@ using UnityEngine; public class DailyRoutineFridge : DailyRoutine { - public override void RoutineEnter() + public void RoutineEnter() { + base.RoutineEnter(); Debug.Log("Its a Fridge"); } diff --git a/Assets/LIN/DailyRoutine/DailyRoutineSink.cs b/Assets/LIN/DailyRoutine/DailyRoutineSink.cs index 6823975e..fba6eb99 100644 --- a/Assets/LIN/DailyRoutine/DailyRoutineSink.cs +++ b/Assets/LIN/DailyRoutine/DailyRoutineSink.cs @@ -4,8 +4,9 @@ using UnityEngine; public class DailyRoutineSink : DailyRoutine { - public override void RoutineEnter() + public void RoutineEnter() { + base.RoutineEnter(); Debug.Log("Its a Sink"); } diff --git a/Assets/LIN/DailyRoutine/IDailyRoutine.cs b/Assets/LIN/DailyRoutine/IDailyRoutine.cs index a14e4adc..7d66fb8e 100644 --- a/Assets/LIN/DailyRoutine/IDailyRoutine.cs +++ b/Assets/LIN/DailyRoutine/IDailyRoutine.cs @@ -1,8 +1,13 @@  +using System; using UnityEngine; -public abstract class DailyRoutine +public abstract class DailyRoutine:MonoBehaviour { - public abstract void RoutineEnter(); + public void RoutineEnter() + { + //TODO: 플레이어 이동 방지, 팝업 + } + protected abstract void RoutineConfirm(); } \ No newline at end of file diff --git a/Assets/LIN/Housing Copy.unity b/Assets/LIN/Housing Copy.unity index 9114e475..ed9cccaf 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:c29b9de69a239dd38b9e4277e129e86117dc680dfcb862d7c898ad5eebae8dec -size 120900 +oid sha256:3e55c26db98f1ec4e7a9955efaf467cb1069e2ee797fd5b677ad0229497cfd58 +size 130048