From b626a1b5e68c888b2994827a74c77b5562e9cf87 Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Wed, 29 Apr 2026 15:55:42 +0900 Subject: [PATCH] =?UTF-8?q?2026-04-29=20=EC=9D=8C=EC=8B=9D=EC=84=AD?= =?UTF-8?q?=EC=B7=A8=20-=20=ED=8F=AC=EB=A7=8C=EA=B0=90=20=EC=97=B0?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/MyProject/GameScene.unity | 4 ++-- Assets/02_Scripts/Item/TastingSample.cs | 23 ++++++++++++++----- .../Foods/Mandu/Prefabs/Mandu.prefab | 4 ++-- .../Puff pastry/Prefabs/Puff pastry.prefab | 4 ++-- .../03_Models/Foods/Susi/Prefabs/Susi.prefab | 4 ++-- Assets/08_Data/Foods/Food_Mandu.asset | 2 +- Assets/08_Data/Foods/Food_PuffPastry.asset | 2 +- Assets/08_Data/Foods/Food_Susi.asset | 2 +- Assets/10_Audio/MainMixer.mixer | 3 ++- Assets/10_Audio/SFX/EatingFood.wav | 3 --- Assets/10_Audio/SFX/SFX_EatingFood.wav | 3 +++ ...gFood.wav.meta => SFX_EatingFood.wav.meta} | 2 +- 12 files changed, 34 insertions(+), 22 deletions(-) delete mode 100644 Assets/10_Audio/SFX/EatingFood.wav create mode 100644 Assets/10_Audio/SFX/SFX_EatingFood.wav rename Assets/10_Audio/SFX/{EatingFood.wav.meta => SFX_EatingFood.wav.meta} (91%) diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 8508aeb7..d210b2d9 100644 --- a/Assets/01_Scenes/MyProject/GameScene.unity +++ b/Assets/01_Scenes/MyProject/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fb3c31f14fb2ef816924d4c9f669f4afa58b008948fc062325288501bc522be -size 13858020 +oid sha256:addf2c88ef8bf769863205517ef481859a9790b085ae6fead55923fe12ee5355 +size 13868804 diff --git a/Assets/02_Scripts/Item/TastingSample.cs b/Assets/02_Scripts/Item/TastingSample.cs index ba012346..7bf22737 100644 --- a/Assets/02_Scripts/Item/TastingSample.cs +++ b/Assets/02_Scripts/Item/TastingSample.cs @@ -19,13 +19,11 @@ public class TastingSample : MonoBehaviour [SerializeField] private bool _requireGrabbed = true; private XRGrabInteractable _grab; - private AudioSource _sfxSource; private bool _consumed; private void Awake() { _grab = GetComponent(); - _sfxSource = GetComponent(); } private void Update() @@ -42,19 +40,32 @@ private void Update() private void Consume() { + var interactor = _grab.firstInteractorSelecting as MonoBehaviour; + _consumed = true; // 손에서 강제 해제 (잡혀있던 상태로 Destroy되면 XRI 경고) if (_grab != null && _grab.isSelected && _grab.interactionManager != null) _grab.interactionManager.CancelInteractableSelection((UnityEngine.XR.Interaction.Toolkit.Interactables.IXRSelectInteractable)_grab); - // SFX 재생 후 파괴 (사운드 길이 고려) - var sfx = _foodData.EatSfx; - if (sfx != null) + PlayerHunger hunger = interactor != null ? interactor.GetComponentInParent() : null; + if(hunger != null) { - AudioSource.PlayClipAtPoint(sfx, transform.position); + hunger.Eat(_foodData.HungerRestoreAmount); } + // VFX/SFX는 임시 오브젝트로 분리 재생 — 본체가 즉시 Destroy되어도 끊기지 않음 + if (_foodData.EatVfx != null) + { + var vfx = Instantiate(_foodData.EatVfx, transform.position, Quaternion.identity); + vfx.Play(); + var main = vfx.main; + Destroy(vfx.gameObject, main.duration + main.startLifetime.constantMax); + } + + if (_foodData.EatSfx != null) + AudioSource.PlayClipAtPoint(_foodData.EatSfx, transform.position); + Destroy(gameObject); } } diff --git a/Assets/03_Models/Foods/Mandu/Prefabs/Mandu.prefab b/Assets/03_Models/Foods/Mandu/Prefabs/Mandu.prefab index 41a0dc37..a09c8850 100644 --- a/Assets/03_Models/Foods/Mandu/Prefabs/Mandu.prefab +++ b/Assets/03_Models/Foods/Mandu/Prefabs/Mandu.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75d82223c5b977286ec0c853df5fddebc0b33386e87d2531c0c3b2ad7ce2bdcd -size 17218 +oid sha256:188b3165d343fcb9cf7595b7c23387ba3a3cd69eb0525ac51f6e3110a901b210 +size 19548 diff --git a/Assets/03_Models/Foods/Puff pastry/Prefabs/Puff pastry.prefab b/Assets/03_Models/Foods/Puff pastry/Prefabs/Puff pastry.prefab index e9344c89..aec6df07 100644 --- a/Assets/03_Models/Foods/Puff pastry/Prefabs/Puff pastry.prefab +++ b/Assets/03_Models/Foods/Puff pastry/Prefabs/Puff pastry.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6262c7e62ca9aa3f36a615c3d3b9b8063a81ea16abacbd927ee1b458c9a447d -size 17782 +oid sha256:cb81f3260e05d91d29a9522112ce54542dba38376e6dc4eec915af0c1462a558 +size 20116 diff --git a/Assets/03_Models/Foods/Susi/Prefabs/Susi.prefab b/Assets/03_Models/Foods/Susi/Prefabs/Susi.prefab index 8416f347..bd5c4f2f 100644 --- a/Assets/03_Models/Foods/Susi/Prefabs/Susi.prefab +++ b/Assets/03_Models/Foods/Susi/Prefabs/Susi.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e22aea74c36d21cf310a6b6fc0110239a1bd12a142c5f5e549ebeb22f96cd66 -size 17200 +oid sha256:a864da8f35358cefdf5d75b46218a2e6e530c48fd29a847b6493a695d0870feb +size 19590 diff --git a/Assets/08_Data/Foods/Food_Mandu.asset b/Assets/08_Data/Foods/Food_Mandu.asset index 19b0be67..fc1fac78 100644 --- a/Assets/08_Data/Foods/Food_Mandu.asset +++ b/Assets/08_Data/Foods/Food_Mandu.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c12a35fc76567516fc0db73277266e1caf63bb6221bb3ddb90fc5a3de370e582 +oid sha256:769b2fbe29c82a2d74a2aeddc91c8ee930fd2f84456359783633d81ec6978d69 size 781 diff --git a/Assets/08_Data/Foods/Food_PuffPastry.asset b/Assets/08_Data/Foods/Food_PuffPastry.asset index 99bc9cdb..37d6a96e 100644 --- a/Assets/08_Data/Foods/Food_PuffPastry.asset +++ b/Assets/08_Data/Foods/Food_PuffPastry.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bd7d77a6fab9adc146c459e0b351ce493d32d27faea93ed21d87883bd8ace33 +oid sha256:c7c2dd7a8a50605c212170fb32a9dd905d00f50dbbf52436fdef92208c53e8a1 size 817 diff --git a/Assets/08_Data/Foods/Food_Susi.asset b/Assets/08_Data/Foods/Food_Susi.asset index 7394548b..d527554b 100644 --- a/Assets/08_Data/Foods/Food_Susi.asset +++ b/Assets/08_Data/Foods/Food_Susi.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a04280184cbcbaafd213a1332ad074143d4d5e4ef145b6a13a11dc2ca79b6d83 +oid sha256:1093ad65b63d3774ae6756e0d71a3655a052c271be83d8e91593312809006b18 size 780 diff --git a/Assets/10_Audio/MainMixer.mixer b/Assets/10_Audio/MainMixer.mixer index f69c64e7..c2b99aa1 100644 --- a/Assets/10_Audio/MainMixer.mixer +++ b/Assets/10_Audio/MainMixer.mixer @@ -123,7 +123,8 @@ AudioMixerSnapshotController: m_Name: Snapshot m_AudioMixer: {fileID: 24100000} m_SnapshotID: 57a15260ec480004cbc2848cc0a4f36e - m_FloatValues: {} + m_FloatValues: + ba018e28170e108488d70eb228687256: 10 m_TransitionOverrides: {} --- !u!244 &2045488911297964458 AudioMixerEffectController: diff --git a/Assets/10_Audio/SFX/EatingFood.wav b/Assets/10_Audio/SFX/EatingFood.wav deleted file mode 100644 index 5b652633..00000000 --- a/Assets/10_Audio/SFX/EatingFood.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeb415af3ed0ebbdf71dae87cebb1453e3684410dad02d11b11de8ea0fa45924 -size 516140 diff --git a/Assets/10_Audio/SFX/SFX_EatingFood.wav b/Assets/10_Audio/SFX/SFX_EatingFood.wav new file mode 100644 index 00000000..875af14a --- /dev/null +++ b/Assets/10_Audio/SFX/SFX_EatingFood.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a483965b1e3799682cf3bc1efed0af3fb6cd5d9dfff168f056b772c7063e1e17 +size 65648 diff --git a/Assets/10_Audio/SFX/EatingFood.wav.meta b/Assets/10_Audio/SFX/SFX_EatingFood.wav.meta similarity index 91% rename from Assets/10_Audio/SFX/EatingFood.wav.meta rename to Assets/10_Audio/SFX/SFX_EatingFood.wav.meta index 57050e34..14385a49 100644 --- a/Assets/10_Audio/SFX/EatingFood.wav.meta +++ b/Assets/10_Audio/SFX/SFX_EatingFood.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 17dbbd3089b458c4ebe08efe4be987e8 +guid: f782565ec8f93fb4f881223891b638de AudioImporter: externalObjects: {} serializedVersion: 8