Commit Graph

125 Commits

Author SHA1 Message Date
skrwns304@gmail.com
c8117a41b4 에셋 정리 2026-06-26 17:08:16 +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
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
d6d140ce17 조개 수정 2026-06-25 19:32:33 +09:00
782f856462 글로벌 매니저프리팹 2026-06-25 18:14:06 +09:00
HIHIHIHIHIHIzz
6ef3b0d401 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 17:38:11 +09:00
HIHIHIHIHIHIzz
510d027d6b 제페토가 안꺼지고 안켜지고 안찾고 안달리고 안기뻐해 2026-06-25 17:37:23 +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
c7aa2584c9 오류 2026-06-25 16:27:26 +09:00
HIHIHIHIHIHIzz
8911b43e82 음악교체, 페어리, 문추가 2026-06-25 15:55:57 +09:00
51288052b7 2026-06-25 문제사항 수정 2026-06-25 13:12:20 +09:00
dldydtn9755-crypto
0733f25a97 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 12:23:38 +09:00
dldydtn9755-crypto
4e36363955 제페토토토토토토쟁이~ 2026-06-25 12:23:04 +09:00
HIHIHIHIHIHIzz
56cbf3dac1 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 12:10:13 +09:00
HIHIHIHIHIHIzz
f97799f71a 돌핀 추가, 해룡 삭제 2026-06-25 12:10:07 +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
HIHIHIHIHIHIzz
16a15764b6 저장(?) 2026-06-25 10:05:02 +09:00
HIHIHIHIHIHIzz
4b40213102 저장(?) 2026-06-25 10:03:26 +09:00
dldydtn9755-crypto
f199e36946 제페토 2026-06-25 09:57:43 +09:00
9c5382d712 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-24 20:36:47 +09:00
5ff460f9c3 별조각픽업 2026-06-24 20:36:39 +09:00
dldydtn9755-crypto
adf6ab29d3 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-24 18:22:25 +09:00
dldydtn9755-crypto
ce73209621 블랙잭 끝 2026-06-24 18:22:05 +09:00
HIHIHIHIHIHIzz
f861de6822 제페토준비 2026-06-24 17:57:20 +09:00
122d59b0f5 11 2026-06-24 17:43:37 +09:00
695f9b7a14 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset
2026-06-24 15:13:05 +09:00
ef7705aa89 인벤토리UI 2026-06-24 15:12:21 +09:00
6ab3a68928 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-24 14:46:14 +09:00
513fa94ab9 조개 사운드 2026-06-24 14:40:39 +09:00
HIHIHIHIHIHIzz
2e75a48e93 피노키오 우글우글 수정 2026-06-24 14:28:08 +09:00
HIHIHIHIHIHIzz
04c639887a 저장? 2026-06-24 14:21:56 +09:00
HIHIHIHIHIHIzz
89e5fc3755 피노키오별자리 추가 2026-06-24 13:17:47 +09:00
dldydtn9755-crypto
47f04efbfb Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/01_Scenes/blackjack.unity
2026-06-23 18:08:22 +09:00
dldydtn9755-crypto
faf6ec3ad3 Merge branch 'feature/hyeonsu-blackjack-clean'
# Conflicts:
#	Assets/01_Scenes/blackjack.unity
#	Assets/01_Scenes/blackjack/NavMesh-Terrain 2.asset
#	Assets/01_Scenes/blackjack/NavMesh-Terrain 2.asset.meta
#	Assets/02_Scripts/Blackjack/HookWalkToTable.cs
#	Assets/04_Models/Blackjack/anim/HookAnimatorController.controller
2026-06-23 18:07:28 +09:00
HIHIHIHIHIHIzz
3d7cb7bee2 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-23 15:44:46 +09:00
HIHIHIHIHIHIzz
ece67061d3 해룡 추가, 가오리 위치 바꿈 2026-06-23 15:44:39 +09:00
fecc7556d6 페어리 리기드바디 2026-06-23 14:33:45 +09:00
147fad59de 페어리 빛 없을때 마테리얼 수정 2026-06-23 11:22:17 +09:00
a0828aa087 Merge pull request '후크가 사라져잇' (#9) from feature/hyeonsu-blackjack-card-bgm into main
Reviewed-on: #9
2026-06-23 02:02:40 +00:00