Commit Graph

61 Commits

Author SHA1 Message Date
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
f69d0ef273 2026-06-18 앉기 UI등등 2026-06-18 18:09:08 +09:00
1d77570015 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-18 17:47:47 +09:00
f7cd7cbe18 동굴재건 2026-06-18 17:47:41 +09:00
HIHIHIHIHIHIzz
0fe592ffb4 그냥 이펙트 모델만 놨어요 2026-06-18 17:30:17 +09:00
83b3c4a27c 2026-06-18 리듬게임 자동스틱 2026-06-18 16:26:40 +09:00
1cbd9ac094 2026-06-18 자동관련 2026-06-18 15:50:22 +09:00
67c2b2c179 2026-06-18 많은 플레이어 수정사항 2026-06-18 15:07:21 +09:00
dff151c5f0 2026-06-18 손 누락사항 2026-06-18 11:31:43 +09:00
241a9b2bee Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-17 19:06:16 +09:00
997c1affbe 2026-06-17 highlight 에셋추가. 스틱그랩 추가중 2026-06-17 19:06:09 +09:00
HIHIHIHIHIHIzz
a0cf31a3a2 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-17 17:46:55 +09:00
b162d9fcc7 2026-06-17 오류 수정 2026-06-17 17:42:52 +09:00
9ad68134c0 2026-06-17 나무손 설정 2026-06-17 16:10:02 +09:00
143cc8a420 나무손 플레이어 추가 2026-06-17 15:26:15 +09:00
HIHIHIHIHIHIzz
a4a3f371e0 낙준님이 래프트핸드 프리펩을 만드셨다! 2026-06-17 14:44:28 +09:00
c81a276eba 2026-06-17 게임시작 - 고래습격씬 프로토타입 2026-06-17 13:17:04 +09:00
6ccae390f6 2026-06-17 스타터킷,툰셰이더,오른손 2026-06-17 10:51:49 +09:00
48c3cfe9f1 에셋오류? 2026-06-17 10:40:35 +09:00
3aa3181473 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-16 16:42:01 +09:00
35d206038f 동굴 수정 2026-06-16 16:41:50 +09:00
HIHIHIHIHIHIzz
1ae76e42bf 플레이어 프리펩 추가 2026-06-16 16:24:12 +09:00
dldydtn9755-crypto
22ead53803 블랙잭 시스템 main 기준 복구 2026-06-16 13:50:04 +09:00
skrwns304@gmail.com
c92e9f648a Reapply "Merge pull request '리듬게임' (#5) from CatsRhythmGame into main"
This reverts commit d7d5519fbf.
2026-06-16 12:26:10 +09:00
skrwns304@gmail.com
d7d5519fbf Revert "Merge pull request '리듬게임' (#5) from CatsRhythmGame into main"
This reverts commit 58385bf819, reversing
changes made to 8369e2ab51.
2026-06-16 12:23:32 +09:00
58385bf819 Merge pull request '리듬게임' (#5) from CatsRhythmGame into main
Reviewed-on: #5
2026-06-16 02:09:52 +00:00
8369e2ab51 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-16 09:47:08 +09:00
9962d88bd3 동굴 테스트 2026-06-16 09:46:59 +09:00
38936c211a 2026-06-15 리듬게임 자동기능 2026-06-15 17:37:32 +09:00
HIHIHIHIHIHIzz
dc0552155e Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-15 17:33:42 +09:00
HIHIHIHIHIHIzz
88160938b9 페어리 추가 2026-06-15 17:32:10 +09:00