Merge branch 'main' into animation

2026-01-31 22:48:38 -06:00
parent 84e739c8f6 b091ae3fcd
commit 93e15d2ca4
22 changed files with 720 additions and 302 deletions
@@ -16,7 +16,7 @@ GameObject:
  - component: {fileID: 7763498473808654306}
  - component: {fileID: 3659140714710275197}
  - component: {fileID: 9133098163257611752}
-  m_Layer: 0
+  m_Layer: 6
  m_Name: Player
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -233,7 +233,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3937090937419967315}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: b88e05c37f07ccf48bcc436a9d7def5d, type: 3}
  m_Name: 
@@ -251,7 +251,7 @@ GameObject:
  m_Component:
  - component: {fileID: 5569302833446856119}
  - component: {fileID: 6635970933810939283}
-  m_Layer: 0
+  m_Layer: 6
  m_Name: HoldLocation
  m_TagString: Untagged
  m_Icon: {fileID: 0}