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
.junie	Merge branch 'feature/restaurant_run_customer' into develop	2025-08-20 10:45:37 +09:00
Assets	Merge remote-tracking branch 'origin/feature/cook_ui' into develop	2025-08-28 20:03:53 +09:00
Packages	cook ui 작업 중	2025-08-26 18:56:40 +09:00
ProjectSettings	payload 롤백	2025-08-27 13:18:44 +09:00
ServerData/StandaloneWindows64	re-index all files: apply corrected LFS tracking	2025-07-08 19:46:31 +09:00
.aiignore	added ai guideline	2025-08-19 14:12:48 +09:00
.editorconfig	re-index all files: apply corrected LFS tracking	2025-07-08 19:46:31 +09:00
.gitattributes	gitattribute unity smart merge (unityYamlMerge) 추가	2025-08-28 19:12:38 +09:00
.gitignore	gitignore 수정	2025-08-19 19:26:34 +09:00