Commit Graph

10 Commits

Author SHA1 Message Date
793f4a818f Normalize line endings to LF for JSON files 2025-08-12 02:45:00 +09:00
d8f0acaa55 Merge branch 'develop' into feature/fix_googleSheet
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/Group.asset
2025-08-12 02:20:11 +09:00
2228efe47d 에셋 변경 2025-08-11 23:42:26 +09:00
561a1a4563 레스토랑 프랍 수정8 2025-08-08 18:13:59 +09:00
Jeonghyeon Ha
ddb8e499c3 프리팹 글로벌 일루미네이션 레이어 반영 2025-08-07 20:03:04 +09:00
NTG_Lenovo
2982542c91 Merge remote-tracking branch 'origin/feature/restaurant_management_ui' into develop 2025-08-04 11:14:53 +09:00
ce1b220f9b 리소스 최신화 2025-08-04 05:13:46 +09:00
83966bc5a2 레스토랑 프랍 수정3 2025-08-04 02:12:34 +09:00
Jeonghyeon Ha
3ef3ff171d Merge branch 'feature/env_pbr_enhancement' into develop
# Conflicts:
#	Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Coral/Coral_SkeletonData.asset
#	Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Coral/Coral_SkeletonData.asset.meta
#	Assets/_DDD/Restaurant/Environments/Props/_old/Spines/SummerGrass01/SummerGrass01_SkeletonData.asset
#	Assets/_DDD/Restaurant/Environments/Props/_old/Spines/SummerGrass01/SummerGrass01_SkeletonData.asset.meta
2025-07-31 12:37:20 +09:00
Jeonghyeon Ha
34f6df59cf DDD-73 레스토랑 스테이징 준비 2025-07-31 12:34:34 +09:00