Fixed Bin Merge

SkeleKing04 · Apr 29, 2021 · 600fa3a · 600fa3a
1 parent 365bd6e
commit 600fa3a
Show file tree

Hide file tree

Showing 27 changed files with 30 additions and 30 deletions.
diff --git a/Library/ArtifactDB b/Library/ArtifactDB
diff --git a/Library/Artifacts/0c/0c39a6b17e9307330cb5dc96bb134619 b/Library/Artifacts/0c/0c39a6b17e9307330cb5dc96bb134619
diff --git a/Library/Artifacts/1b/1bf8a26b62b4f6d421aa41663365e17e b/Library/Artifacts/1b/1bf8a26b62b4f6d421aa41663365e17e
diff --git a/Library/Artifacts/20/20c911bf680757fa5ff502639811b9ed b/Library/Artifacts/20/20c911bf680757fa5ff502639811b9ed
diff --git a/Library/Artifacts/32/3258a75f02e1acb4e06016d555516ae2 b/Library/Artifacts/32/3258a75f02e1acb4e06016d555516ae2
diff --git a/Library/Artifacts/33/33517b3cd67b84297f2b5fc542adc9c8 b/Library/Artifacts/33/33517b3cd67b84297f2b5fc542adc9c8
diff --git a/Library/Artifacts/34/34ce7a25387761beb50da9b3e3e0fb44 b/Library/Artifacts/34/34ce7a25387761beb50da9b3e3e0fb44
diff --git a/Library/Artifacts/39/39cebad0438d125173bd8cc13251f18c b/Library/Artifacts/39/39cebad0438d125173bd8cc13251f18c
diff --git a/Library/Artifacts/3b/3b3b59d75fea79db28760870b1bf9b3d b/Library/Artifacts/3b/3b3b59d75fea79db28760870b1bf9b3d
diff --git a/Library/Artifacts/3c/3c538c68624cd30e2f68ac1050a2c9cb b/Library/Artifacts/3c/3c538c68624cd30e2f68ac1050a2c9cb
diff --git a/Library/Artifacts/5e/5e2efb5455941dae94ad5251fd6cd2f5 b/Library/Artifacts/5e/5e2efb5455941dae94ad5251fd6cd2f5
diff --git a/Library/Artifacts/68/682925b4401e1ba202d23d372f15351b b/Library/Artifacts/68/682925b4401e1ba202d23d372f15351b
diff --git a/Library/Artifacts/70/7065f2f13c48302ff32e8260225db231 b/Library/Artifacts/70/7065f2f13c48302ff32e8260225db231
diff --git a/Library/Artifacts/77/773c1ecea17cfc33b9278c4f9fe75fec b/Library/Artifacts/77/773c1ecea17cfc33b9278c4f9fe75fec
diff --git a/Library/Artifacts/8b/8bfa6749ecd3bcc366e300d5aa8d8e7b b/Library/Artifacts/8b/8bfa6749ecd3bcc366e300d5aa8d8e7b
diff --git a/Library/Artifacts/8d/8d5b9b209e8a8a0135c611936ed457d9 b/Library/Artifacts/8d/8d5b9b209e8a8a0135c611936ed457d9
diff --git a/Library/Artifacts/98/980781c0de389c359fee7b2351db56a1 b/Library/Artifacts/98/980781c0de389c359fee7b2351db56a1
diff --git a/Library/Artifacts/b3/b3c59881898962ea9b6951ba67ad1497 b/Library/Artifacts/b3/b3c59881898962ea9b6951ba67ad1497
diff --git a/Library/Artifacts/c1/c143f433f053d86c9486a2fcb2a6ff1d b/Library/Artifacts/c1/c143f433f053d86c9486a2fcb2a6ff1d
diff --git a/Library/Artifacts/c3/c3248f8ef811da7f5045d46ce043c696 b/Library/Artifacts/c3/c3248f8ef811da7f5045d46ce043c696
diff --git a/Library/Artifacts/c3/c35d1f2a120eb4df5859762ef1b9de28 b/Library/Artifacts/c3/c35d1f2a120eb4df5859762ef1b9de28
diff --git a/Library/Artifacts/e0/e0f6adb8ba7e6ffe465833979f5f995b b/Library/Artifacts/e0/e0f6adb8ba7e6ffe465833979f5f995b
diff --git a/Library/Artifacts/ec/ec27a06ad85aed40f0b49e2d143ef4de b/Library/Artifacts/ec/ec27a06ad85aed40f0b49e2d143ef4de
diff --git a/Library/Artifacts/f6/f646ec5bd56ed1d73641f998fb808f44 b/Library/Artifacts/f6/f646ec5bd56ed1d73641f998fb808f44
diff --git a/Library/Artifacts/fc/fc5ddf7dbe0e117682b003ffdef31991 b/Library/Artifacts/fc/fc5ddf7dbe0e117682b003ffdef31991
diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt
@@ -21,7 +21,7 @@ MonoBehaviour:
   m_ShowMode: 4
   m_Title: Inspector
   m_RootView: {fileID: 7}
