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

..

Blackjack

Merge branch 'feature/hyeonsu-blackjack-clean'

2026-06-23 18:07:28 +09:00

Cave

동글 운항

2026-06-19 18:16:40 +09:00

Characters

2026-06-22 대화창 위치 수정

2026-06-22 13:12:53 +09:00

Choice

…

Hands

2026-06-18 손 누락사항

2026-06-18 11:31:43 +09:00

MazeRoom3Dmodel

문어추가, 해산물 에셋 많이 추가

2026-06-19 15:36:09 +09:00

Note

Reapply "Merge pull request '리듬게임' (#5) from CatsRhythmGame into main"

2026-06-16 12:26:10 +09:00

Objects

게이트 이동 시스템 추가 및 기존 이동 매니저 정리

2026-06-22 11:28:53 +09:00

UI

2026-06-19 다이얼로그 월드프리팹

2026-06-19 18:20:32 +09:00

Blackjack.meta

…

Cave.meta

…

Characters.meta

2026-06-19 UI, UI로직

2026-06-19 14:27:40 +09:00

Choice.meta

…

Hands.meta

2026-06-17 스타터킷,툰셰이더,오른손

2026-06-17 10:51:49 +09:00

MazeRoom3Dmodel.meta

문어추가, 해산물 에셋 많이 추가

2026-06-19 15:36:09 +09:00

MazeRoomEffectModel.meta

그냥 이펙트 모델만 놨어요

2026-06-18 17:30:17 +09:00

Note.meta

…

Objects.meta

…

RealPlayer.prefab

플레이어 프리펩 추가

2026-06-16 16:24:12 +09:00

RealPlayer.prefab.meta

에셋오류?

2026-06-17 10:40:35 +09:00

UI.meta

…

VRPlayer.prefab

대화 프로토타입

2026-06-19 17:09:36 +09:00

VRPlayer.prefab.meta

2026-06-18 많은 플레이어 수정사항

2026-06-18 15:07:21 +09:00