|
|
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 |
|
|
|
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 |
|
dldydtn9755-crypto
|
814c31a071
|
Update blackjack cards and BGM zone
|
2026-06-22 18:25:53 +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 |
|
|
|
28d33f233e
|
2026-06-22 대화창 위치 수정
|
2026-06-22 13:12:53 +09:00 |
|
|
|
483e3c89f8
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-22 11:37:18 +09:00 |
|
|
|
ab18ef19f5
|
Merge pull request '게이트 이동 시스템 추가 및 기존 이동 매니저 정리' (#8) from feature/hyeonsu-gate into main
Reviewed-on: #8
|
2026-06-22 02:36:25 +00:00 |
|
|
|
3ff479e357
|
대화로직 수정중
|
2026-06-22 11:32:17 +09:00 |
|
dldydtn9755-crypto
|
6fc20431e8
|
게이트 이동 시스템 추가 및 기존 이동 매니저 정리
|
2026-06-22 11:28:53 +09:00 |
|
|
|
f7a71e11d6
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-22 09:48:33 +09:00 |
|
|
|
a0119f0560
|
시작전
|
2026-06-22 09:48:24 +09:00 |
|
|
|
8c764be378
|
파티클 재수정
|
2026-06-20 17:38:52 +09:00 |
|
|
|
b90f996d14
|
파티클 수정
|
2026-06-20 17:35:54 +09:00 |
|
|
|
f85ea1ffc1
|
2026-06-20 뉴페어리 마테리얼 수정
|
2026-06-20 17:33:30 +09:00 |
|
|
|
49f99647a1
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
# Assets/RealToon.meta
# Assets/RealToon/Editor.meta
# Assets/RealToon/RealToon Shaders.meta
# Assets/RealToon/RealToon Shaders/RealToon Core.meta
# Assets/RealToon/RealToon Shaders/RealToon Core/URP.meta
# Assets/RealToon/RealToon Shaders/RealToon Core/URP/Pass.meta
# Assets/RealToon/RealToon Shaders/Version 5.meta
# Assets/RealToon/RealToon Shaders/Version 5/URP.meta
# Assets/RealToon/RealToon Shaders/Version 5/URP/Default.meta
# Assets/RealToon/RealToon Tools.meta
# Assets/RealToon/RealToon Tools/FrameByFrameRendering.meta
|
2026-06-20 16:56:52 +09:00 |
|
|
|
295e284dd0
|
2026-06-20 뉴페어리
|
2026-06-20 16:46:29 +09:00 |
|
skrwns304@gmail.com
|
5562ac0618
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-19 18:21:37 +09:00 |
|
skrwns304@gmail.com
|
4ac3375076
|
2026-06-19 다이얼로그 월드프리팹
|
2026-06-19 18:20:32 +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 |
|
|
|
3d882fcc8c
|
2026-06-19 월드다이얼로그 프로토타입
|
2026-06-19 17:58:22 +09:00 |
|
|
|
39ef7ff47b
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-19 17:09:41 +09:00 |
|
|
|
711c9a5986
|
대화 프로토타입
|
2026-06-19 17:09:36 +09:00 |
|
|
|
3c8daa9c8d
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-19 15:36:53 +09:00 |
|
|
|
49883e4585
|
ㅁㅁㅁ
|
2026-06-19 15:36:42 +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 |
|
skrwns304@gmail.com
|
b1e85a5b89
|
2026-06-19 UI, UI로직
|
2026-06-19 14:27:40 +09:00 |
|
|
|
27d56d582e
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-18 18:09:15 +09:00 |
|
