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

Communication

2026-06-22 캐릭터 영역별 스크립트

2026-06-22 12:57:29 +09:00

Core

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

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

Data

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

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

Interaction

2026-06-18 앉기 UI등등

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

Managers

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

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

Npcs

2026-06-22 요정이 플레이어에 회전이 동기화되는 현상 수정

2026-06-22 13:33:33 +09:00

Player

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

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

Rhythm

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

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

Sound

2026-06-11 사운드시스템 (BaseScene참고)

2026-06-11 15:32:56 +09:00

UI

2026-06-19 월드다이얼로그 프로토타입

2026-06-19 17:58:22 +09:00

Blackjack.meta

블랙잭 씬 및 카드 게임 구성

2026-06-12 10:31:45 +09:00

Cave.meta

동굴 테스트

2026-06-16 09:46:59 +09:00

Communication.meta

…

Core.meta

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

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

Data.meta

…

GlobalObject.cs

…

GlobalObject.cs.meta

…

Interaction.meta

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

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

ISceneInitializable.cs

…

ISceneInitializable.cs.meta

…

ItemHoverHighlight.cs

2026-06-17 highlight 에셋추가. 스틱그랩 추가중

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

ItemHoverHighlight.cs.meta

2026-06-17 highlight 에셋추가. 스틱그랩 추가중

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

Managers.meta

…

Npcs.meta

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

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

Player.meta

…

Rhythm.meta

remify minigame CatsRhythmGame

2026-06-12 13:12:11 +09:00

Sound.meta

2026-06-11 사운드시스템 (BaseScene참고)

2026-06-11 15:32:56 +09:00

TimelineParameterController.cs

2026-06-17 게임시작 - 고래습격씬 프로토타입

2026-06-17 13:17:04 +09:00

TimelineParameterController.cs.meta

2026-06-17 게임시작 - 고래습격씬 프로토타입

2026-06-17 13:17:04 +09:00

UI.meta

…

Zone.cs

2026-06-11 사운드시스템 (BaseScene참고)

2026-06-11 15:32:56 +09:00

Zone.cs.meta

2026-06-11 사운드시스템 (BaseScene참고)

2026-06-11 15:32:56 +09:00

ZoneTrigger.cs

2026-06-11 사운드시스템 (BaseScene참고)

2026-06-11 15:32:56 +09:00

ZoneTrigger.cs.meta

2026-06-11 사운드시스템 (BaseScene참고)

2026-06-11 15:32:56 +09:00