Merge remote-tracking branch 'origin/main' into main

MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity

@@ -2625,7 +2625,7 @@ Transform:
   m_LocalScale: {x: 4.2975, y: 2.0569, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &563510750
 GameObject:
@@ -2929,7 +2929,7 @@ Transform:
   m_LocalScale: {x: 2.0502975, y: 2.0132937, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &680522170
 GameObject:
@@ -3411,7 +3411,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1935037035
 GameObject:
@@ -3867,272 +3867,3 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
---- !u!1 &2127634117
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2127634121}
-  - component: {fileID: 2127634120}
-  - component: {fileID: 2127634119}
-  - component: {fileID: 2127634118}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &2127634118
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2127634117}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &2127634119
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2127634117}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!223 &2127634120
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2127634117}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &2127634121
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2127634117}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 1816726937924081068}
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!1001 &1816726937924081067
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 2127634121}
-    m_Modifications:
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 288.818
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 39.586
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -302.12598
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 163.001
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6644325902043065115, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-      propertyPath: m_Name
-      value: Health Bar
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
---- !u!224 &1816726937924081068 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-  m_PrefabInstance: {fileID: 1816726937924081067}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &1816726937924081069 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7324259024582420636, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-  m_PrefabInstance: {fileID: 1816726937924081067}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &1816726937924081070 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 850314679749370762, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
-  m_PrefabInstance: {fileID: 1816726937924081067}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1816726937924081069}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &1816726937924081072
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1816726937924081069}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 0
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 0
-  m_TargetGraphic: {fileID: 1816726937924081070}
-  m_FillRect: {fileID: 0}
-  m_HandleRect: {fileID: 0}
-  m_Direction: 0
-  m_MinValue: 0
-  m_MaxValue: 1
-  m_WholeNumbers: 0
-  m_Value: 0
-  m_OnValueChanged:
-    m_PersistentCalls:
-      m_Calls: []

MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity

@@ -1958,6 +1958,22 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 374150667840124768, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: _MaxAcc
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 374150667840124768, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: _MinAcc
+      value: -2
+      objectReference: {fileID: 0}
+    - target: {fileID: 374150667840124768, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: _AccSpeed
+      value: 0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 374150667840124768, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
+      propertyPath: _MaxVelocity
+      value: 6
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
 --- !u!1 &637676176

MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity

@@ -2424,7 +2424,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: -2135585597343286014, guid: 4b2a04fdbe0ef4d8da8f90eaca817cd1, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a94f88a99bc4b47eab866de27ee69341, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -2461,8 +2461,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3405314fa73da438982268d433fbbc2f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!60 &219367238
-PolygonCollider2D:
+--- !u!61 &219367238
+BoxCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2478,41 +2478,15 @@ PolygonCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 0.8828125, y: 1}
+    oldSize: {x: 1.28, y: 1.28}
     newSize: {x: 0.8828125, y: 1}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
-  m_Points:
-    m_Paths:
-    - - {x: 0.4375, y: -0.265625}
-      - {x: 0.44140625, y: -0.2578125}
-      - {x: 0.44140625, y: 0.2578125}
-      - {x: 0.4375, y: 0.265625}
-      - {x: 0.390625, y: 0.29296875}
-      - {x: 0.36328125, y: 0.30859375}
-      - {x: 0.26171875, y: 0.3671875}
-      - {x: 0.21484375, y: 0.39453125}
-      - {x: 0.16015625, y: 0.42578125}
-      - {x: 0.05859375, y: 0.484375}
-      - {x: 0.02734375, y: 0.5}
-      - {x: -0.03125, y: 0.5}
-      - {x: -0.05859375, y: 0.484375}
-      - {x: -0.1875, y: 0.41015625}
-      - {x: -0.36328125, y: 0.30859375}
-      - {x: -0.4375, y: 0.265625}
-      - {x: -0.44140625, y: 0.2578125}
-      - {x: -0.44140625, y: -0.2578125}
-      - {x: -0.4375, y: -0.265625}
-      - {x: -0.31640625, y: -0.3359375}
-      - {x: -0.26171875, y: -0.3671875}
-      - {x: -0.21484375, y: -0.39453125}
-      - {x: -0.11328125, y: -0.453125}
-      - {x: -0.03125, y: -0.5}
-      - {x: 0.03125, y: -0.5}
-      - {x: 0.0859375, y: -0.46875}
-      - {x: 0.2421875, y: -0.37890625}
+  serializedVersion: 2
+  m_Size: {x: 1.28, y: 1.28}
+  m_EdgeRadius: 0
 --- !u!1 &563510750
 GameObject:
   m_ObjectHideFlags: 0

MuseumGame/Assets/Sprites/Artwork Sprites.meta~main

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: db04a197a226a47ba9b42ebe509b9f96
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 71938390b65010447bd9357a6450359c
+=======
+guid: a94f88a99bc4b47eab866de27ee69341
+>>>>>>> main
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: ac0a24c4b892f4e4eb667c0c22ae7490
+=======
+guid: 583f73bcdc6714bb494fde0e2ac57cc8
+>>>>>>> main
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 7947595c5ebf72648aab3049c3c7f7bd
+=======
+guid: 633f9d29b2bab49d481be27cf84b4ce6
+>>>>>>> main
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

MuseumGame/Assets/Sprites/Paint Projectile.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 91aa6c120a1f8d64d942204b2b6a6952
+=======
+guid: 99b222e3befa2bc4397d9c88480e9be8
+>>>>>>> Stashed changes
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

MuseumGame/UserSettings/EditorUserSettings.asset

@@ -6,31 +6,31 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
+      value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb
       flags: 0
     RecentlyUsedScenePath-9:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0