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:
BIN
Assets/01_Scenes/blackjack.unity
LFS
BIN
Assets/01_Scenes/blackjack.unity
LFS
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 05b37f77d4689fc41a87b1f3a8b6062a
|
||||
guid: d25fd4971f21acc41b07b09b612c6ee9
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 23800000
|
||||
|
||||
Reference in New Issue
Block a user