Commit Graph

27 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
9a91f6ceec Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-26 18:05:12 +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
skrwns304@gmail.com
c8117a41b4 에셋 정리 2026-06-26 17:08:16 +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
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
HIHIHIHIHIHIzz
8911b43e82 음악교체, 페어리, 문추가 2026-06-25 15:55:57 +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
a760eb9c92 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-23 17:21:20 +09:00
ee83d7bc20 문달기 2026-06-23 17:17:00 +09:00
HIHIHIHIHIHIzz
ece67061d3 해룡 추가, 가오리 위치 바꿈 2026-06-23 15:44:39 +09:00
9ea6bb9e65 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-19 18:17:11 +09:00
5b14d51884 동글 운항 2026-06-19 18:16:40 +09:00
HIHIHIHIHIHIzz
f443c4a4de Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-19 15:36:15 +09:00
HIHIHIHIHIHIzz
9838b6701d 문어추가, 해산물 에셋 많이 추가 2026-06-19 15:36:09 +09:00
d6dd90ed4b Merge pull request '블랙잭 NPC 코인 및 AI Navigation 기능 추가' (#7) from feature/hyeonsu-blackjack-restore into main
Reviewed-on: #7
2026-06-19 06:35:40 +00:00
dldydtn9755-crypto
3d0432ebd4 블랙잭 NPC 코인 및 AI Navigation 기능 추가 2026-06-19 15:24:19 +09:00
HIHIHIHIHIHIzz
8026a5be80 up 2026-06-18 17:09:07 +09:00
HIHIHIHIHIHIzz
a16caea803 협곡미로 완성! 조명이랑 이펙트 추가할거임. 2026-06-17 17:46:50 +09:00
HIHIHIHIHIHIzz
e4120e45fe 미로 제작(터레인 활용) 2026-06-17 11:44:49 +09:00
d4a76a2a97 remify minigame CatsRhythmGame 2026-06-12 13:12:11 +09:00
skrwns304@gmail.com
8e3cc91d92 2026-06-11 기본 매니저 구성 2026-06-11 01:06:48 +09:00
skrwns304@gmail.com
4c955dafc3 2026-06-09 룸 프로토타입 디자인 (진행중) 2026-06-09 20:53:26 +09:00