Commit Graph

30 Commits

Author SHA1 Message Date
dldydtn9755-crypto
dace938039 ㅇㅇ 2026-06-30 10:43:52 +09:00
dldydtn9755-crypto
1ae4c2b0a2 수정 2026-06-30 10:13:46 +09:00
7f6e04485c Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet
# Conflicts:
#	Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset.meta
#	Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta
#	Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta
#	Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta
#	Assets/My project/Fishing Scripts/model/New Material.mat.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset.meta
#	Assets/XR/Settings/OpenXRPackageSettings.asset
2026-06-29 17:44:36 +09:00
50ff5e4ae9 2026.06.29 17:43 2026-06-29 17:43:17 +09:00
b688a14be4 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet 2026-06-29 17:33:22 +09:00
d57bc65c63 변경없음 2026-06-29 17:22:17 +09:00
HIHIHIHIHIHIzz
9014b0d89f 저장 2026-06-29 17:18:21 +09:00
HIHIHIHIHIHIzz
cc300f4c4f 저장? 2026-06-29 17:15:11 +09:00
dldydtn9755-crypto
ee772555a9 ㅇㅇ 2026-06-29 17:13:49 +09:00
dldydtn9755-crypto
61bddc92ff 일단 2026-06-29 15:41:13 +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
9df81db479 111 2026-06-29 14:38:43 +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
1e2bffa0d6 시작씬 수정 2026-06-29 11:58:56 +09:00
87fb20d4db Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet 2026-06-29 11:27:09 +09:00
f9739afe2c 마지막씬 추가사항 2026-06-29 11:27:06 +09:00
dldydtn9755-crypto
b80c957319 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet 2026-06-29 11:14:00 +09:00
dldydtn9755-crypto
86dbc9ba11 방 이름 수정 완료 2026-06-29 11:12:35 +09:00
d5eeb0dc6c 씬삭제4 2026-06-29 11:06:24 +09:00
19a8535cb0 신삭제3 2026-06-29 11:05:23 +09:00
8e34c811bd 신삭제 누락 2026-06-29 11:03:39 +09:00
3bfeaf0375 프리팹 에러 2026-06-29 11:01:57 +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