From cf2a4e51fd7ff7b710966d1c23a2112ee3a4f7d2 Mon Sep 17 00:00:00 2001
From: cailean <caileannn@gmail.com>
Date: Fri, 1 Mar 2024 13:23:16 +0000
Subject: [PATCH] folders and position update

---
 Assets/11_Animations.meta                     |  8 +++++++
 Assets/12_Timelines.meta                      |  8 +++++++
 Assets/12_Timelines/Demo Timeline.playable    | 22 +++++++++++++++++++
 .../12_Timelines/Demo Timeline.playable.meta  |  8 +++++++
 Assets/6_Scenes/Beep.unity                    | 19 ++++++++--------
 5 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 Assets/11_Animations.meta
 create mode 100644 Assets/12_Timelines.meta
 create mode 100644 Assets/12_Timelines/Demo Timeline.playable
 create mode 100644 Assets/12_Timelines/Demo Timeline.playable.meta

diff --git a/Assets/11_Animations.meta b/Assets/11_Animations.meta
new file mode 100644
index 0000000..d220dae
--- /dev/null
+++ b/Assets/11_Animations.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d06e27b32bee40c42810998a49367208
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/12_Timelines.meta b/Assets/12_Timelines.meta
new file mode 100644
index 0000000..18cb615
--- /dev/null
+++ b/Assets/12_Timelines.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38cefc7d79ca62f44b12ffde4bdcaffd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/12_Timelines/Demo Timeline.playable b/Assets/12_Timelines/Demo Timeline.playable
new file mode 100644
index 0000000..af6d28c
--- /dev/null
+++ b/Assets/12_Timelines/Demo Timeline.playable	
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
+  m_Name: Demo Timeline
+  m_EditorClassIdentifier: 
+  m_Version: 0
+  m_Tracks: []
+  m_FixedDuration: 0
+  m_EditorSettings:
+    m_Framerate: 60
+    m_ScenePreview: 1
+  m_DurationMode: 0
+  m_MarkerTrack: {fileID: 0}
diff --git a/Assets/12_Timelines/Demo Timeline.playable.meta b/Assets/12_Timelines/Demo Timeline.playable.meta
new file mode 100644
index 0000000..67b113b
--- /dev/null
+++ b/Assets/12_Timelines/Demo Timeline.playable.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dd97fb6e6982ba049974d6d1ca687f10
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity
index 766c3b4..b922d21 100644
--- a/Assets/6_Scenes/Beep.unity
+++ b/Assets/6_Scenes/Beep.unity
@@ -723,7 +723,7 @@ Transform:
   m_GameObject: {fileID: 479999558}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.19631481, y: 32.76503, z: -49.481876}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1584,7 +1584,7 @@ Transform:
   m_GameObject: {fileID: 1201075075}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 35.34, y: 2.05, z: 17.29}
+  m_LocalPosition: {x: 36.07, y: -32.35, z: 65.54}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5191,8 +5191,8 @@ GameObject:
   - component: {fileID: 2528038546429795343}
   - component: {fileID: 7293141209030330613}
   - component: {fileID: 8498282228120337558}
-  - component: {fileID: 8498282228120337560}
   - component: {fileID: 8498282228120337559}
+  - component: {fileID: 8498282228120337560}
   m_Layer: 0
   m_Name: House Content|Catnana_L_BB_SpotMini-House_2023.blend|Dupli|4
   m_TagString: object
@@ -15483,8 +15483,8 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!64 &8498282228120337560
-MeshCollider:
+--- !u!136 &8498282228120337560
+CapsuleCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -15501,10 +15501,11 @@ MeshCollider:
   m_IsTrigger: 0
   m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 1493984943705642624, guid: 035fa817a7331e74f852d97d43c28aa6, type: 3}
+  serializedVersion: 2
+  m_Radius: 0.23
+  m_Height: 1.05
+  m_Direction: 2
+  m_Center: {x: -0.0123989275, y: -0.119812086, z: -0.02}
 --- !u!33 &8504552847125551719
 MeshFilter:
   m_ObjectHideFlags: 0