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

MazeRoom

저장(?)

2026-06-18 17:14:21 +09:00

SampleScene

…

WhaleAdventure_VR

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

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

blackjack.meta

…

blackjack.unity

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

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

blackjack.unity.meta

…

Cave_Test_2.unity

동글 운항

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

Cave_Test_2.unity.meta

에셋오류?

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

Cave_Test.unity

동굴 수정

2026-06-16 16:41:50 +09:00

Cave_Test.unity.meta

동굴테스트

2026-06-15 16:22:25 +09:00

MazeRoom.meta

up

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

MazeRoom.unity

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

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

MazeRoom.unity.meta

페어리 추가

2026-06-15 17:32:10 +09:00

SampleScene.meta

…

SampleScene.unity

…

SampleScene.unity.meta

…

TerrainTest.unity

2026-06-18 고양이룸 터레인 수정

2026-06-18 11:13:08 +09:00

TerrainTest.unity.meta

2026-06-18 고양이룸 터레인 수정

2026-06-18 11:13:08 +09:00

WhaleAdventure_VR.meta

…