NTG c85504e8f8 Merge remote-tracking branch 'origin/feature/cook_ui' into develop ... # Conflicts: # Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab # Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs # Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs		2025-08-28 20:03:53 +09:00
..
Geometry	Remove ignored files from the repository	2025-08-13 12:56:52 +09:00
Ground	Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/restaurant_npc	2025-08-12 21:50:09 +09:00
Item	환경 프리팹 머티리얼 수정 - Opaque	2025-08-12 14:09:22 +09:00
Parts	횃불 프레임 수정	2025-08-19 18:19:00 +09:00
Prop	Merge remote-tracking branch 'origin/feature/cook_ui' into develop	2025-08-28 20:03:53 +09:00
Geometry.meta	환경 프리팹 머티리얼 수정 - Opaque	2025-08-12 14:09:22 +09:00
Ground.meta	환경 프리팹 머티리얼 수정 - Opaque	2025-08-12 14:09:22 +09:00
Item.meta	환경 프리팹 머티리얼 수정 - Opaque	2025-08-12 14:09:22 +09:00
Parts.meta	레스토랑 프랍 수정8	2025-08-08 18:13:59 +09:00
Prop.meta	환경 프리팹 머티리얼 수정 - Opaque	2025-08-12 14:09:22 +09:00