|
|
b92bb65ba6
|
2026-06-24 복구
|
2026-06-24 18:11:59 +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 |
|
|
|
d601161390
|
2026.06.24
|
2026-06-24 17:13:40 +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 |
|
|
|
083fcf63ce
|
2026-06-24 인벤토리 UI붙이기
|
2026-06-24 12:04:22 +09:00 |
|
|
|
175d8adf53
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-24 09:49:46 +09:00 |
|
|
|
8224828d36
|
인벤토리 기능 제작중
|
2026-06-24 09:49:36 +09:00 |
|
|
|
59bf6f0555
|
모르는거
|
2026-06-24 09:47:33 +09:00 |
|
|
|
694ead2b08
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-24 09:47:11 +09:00 |
|
|
|
2ac02d78f8
|
엔드 선택지 수정 전
|
2026-06-24 09:41:58 +09:00 |
|
|
|
da5e4a0ad0
|
후크선장 문제
|
2026-06-23 19:43:43 +09:00 |
|
|
|
33131fb3cd
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-23 18:26:40 +09:00 |
|
|
|
9626fe5cb9
|
누락사항
|
2026-06-23 18:26:33 +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 |
|
|
|
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 |
|
|
|
5d559f1150
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-23 17:03:46 +09:00 |
|
|
|
b85855d4d6
|
게임클리어 이벤트
|
2026-06-23 17:03:38 +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 |
|
|
|
d094fb19ea
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-23 11:30:31 +09:00 |
|
|
|
f55d53e027
|
조개 수정
|
2026-06-23 11:30:22 +09:00 |
|
|
|
147fad59de
|
페어리 빛 없을때 마테리얼 수정
|
2026-06-23 11:22:17 +09:00 |
|
|
|
53c753673c
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-23 11:03:33 +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 |
|
|
|
f5a93875f6
|
2026-06-23 클리어시 문생성 (진행중)
|
2026-06-23 11:00:03 +09:00 |
|
dldydtn9755-crypto
|
6271893c10
|
Update blackjack cards and BGM zone
|
2026-06-23 10:57:18 +09:00 |
|
dldydtn9755-crypto
|
814c31a071
|
Update blackjack cards and BGM zone
|
2026-06-22 18:25:53 +09:00 |
|
|
|
5ef59f1c21
|
조개게임 완료 전
|
2026-06-22 18:24:25 +09:00 |
|
|
|
33bad1f50a
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
# Assets/My project/Fonts/Pretendard-Black SDF.asset
|
2026-06-22 17:04:21 +09:00 |
|
|
|
74afff5be8
|
육지도착
|
2026-06-22 16:58:32 +09:00 |
|
HIHIHIHIHIHIzz
|
5bd8dd771c
|
스테이징된 변경사항(950개)라고 되어있어서 그냥 커밋 한번 더 했어요.
|
2026-06-22 16:43:50 +09:00 |
|
HIHIHIHIHIHIzz
|
d12a45ad29
|
헤엄치는 고래별, 움직이는 해산물
|
2026-06-22 16:22:10 +09:00 |
|
|
|
f552be74be
|
2026-06-22 요정이 플레이어에 회전이 동기화되는 현상 수정
|
2026-06-22 13:33:33 +09:00 |
|
|
|
28d33f233e
|
2026-06-22 대화창 위치 수정
|
2026-06-22 13:12:53 +09:00 |
|
|
|
3575022478
|
2026-06-22 캐릭터 영역별 스크립트
|
2026-06-22 12:57:29 +09:00 |
|
|
|
483e3c89f8
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-22 11:37:18 +09:00 |
|
