15 Commits

Author SHA1 Message Date
d1688b3c0e Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet 2026-07-01 10:08:22 +09:00
161c6f625f 2026.06.30 2026-06-30 10:47:50 +09:00
02e5d737d0 asa 2026-06-30 10:14:38 +09:00
50ff5e4ae9 2026.06.29 17:43 2026-06-29 17:43:17 +09:00
6c09948627 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet
# Conflicts:
#	Assets/My project/fishhook scene.meta
#	Assets/My project/fishhook scene.unity.meta
#	Assets/My project/fishhook scene/NavMesh-Terrain.asset.meta
#	Assets/XR/AndroidXR/AndroidXRSettingsInitializer.meta
2026-06-29 14:39:37 +09:00
f67d0683a0 2026.06.29 2026-06-29 14:25:49 +09:00
3887731db4 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet 2026-06-29 12:50:38 +09:00
64875088e2 고양이 대화 추가 2026-06-29 12:50:20 +09:00
bc4dfb126b Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet 2026-06-29 12:48:52 +09:00
66090c3e48 진주 손 수정 2026-06-29 12:48:44 +09:00
fadf2fb84f 터치오브젝트 사라짐 2026-06-29 12:45:49 +09:00
d5eeb0dc6c 씬삭제4 2026-06-29 11:06:24 +09:00
dldydtn9755-crypto
5d57b8cd41 방 삭제 2026-06-29 10:51:32 +09:00
68bfddf8c7 2026-06-27 클리어 요정 높이 수정 불가 현상 개선, 씬 정리 2026-06-27 01:14:55 +09:00
c748bbd21b First commit 2026-06-26 23:53:39 +09:00