Commit Graph

72 Commits

Author SHA1 Message Date
c0574abb80 설정수정 2026-06-26 13:18:33 +09:00
29f21a130e 제페토룸2 2026-06-26 12:57:14 +09:00
2c81a66c18 2026-06-26 제페토룸 2026-06-26 12:56:48 +09:00
32cba89ad4 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 19:39:47 +09:00
1e4129ca44 마지막씬 추가 2026-06-25 19:39:45 +09:00
dldydtn9755-crypto
5e8e6d583c ㅇㅇ 2026-06-25 18:43:18 +09:00
782f856462 글로벌 매니저프리팹 2026-06-25 18:14:06 +09:00
1807014792 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 17:36:11 +09:00
f1b68b0e71 기억의조각 UI버튼 간헐적으로 안눌리는 현상수정 2026-06-25 17:35:43 +09:00
dldydtn9755-crypto
2aebeb1e9f 제페토 첫씬 끝 2026-06-25 17:28:18 +09:00
dldydtn9755-crypto
246afce4c4 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity
2026-06-25 16:44:47 +09:00
dldydtn9755-crypto
37d705d3c9 ㅈ페ㅔ 2026-06-25 16:43:58 +09:00
af6330cb1f 기억의조각 효과음 추가 2026-06-25 15:41:20 +09:00
51288052b7 2026-06-25 문제사항 수정 2026-06-25 13:12:20 +09:00
dldydtn9755-crypto
9597cbe8d2 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset
2026-06-25 12:09:19 +09:00
afc1043637 2026-06-25 캣룸완성 2026-06-25 11:04:19 +09:00
dldydtn9755-crypto
f199e36946 제페토 2026-06-25 09:57:43 +09:00
da5e4a0ad0 후크선장 문제 2026-06-23 19:43:43 +09:00
9626fe5cb9 누락사항 2026-06-23 18:26:33 +09:00
b85855d4d6 게임클리어 이벤트 2026-06-23 17:03:38 +09:00
f5a93875f6 2026-06-23 클리어시 문생성 (진행중) 2026-06-23 11:00:03 +09:00
28d33f233e 2026-06-22 대화창 위치 수정 2026-06-22 13:12:53 +09:00
3575022478 2026-06-22 캐릭터 영역별 스크립트 2026-06-22 12:57:29 +09:00
483e3c89f8 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-22 11:37:18 +09:00
ab18ef19f5 Merge pull request '게이트 이동 시스템 추가 및 기존 이동 매니저 정리' (#8) from feature/hyeonsu-gate into main
Reviewed-on: #8
2026-06-22 02:36:25 +00:00
3ff479e357 대화로직 수정중 2026-06-22 11:32:17 +09:00
dldydtn9755-crypto
6fc20431e8 게이트 이동 시스템 추가 및 기존 이동 매니저 정리 2026-06-22 11:28:53 +09:00
8c764be378 파티클 재수정 2026-06-20 17:38:52 +09:00
b90f996d14 파티클 수정 2026-06-20 17:35:54 +09:00
f85ea1ffc1 2026-06-20 뉴페어리 마테리얼 수정 2026-06-20 17:33:30 +09:00
skrwns304@gmail.com
779560591d aaa 2026-06-19 18:23:38 +09:00
3d882fcc8c 2026-06-19 월드다이얼로그 프로토타입 2026-06-19 17:58:22 +09:00
711c9a5986 대화 프로토타입 2026-06-19 17:09:36 +09:00
2af5ba1357 2026-06-19 다이얼로그 그래프툴 2026-06-19 15:30:42 +09:00
27d56d582e Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-18 18:09:15 +09:00
f69d0ef273 2026-06-18 앉기 UI등등 2026-06-18 18:09:08 +09:00
HIHIHIHIHIHIzz
728837b3a7 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-18 17:09:13 +09:00
HIHIHIHIHIHIzz
8026a5be80 up 2026-06-18 17:09:07 +09:00
83b3c4a27c 2026-06-18 리듬게임 자동스틱 2026-06-18 16:26:40 +09:00
1cbd9ac094 2026-06-18 자동관련 2026-06-18 15:50:22 +09:00
67c2b2c179 2026-06-18 많은 플레이어 수정사항 2026-06-18 15:07:21 +09:00
dff151c5f0 2026-06-18 손 누락사항 2026-06-18 11:31:43 +09:00
eadd16b433 2026-06-18 고양이룸 터레인 수정 2026-06-18 11:13:08 +09:00
241a9b2bee Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-17 19:06:16 +09:00
997c1affbe 2026-06-17 highlight 에셋추가. 스틱그랩 추가중 2026-06-17 19:06:09 +09:00
HIHIHIHIHIHIzz
a0cf31a3a2 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-17 17:46:55 +09:00
b162d9fcc7 2026-06-17 오류 수정 2026-06-17 17:42:52 +09:00
4710a0da95 2026-06-17 2026-06-17 16:43:33 +09:00
9ad68134c0 2026-06-17 나무손 설정 2026-06-17 16:10:02 +09:00
143cc8a420 나무손 플레이어 추가 2026-06-17 15:26:15 +09:00