-  m_MinSize: {x: 875, y: 300}
+  m_MinSize: {x: 875, y: 542}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
@@ -43,8 +43,8 @@ MonoBehaviour:
     y: 0
     width: 547
     height: 685
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -71,10 +71,10 @@ MonoBehaviour:
     y: 30
     width: 1920
     height: 957
-  m_MinSize: {x: 777, y: 492}
-  m_MaxSize: {x: 16002, y: 14042}
+  m_MinSize: {x: 781, y: 492}
+  m_MaxSize: {x: 16006, y: 14042}
   vertical: 0
-  controlID: 78
+  controlID: 153
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -94,8 +94,8 @@ MonoBehaviour:
     y: 0
     width: 553
     height: 957
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -120,8 +120,8 @@ MonoBehaviour:
     y: 0
     width: 403
     height: 685
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -176,7 +176,7 @@ MonoBehaviour:
     y: 0
     width: 1920
     height: 1007
-  m_MinSize: {x: 875, y: 300}
+  m_MinSize: {x: 875, y: 542}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &8
 MonoBehaviour:
@@ -242,10 +242,10 @@ MonoBehaviour:
     y: 0
     width: 1367
     height: 957
-  m_MinSize: {x: 502, y: 492}
-  m_MaxSize: {x: 12002, y: 14042}
+  m_MinSize: {x: 505, y: 492}
+  m_MaxSize: {x: 12005, y: 14042}
   vertical: 1
-  controlID: 127
+  controlID: 86
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -268,10 +268,10 @@ MonoBehaviour:
     y: 0
     width: 1367
     height: 685
-  m_MinSize: {x: 502, y: 221}
-  m_MaxSize: {x: 12002, y: 4021}
+  m_MinSize: {x: 505, y: 221}
+  m_MaxSize: {x: 12005, y: 4021}
   vertical: 0
-  controlID: 3885
+  controlID: 87
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -426,20 +426,20 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameManager
+    - Assets/Prefabs
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Scripts/GameManager
+  - Assets/Prefabs
   m_LastFoldersGridSize: -1
   m_LastProjectPath: C:\Users\18lucasj\Documents\GitHub\GarbageBlaster
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 0c370000
-    m_LastClickedID: 14092
-    m_ExpandedIDs: 00000000d83600000a37000000ca9a3b
+    m_SelectedIDs: 1a370000
+    m_LastClickedID: 14106
+    m_ExpandedIDs: 00000000f43600002037000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -467,7 +467,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d8360000
+    m_ExpandedIDs: 00000000f4360000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -590,23 +590,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 5c2f0000
+      m_SelectedIDs: fe340000
       m_LastClickedID: 0
-      m_ExpandedIDs: 8abdffff2ed9ffff3ed9ffff46fbffff4cfbffff60fbffff70fbffffb6340000d4340000
+      m_ExpandedIDs: 60fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: GameObject
-        m_OriginalName: GameObject
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 13268
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 5}
       m_SearchString: 
@@ -702,7 +702,7 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: 0.2436567, y: 0.67591876, z: -0.25441882, w: 0.647332}
     speed: 2
-    m_Value: {x: 0.24365641, y: 0.6759179, z: -0.25441852, w: 0.64733124}
+    m_Value: {x: 0.24365671, y: 0.67591876, z: -0.25441882, w: 0.6473321}
   m_Size:
     m_Target: 148.60196
     speed: 2

diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB