Commit Graph

79 Commits

Author SHA1 Message Date
793f4a818f Normalize line endings to LF for JSON files 2025-08-12 02:45:00 +09:00
b1d58e5259 Ignore all files under AssetGroups 2025-08-12 02:41:06 +09:00
7084281303 Ignore Addressables Group files only 2025-08-12 02:27:14 +09:00
d8f0acaa55 Merge branch 'develop' into feature/fix_googleSheet
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/Group.asset
2025-08-12 02:20:11 +09:00
b103ea6af0 구글 시트 연동 아키텍쳐 분리 2025-08-12 02:16:42 +09:00
2228efe47d 에셋 변경 2025-08-11 23:42:26 +09:00
561a1a4563 레스토랑 프랍 수정8 2025-08-08 18:13:59 +09:00
NTG_Lenovo
ef5688f5b8 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/restaurant_npc 2025-08-07 20:07:29 +09:00
Jeonghyeon Ha
ddb8e499c3 프리팹 글로벌 일루미네이션 레이어 반영 2025-08-07 20:03:04 +09:00
a5741b33f4 레스토랑 프랍 수정7 2025-08-06 20:27:00 +09:00
0facf720fb 레스토랑 프랍 수정6 2025-08-06 19:35:23 +09:00
NTG_Lenovo
1a48a45683 에셋 변경 2025-08-06 18:58:09 +09:00
NTG_Lenovo
d930358fe5 파일 및 폴더 변경 2025-08-06 17:58:45 +09:00
45b996f743 태건님이 시켰음 2025-08-06 15:28:39 +09:00
ec1372748b Merge remote-tracking branch 'origin/develop' into develop 2025-08-06 15:20:23 +09:00
d875e188c9 레스토랑 프랍 수정5 2025-08-06 14:45:53 +09:00
NTG_Lenovo
c52728c401 요리도구 아이콘 추가 2025-08-06 11:41:33 +09:00
2280b33f2d 씬 수정 2025-08-05 20:20:21 +09:00
ae852a493f 정상화의 신 2025-08-05 20:16:27 +09:00
NTG_Lenovo
6b8be61a88 에셋 변경 2025-08-05 19:58:56 +09:00
18876c854f Merge branch 'develop' into feature/autocreate_texture 2025-08-05 10:21:35 +00:00
NTG_Lenovo
669ddf3305 팝업 UI 수정 중 2025-08-04 20:01:43 +09:00
NTG_Lenovo
bd3311193e Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/restaurant_management_ui 2025-08-04 14:35:02 +09:00
NTG_Lenovo
31e9145664 리소스 변경ㅇ 2025-08-04 14:34:55 +09:00
NTG_Lenovo
a0ff5165a4 에셋 수정 2025-08-04 11:33:22 +09:00
NTG_Lenovo
9287e4385e Merge remote-tracking branch 'origin/develop' into feature/fix_scenemanager 2025-08-04 11:27:49 +09:00
NTG_Lenovo
8a99f088ff ui 위치 변경 2025-08-04 10:18:18 +09:00
ce1b220f9b 리소스 최신화 2025-08-04 05:13:46 +09:00
83966bc5a2 레스토랑 프랍 수정3 2025-08-04 02:12:34 +09:00
NTG_Lenovo
e33bef85ec 에셋 추가 2025-08-01 17:30:50 +09:00
NTG_Lenovo
3772d339c0 so 데이터 변경 2025-08-01 14:42:45 +09:00
NTG_Lenovo
6f352858a3 Merge remote-tracking branch 'origin/develop' into feature/restaurant_management_ui 2025-07-31 19:09:37 +09:00
NTG_Lenovo
f1c03eea80 raw 폴더 최신화 2025-07-31 19:05:37 +09:00
Jeonghyeon Ha
9037d662f4 Quad 메시 추가 2025-07-31 17:41:10 +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
Jeonghyeon Ha
f9da2c2a64 Merge branch 'feature/event_default_impl' into feature/env_pbr_enhancement 2025-07-30 19:22:55 +09:00
NTG_Lenovo
cbc1d6982d DataManager 로직 변경 및 구글 시트 데이터 최신화 2025-07-30 18:42:33 +09:00
4b3e6187ff 폴더 정리 2025-07-30 03:18:16 +09:00
13c4f4be7c 메뉴 Ui 1차 완성 2025-07-30 00:56:47 +09:00
NTG_Lenovo
555126662e ui 작업중 2025-07-28 20:33:04 +09:00
Jeonghyeon Ha
3d21d47e51 PBR 테스트 2025-07-28 12:01:50 +09:00
698fa977f4 ui 작업중 2025-07-28 07:55:07 +09:00
632ce9c565 구글 시트 데이터 최신화 2025-07-28 06:17:04 +09:00
0630680f5e 에셋 추가 2025-07-28 04:51:20 +09:00
NTG_Lenovo
b6ee7274dd ui 작업 중 2025-07-25 16:58:53 +09:00
NTG_Lenovo
53dd1130d4 구글 시트 데이터 최신화 2025-07-24 17:45:02 +09:00
NTG_Lenovo
e4a23dd190 Merge branch 'feature/event_default_impl' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/restaurant_management_ui 2025-07-24 17:41:27 +09:00
NTG_Lenovo
952f993b8d Ui 작업중 2025-07-24 17:41:20 +09:00
NTG_Lenovo
ad6f8fa409 에셋, 메타데이터 추가 2025-07-23 12:27:46 +09:00