Commit Graph

243 Commits

Author SHA1 Message Date
dldydtn9755-crypto
57af169c29 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2026-06-26 19:01:29 +09:00
dldydtn9755-crypto
5951fb6894 뿌우우~ 2026-06-26 19:00:31 +09:00
8fb96948e4 11 2026-06-26 18:38:22 +09:00
dldydtn9755-crypto
5b5d4adcde Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:s
#	Assets/01_Scenes/Cave_Test_2.unity
2026-06-26 18:08:43 +09:00
9a91f6ceec Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-26 18:05:12 +09:00
45bc52b782 피싱룸 2026-06-26 18:05:00 +09:00
dldydtn9755-crypto
21b5069475 Revert "Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR"
This reverts commit 8a511f27f1, reversing
changes made to 60550e3388.
2026-06-26 17:59:38 +09:00
dldydtn9755-crypto
d2e376da20 Revert "2026-06-26 시작 고래 사운드"
This reverts commit 3617ebe51e.
2026-06-26 17:57:12 +09:00
64d7da4822 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-26 17:49:25 +09:00
b6ce85e70c 왜죠? 2026-06-26 17:49:20 +09:00
dldydtn9755-crypto
ce69da323e Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-26 17:47:33 +09:00
skrwns304@gmail.com
3617ebe51e 2026-06-26 시작 고래 사운드 2026-06-26 17:46:49 +09:00
dldydtn9755-crypto
ef0409276a .. 2026-06-26 17:40:01 +09:00
dldydtn9755-crypto
8a511f27f1 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/01_Scenes/blackjack.unity
2026-06-26 17:17:39 +09:00
dldydtn9755-crypto
60550e3388 미로방 문 위치 수정 대화창 수정 2026-06-26 17:17:02 +09:00
e98711f534 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-26 17:13:14 +09:00
42b06a1c42 문수정 2026-06-26 17:13:01 +09:00
skrwns304@gmail.com
03710297de Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/01_Scenes/blackjack.unity
2026-06-26 17:09:44 +09:00
skrwns304@gmail.com
c8117a41b4 에셋 정리 2026-06-26 17:08:16 +09:00
dldydtn9755-crypto
98244a32ae 제페토 씬1 파도소리 2026-06-26 16:22:11 +09:00
dldydtn9755-crypto
55835b3260 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-26 15:44:25 +09:00
dldydtn9755-crypto
31aeb0023d ui대화 수정 완 2026-06-26 15:44:21 +09:00
HIHIHIHIHIHIzz
5821f1545d 저장 2026-06-26 15:22:58 +09:00
HIHIHIHIHIHIzz
939b034271 제페토 파티클 추가 2026-06-26 15:18:31 +09:00
dldydtn9755-crypto
b427be8a3d Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-26 14:28:47 +09:00
dldydtn9755-crypto
7d24e2c51d 블랙잭 필요없는거 제거 2026-06-26 14:28:26 +09:00
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
b2e077cd98 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 19:32:42 +09:00
d6d140ce17 조개 수정 2026-06-25 19:32:33 +09:00
dldydtn9755-crypto
cc0a8fa14e 게이트 수정완 2026-06-25 18:59:38 +09:00
dldydtn9755-crypto
1d43703fed Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 18:43:26 +09:00
dldydtn9755-crypto
5e8e6d583c ㅇㅇ 2026-06-25 18:43:18 +09:00
3d3a2ecfc0 조각 추가 2026-06-25 18:42:54 +09:00
dldydtn9755-crypto
8d11d54875 2026-06-25 18:37:25 +09:00
dldydtn9755-crypto
aa2a7ef875 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 18:18:22 +09:00
dldydtn9755-crypto
efd215b558 ㅇㅇㅇ 2026-06-25 18:18:16 +09:00
de8ce5b73c Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 18:14:12 +09:00
782f856462 글로벌 매니저프리팹 2026-06-25 18:14:06 +09:00
101215f905 브금 수정 2026-06-25 18:07:10 +09:00
dldydtn9755-crypto
ac043dd904 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 17:57:55 +09:00
dldydtn9755-crypto
583408989c 최근 2026-06-25 17:57:47 +09:00
ee11f426ad Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 17:47:10 +09:00
2832408b30 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 17:47:02 +09:00
35b22836fe Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset
2026-06-25 17:40:53 +09:00
e8f67c0609 2026.06.25 Fishing scene 2026-06-25 17:39:42 +09:00
HIHIHIHIHIHIzz
6ef3b0d401 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 17:38:11 +09:00