From 7212ae5d85eaa718b78a9c49c163f5823c994369 Mon Sep 17 00:00:00 2001 From: HaeinLEE Date: Thu, 17 Apr 2025 11:38:18 +0900 Subject: [PATCH] =?UTF-8?q?[Feat]=20=EC=B9=A8=EB=8C=80,=20=EC=8B=B1?= =?UTF-8?q?=ED=81=AC=EB=8C=80,=20=EB=83=89=EC=9E=A5=EA=B3=A0=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LIN/DailyRoutine.meta | 8 ++++++++ Assets/LIN/DailyRoutine/DailyRoutineBed.cs | 16 ++++++++++++++++ .../{ => DailyRoutine}/DailyRoutineBed.cs.meta | 0 .../DailyRoutineController.cs} | 6 +++--- .../DailyRoutineController.cs.meta} | 0 Assets/LIN/DailyRoutine/DailyRoutineFridge.cs | 16 ++++++++++++++++ .../LIN/DailyRoutine/DailyRoutineFridge.cs.meta | 11 +++++++++++ Assets/LIN/DailyRoutine/DailyRoutineSink.cs | 16 ++++++++++++++++ Assets/LIN/DailyRoutine/DailyRoutineSink.cs.meta | 11 +++++++++++ Assets/LIN/DailyRoutine/IDailyRoutine.cs | 8 ++++++++ .../LIN/{ => DailyRoutine}/IDailyRoutine.cs.meta | 0 Assets/LIN/DailyRoutineBed.cs | 11 ----------- Assets/LIN/IDailyRoutine.cs | 7 ------- 13 files changed, 89 insertions(+), 21 deletions(-) create mode 100644 Assets/LIN/DailyRoutine.meta create mode 100644 Assets/LIN/DailyRoutine/DailyRoutineBed.cs rename Assets/LIN/{ => DailyRoutine}/DailyRoutineBed.cs.meta (100%) rename Assets/LIN/{LifeRoutineController.cs => DailyRoutine/DailyRoutineController.cs} (65%) rename Assets/LIN/{LifeRoutineController.cs.meta => DailyRoutine/DailyRoutineController.cs.meta} (100%) create mode 100644 Assets/LIN/DailyRoutine/DailyRoutineFridge.cs create mode 100644 Assets/LIN/DailyRoutine/DailyRoutineFridge.cs.meta create mode 100644 Assets/LIN/DailyRoutine/DailyRoutineSink.cs create mode 100644 Assets/LIN/DailyRoutine/DailyRoutineSink.cs.meta create mode 100644 Assets/LIN/DailyRoutine/IDailyRoutine.cs rename Assets/LIN/{ => DailyRoutine}/IDailyRoutine.cs.meta (100%) delete mode 100644 Assets/LIN/DailyRoutineBed.cs delete mode 100644 Assets/LIN/IDailyRoutine.cs diff --git a/Assets/LIN/DailyRoutine.meta b/Assets/LIN/DailyRoutine.meta new file mode 100644 index 00000000..884a0f2d --- /dev/null +++ b/Assets/LIN/DailyRoutine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f483f83ac9776d34c9bbbc1b84f32c27 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/DailyRoutine/DailyRoutineBed.cs b/Assets/LIN/DailyRoutine/DailyRoutineBed.cs new file mode 100644 index 00000000..8931d110 --- /dev/null +++ b/Assets/LIN/DailyRoutine/DailyRoutineBed.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DailyRoutineBed : DailyRoutine +{ + public override void RoutineEnter() + { + Debug.Log("Its a Bed"); + } + + protected override void RoutineConfirm() + { + //숙면: 시간 계산, 8시간 이상시 체력 완충, 미만시 강제기상 체력 회복 + } +} diff --git a/Assets/LIN/DailyRoutineBed.cs.meta b/Assets/LIN/DailyRoutine/DailyRoutineBed.cs.meta similarity index 100% rename from Assets/LIN/DailyRoutineBed.cs.meta rename to Assets/LIN/DailyRoutine/DailyRoutineBed.cs.meta diff --git a/Assets/LIN/LifeRoutineController.cs b/Assets/LIN/DailyRoutine/DailyRoutineController.cs similarity index 65% rename from Assets/LIN/LifeRoutineController.cs rename to Assets/LIN/DailyRoutine/DailyRoutineController.cs index 1020e620..79f720bd 100644 --- a/Assets/LIN/LifeRoutineController.cs +++ b/Assets/LIN/DailyRoutine/DailyRoutineController.cs @@ -5,14 +5,14 @@ using UnityEngine; using UnityEngine.Serialization; [RequireComponent(typeof(Rigidbody))] -public class LifeRoutineController : MonoBehaviour +public class DailyRoutineController : MonoBehaviour { [SerializeField] LayerMask furnitureLayerMask; - private void OnTriggerEnter(Collider other) + private void OnCollisionEnter(Collision other) { if (furnitureLayerMask == (furnitureLayerMask | (1 << other.gameObject.layer))) { - other.GetComponent().EventEnter(); + other.gameObject.GetComponent().RoutineEnter(); } } } diff --git a/Assets/LIN/LifeRoutineController.cs.meta b/Assets/LIN/DailyRoutine/DailyRoutineController.cs.meta similarity index 100% rename from Assets/LIN/LifeRoutineController.cs.meta rename to Assets/LIN/DailyRoutine/DailyRoutineController.cs.meta diff --git a/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs b/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs new file mode 100644 index 00000000..3a886358 --- /dev/null +++ b/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DailyRoutineFridge : DailyRoutine +{ + public override void RoutineEnter() + { + Debug.Log("Its a Fridge"); + } + + protected override void RoutineConfirm() + { + // 던전입장 : 시간3, 체력3 소모 후 씬 전환 + } +} diff --git a/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs.meta b/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs.meta new file mode 100644 index 00000000..7c4ae5d0 --- /dev/null +++ b/Assets/LIN/DailyRoutine/DailyRoutineFridge.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9c8e3fe029f4fca43a82d71cd49837ae +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/DailyRoutine/DailyRoutineSink.cs b/Assets/LIN/DailyRoutine/DailyRoutineSink.cs new file mode 100644 index 00000000..6823975e --- /dev/null +++ b/Assets/LIN/DailyRoutine/DailyRoutineSink.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DailyRoutineSink : DailyRoutine +{ + public override void RoutineEnter() + { + Debug.Log("Its a Sink"); + } + + protected override void RoutineConfirm() + { + //식사: 1시간 소모 1체력 회복 + } +} diff --git a/Assets/LIN/DailyRoutine/DailyRoutineSink.cs.meta b/Assets/LIN/DailyRoutine/DailyRoutineSink.cs.meta new file mode 100644 index 00000000..49ec7f8b --- /dev/null +++ b/Assets/LIN/DailyRoutine/DailyRoutineSink.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61d920882ed2121428f4e61450f51ef1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/DailyRoutine/IDailyRoutine.cs b/Assets/LIN/DailyRoutine/IDailyRoutine.cs new file mode 100644 index 00000000..a14e4adc --- /dev/null +++ b/Assets/LIN/DailyRoutine/IDailyRoutine.cs @@ -0,0 +1,8 @@ + +using UnityEngine; + +public abstract class DailyRoutine +{ + public abstract void RoutineEnter(); + protected abstract void RoutineConfirm(); +} \ No newline at end of file diff --git a/Assets/LIN/IDailyRoutine.cs.meta b/Assets/LIN/DailyRoutine/IDailyRoutine.cs.meta similarity index 100% rename from Assets/LIN/IDailyRoutine.cs.meta rename to Assets/LIN/DailyRoutine/IDailyRoutine.cs.meta diff --git a/Assets/LIN/DailyRoutineBed.cs b/Assets/LIN/DailyRoutineBed.cs deleted file mode 100644 index effec7df..00000000 --- a/Assets/LIN/DailyRoutineBed.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class DailyRoutineBed : MonoBehaviour, IDailyRoutine -{ - public void EventEnter() - { - Debug.Log("Its a Bed"); - } -} diff --git a/Assets/LIN/IDailyRoutine.cs b/Assets/LIN/IDailyRoutine.cs deleted file mode 100644 index 33dcc26d..00000000 --- a/Assets/LIN/IDailyRoutine.cs +++ /dev/null @@ -1,7 +0,0 @@ - -using UnityEngine; - -public interface IDailyRoutine -{ - public void EventEnter(); -}