Commit Graph

213 Commits

Author SHA1 Message Date
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
HIHIHIHIHIHIzz
6ef3b0d401 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 17:38:11 +09:00
7de6e2b398 정리 중 2026-06-25 17:37:27 +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
HIHIHIHIHIHIzz
e522e8f74b 저장 2026-06-25 16:37:27 +09:00
c7aa2584c9 오류 2026-06-25 16:27:26 +09:00
HIHIHIHIHIHIzz
dbdf3f2fea Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 15:56:01 +09:00
HIHIHIHIHIHIzz
8911b43e82 음악교체, 페어리, 문추가 2026-06-25 15:55:57 +09:00
af6330cb1f 기억의조각 효과음 추가 2026-06-25 15:41:20 +09:00
dldydtn9755-crypto
0b8ccf6036 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:dsdsgaaggdag
#	Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity
2026-06-25 13:14:57 +09:00
dldydtn9755-crypto
0e06e168dc ㅇㅇ 2026-06-25 13:12:55 +09:00
51288052b7 2026-06-25 문제사항 수정 2026-06-25 13:12:20 +09:00
dldydtn9755-crypto
40f9398387 2026-06-25 13:11:02 +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
dldydtn9755-crypto
a254c2282d 33 2026-06-25 12:08:39 +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
66485a4f59 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-25 09:47:03 +09:00
ee17c20e3d 풀받기 전 2026-06-25 09:40:06 +09:00
fe5bd8b728 블랙잭브금 2026-06-24 21:24:19 +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
a84e394b50 게이트 완성 2026-06-24 20:10:43 +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
b92bb65ba6 2026-06-24 복구 2026-06-24 18:11:59 +09:00
HIHIHIHIHIHIzz
f861de6822 제페토준비 2026-06-24 17:57:20 +09:00
5ebb11395c Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset
#	Assets/My project/test scene.unity
2026-06-24 17:52:36 +09:00
99243d621a 스타조각 2026-06-24 17:51:46 +09:00
d42f14c566 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset
2026-06-24 17:45:01 +09:00
122d59b0f5 11 2026-06-24 17:43:37 +09:00
f6799f08a9 동굴 색 위치 조정 2026-06-24 17:35:30 +09:00
24f5f729e4 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset
#	Assets/My project/Inventory/Scripts/InventoryItemType.cs
#	Assets/My project/Inventory/Scripts/InventoryManager.cs
#	Assets/My project/test scene.unity
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/TagManager.asset
2026-06-24 17:33:33 +09:00