Merge branch 'main' of https://github.com/SpenThompson/MuseumGame into main

MuseumGame/Assets/Audio/difstep.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 97568e1f7fd360e4c92e4e0b79226a97
+guid: 2080d53d4b4103449b39cbe07a7dba13
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

MuseumGame/Assets/Audio/discretestep.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: dc86b6ab05351b641899e04f315a0a5a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MuseumGame/Assets/Prefabs/Player.prefab

@@ -33,7 +33,7 @@ Transform:
   m_GameObject: {fileID: 374150667840124763}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -1.9691858, y: -0.41703698, z: 0}
-  m_LocalScale: {x: 0.125, y: 0.125, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -78,7 +78,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: -2144373788310312413, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3}
+  m_Sprite: {fileID: -3808752148845781986, guid: e03e538db736cbf4fba0318fc079a9e8, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -110,7 +110,7 @@ MonoBehaviour:
   _Deceleration: 0.4
   jumpForce: 350
   clips:
-  - {fileID: 8300000, guid: 97568e1f7fd360e4c92e4e0b79226a97, type: 3}
+  - {fileID: 8300000, guid: dc86b6ab05351b641899e04f315a0a5a, type: 3}
 --- !u!114 &-5793387185563800375
 MonoBehaviour:
   m_ObjectHideFlags: 0

MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity

@@ -2196,6 +2196,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Player
       objectReference: {fileID: 0}
+    - target: {fileID: 374150667840124766, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -3808752148845781986, guid: e03e538db736cbf4fba0318fc079a9e8, type: 3}
     - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
       propertyPath: m_RootOrder
       value: 1
@@ -2256,6 +2260,22 @@ PrefabInstance:
       propertyPath: _MaxVelocity
       value: 6
       objectReference: {fileID: 0}
+    - target: {fileID: 3275569032751403274, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: m_Size.x
+      value: 0.55820453
+      objectReference: {fileID: 0}
+    - target: {fileID: 3275569032751403274, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: m_Size.y
+      value: 1.1801329
+      objectReference: {fileID: 0}
+    - target: {fileID: 3275569032751403274, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: m_Offset.x
+      value: -0.018835664
+      objectReference: {fileID: 0}
+    - target: {fileID: 3275569032751403274, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: m_Offset.y
+      value: 0.001922369
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
 --- !u!1 &637676176