ProjectDDD/Assets/_DDD/Restaurant/Environments/Props
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
..
_old Merge branch 'feature/env_pbr_enhancement' into develop 2025-07-31 12:37:20 +09:00
Barrel DDD-73 레스토랑 스테이징 준비 2025-07-31 12:34:34 +09:00
_old.meta DDD-73 레스토랑 스테이징 준비 2025-07-31 12:34:34 +09:00
Barrel.meta DDD-73 레스토랑 스테이징 준비 2025-07-31 12:34:34 +09:00
Prop_Barrel.prefab DDD-73 레스토랑 스테이징 준비 2025-07-31 12:34:34 +09:00
Prop_Barrel.prefab.meta DDD-73 레스토랑 스테이징 준비 2025-07-31 12:34:34 +09:00