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
This commit is contained in:
dldydtn9755-crypto
2026-06-23 18:07:28 +09:00
5 changed files with 82 additions and 431 deletions

Binary file not shown.

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 05b37f77d4689fc41a87b1f3a8b6062a
guid: d25fd4971f21acc41b07b09b612c6ee9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 23800000