???

2023-05-06 19:20:37 -07:00
parent 3e2f462b3d de5abe740b
commit e723e2b612
27 changed files with 507 additions and 700 deletions
--- a/Assets/Animations/Bat/BatController.controller
+++ b/Assets/Animations/Bat/BatController.controller
@@ -65,7 +65,7 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
--- a/Assets/Animations/Effects/Explosion.anim
+++ b/Assets/Animations/Effects/Explosion.anim
@@ -82,7 +82,7 @@ AnimationClip:
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
--- a/Assets/Prefabs/DEBUG/PersistantData/DebugCanvas.prefab
+++ b/Assets/Prefabs/DEBUG/PersistantData/DebugCanvas.prefab
@@ -1113,7 +1113,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: Rolling Caves
+  m_text: Rolling Caverns
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2}
  m_sharedMaterial: {fileID: 55571796086095593, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2}
@@ -1387,7 +1387,7 @@ RectTransform:
  m_Children:
  - {fileID: 7749526488533549851}
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -2463,7 +2463,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: Clarinet Swamp
+  m_text: Reed Swamp
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2}
  m_sharedMaterial: {fileID: 55571796086095593, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2}
--- a/Assets/Scenes/GameEndScreen.unity
+++ b/Assets/Scenes/GameEndScreen.unity
@@ -1393,7 +1393,7 @@ MonoBehaviour:
  - <3 Sammy, Max, Bryanna, and Nick!
  backgroundImageObject: {fileID: 619461775}
  images:
-  - {fileID: 21300000, guid: f57c1189ab403744f83624627e0eb5ff, type: 3}
+  - {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
  backToMenuButton: {fileID: 1103778491}
 --- !u!114 &1404700850
 MonoBehaviour:
--- a/Assets/Scenes/GrappleScene.unity
+++ b/Assets/Scenes/GrappleScene.unity
@@ -1521,6 +1521,7 @@ Transform:
  - {fileID: 1866363915}
  - {fileID: 906228767}
  - {fileID: 1383539494}
+  - {fileID: 2120089895}
  - {fileID: 1027734973}
  - {fileID: 1507343986}
  - {fileID: 672084753}
@@ -2302,6 +2303,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: Slug (4)
      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171999, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
+      propertyPath: m_FlipX
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171999, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
+      propertyPath: m_FlipY
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 4018407283885727215, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
      propertyPath: rangeHorizontal
      value: 2
@@ -3960,6 +3969,84 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
  m_PrefabInstance: {fileID: 1107305515}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1126560255
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1413690797}
+    m_Modifications:
+    - target: {fileID: 367295637452716247, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_Name
+      value: GrappleBox (7)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1025473297745678352, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_Radius
+      value: 1.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1025473297745678352, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_Offset.y
+      value: -19.99
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_RootOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 3.02
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -23.47
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 16.94
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+--- !u!4 &1126560256 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
+  m_PrefabInstance: {fileID: 1126560255}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1192387873
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -4963,6 +5050,7 @@ Transform:
  - {fileID: 1817875257}
  - {fileID: 684906576}
  - {fileID: 1325296802}
+  - {fileID: 1126560256}
  m_Father: {fileID: 0}
  m_RootOrder: 24
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -52090,6 +52178,36 @@ Tilemap:
      m_TileObjectToInstantiateIndex: 65535
      dummyAlignment: 0
      m_AllTileFlags: 1073741825
+  - first: {x: -25, y: 16, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 26
+      m_TileSpriteIndex: 23
+      m_TileMatrixIndex: 2
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
+  - first: {x: -24, y: 16, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 26
+      m_TileSpriteIndex: 23
+      m_TileMatrixIndex: 2
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
+  - first: {x: -23, y: 16, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 26
+      m_TileSpriteIndex: 23
+      m_TileMatrixIndex: 2
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
  - first: {x: 1, y: 16, z: 0}
    second:
      serializedVersion: 2
@@ -113014,7 +113132,7 @@ Tilemap:
    m_Data: {fileID: 11400000, guid: 605c24591df054320be61ee96783195e, type: 2}
  - m_RefCount: 204
    m_Data: {fileID: 11400000, guid: db381af5bd75b4f909d3c46f4deafd2e, type: 2}
-  - m_RefCount: 21
+  - m_RefCount: 24
    m_Data: {fileID: 11400000, guid: 8ad16cf41deb94cf4afd912c15465261, type: 2}
  - m_RefCount: 17
    m_Data: {fileID: 11400000, guid: 5ce4e22fedcc84d03b3e2f51a7fb77fa, type: 2}
@@ -113095,7 +113213,7 @@ Tilemap:
    m_Data: {fileID: 1707607318, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
  - m_RefCount: 18
    m_Data: {fileID: 208169506, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
-  - m_RefCount: 21
+  - m_RefCount: 24
    m_Data: {fileID: 858304779, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
  - m_RefCount: 13
    m_Data: {fileID: -1027637906, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
@@ -113172,7 +113290,7 @@ Tilemap:
      e31: 0
      e32: 0
      e33: 1
-  - m_RefCount: 21
+  - m_RefCount: 24
    m_Data:
      e00: -1
      e01: 0.00000008742278
@@ -113281,7 +113399,7 @@ Tilemap:
      e32: 0
      e33: 1
  m_TileColorArray:
-  - m_RefCount: 10382
+  - m_RefCount: 10385
    m_Data: {r: 1, g: 1, b: 1, a: 1}
  - m_RefCount: 0
    m_Data: {r: 0.742567, g: 0.36139938, b: 0.43682057, a: 1}
@@ -114570,8 +114688,28 @@ CompositeCollider2D:
        Y: 190000000
      - X: -270000000
        Y: 170000000
-      - X: -220000000
+      - X: -250000000
        Y: 170000000
+      - X: -250000000
+        Y: 167500000
+      - X: -248124992
+        Y: 166875008
+      - X: -240937504
+        Y: 166875008
+      - X: -240000000
+        Y: 167500000
+      - X: -238124992
+        Y: 166875008
+      - X: -230937504
+        Y: 166875008
+      - X: -230000000
+        Y: 167500000
+      - X: -228124992
+        Y: 166875008
+      - X: -220937504
+        Y: 166875008
+      - X: -220000000
+        Y: 167500000
      - X: -220000000
        Y: 220000000
      - X: -140000000
@@ -115653,7 +115791,17 @@ CompositeCollider2D:
      - {x: -24, y: 19}
      - {x: -27, y: 19}
      - {x: -27, y: 17}
-      - {x: -22, y: 17}
+      - {x: -25, y: 17}
+      - {x: -25, y: 16.75}
+      - {x: -24.8125, y: 16.687502}
+      - {x: -24.09375, y: 16.687502}
+      - {x: -24, y: 16.75}
+      - {x: -23.8125, y: 16.687502}
+      - {x: -23.09375, y: 16.687502}
+      - {x: -23, y: 16.75}
+      - {x: -22.8125, y: 16.687502}
+      - {x: -22.09375, y: 16.687502}
+      - {x: -22, y: 16.75}
      - {x: -22, y: 22}
      - {x: -14, y: 22}
      - {x: -14, y: 21.937502}
@@ -116328,7 +116476,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 9.604257
+      value: 7.18
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
      propertyPath: m_LocalPosition.z
@@ -116512,6 +116660,76 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 5447655033524966674, guid: 5e69412b9141e4bdeaaaf00f6dce7b82, type: 3}
  m_PrefabInstance: {fileID: 2062345891}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2120089894
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 340437845}
+    m_Modifications:
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_RootOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -68.88
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 48.02
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.3654507
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171997, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_Name
+      value: Bat (18)
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171999, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_FlipX
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+--- !u!4 &2120089895 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+  m_PrefabInstance: {fileID: 2120089894}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1926772931522546277
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/OpeningMessage.unity
+++ b/Assets/Scenes/OpeningMessage.unity
@@ -915,7 +915,7 @@ MonoBehaviour:
  - (This level was built by Bryanna <3)
  backgroundImageObject: {fileID: 619461775}
  images:
-  - {fileID: 21300000, guid: afd522c1e5c3bd24ea6e9e4964ce9ace, type: 3}
+  - {fileID: 21300000, guid: b371419527bf6b14fb7bb4729334c44f, type: 3}
  backToMenuButton: {fileID: 0}
 --- !u!114 &1404700850
 MonoBehaviour:
--- a/Assets/Scenes/PerformanceisRuined.unity
+++ b/Assets/Scenes/PerformanceisRuined.unity
@@ -924,7 +924,7 @@ MonoBehaviour:
  - (This level was also built by Bryanna <3)
  backgroundImageObject: {fileID: 619461775}
  images:
-  - {fileID: 21300000, guid: b371419527bf6b14fb7bb4729334c44f, type: 3}
+  - {fileID: 21300000, guid: afd522c1e5c3bd24ea6e9e4964ce9ace, type: 3}
  backToMenuButton: {fileID: 0}
 --- !u!114 &1404700850
 MonoBehaviour:
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -1,579 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 9
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 3
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
-  m_UseRadianceAmbientProbe: 0
--- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 0
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 0
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 500
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 500
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 2
-    m_PVRDenoiserTypeDirect: 0
-    m_PVRDenoiserTypeIndirect: 0
-    m_PVRDenoiserTypeAO: 0
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 0
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 0}
--- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 3
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    buildHeightMesh: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
--- !u!1 &282088718
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 282088720}
-  - component: {fileID: 282088719}
-  - component: {fileID: 282088721}
-  - component: {fileID: 282088722}
-  m_Layer: 0
-  m_Name: Ground
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!212 &282088719
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 282088718}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
--- !u!4 &282088720
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 282088718}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1.62, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &282088721
-Rigidbody2D:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 282088718}
-  m_BodyType: 1
-  m_Simulated: 1
-  m_UseFullKinematicContacts: 0
-  m_UseAutoMass: 0
-  m_Mass: 1
-  m_LinearDrag: 0
-  m_AngularDrag: 0.05
-  m_GravityScale: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_Interpolate: 0
-  m_SleepingMode: 1
-  m_CollisionDetection: 0
-  m_Constraints: 0
--- !u!61 &282088722
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 282088718}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_ForceSendLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ForceReceiveLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ContactCaptureLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_CallbackLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1, y: 1}
-    newSize: {x: 1, y: 1}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1}
-  m_EdgeRadius: 0
--- !u!1 &519420028
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 519420032}
-  - component: {fileID: 519420031}
-  - component: {fileID: 519420029}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!81 &519420029
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 519420028}
-  m_Enabled: 1
--- !u!20 &519420031
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 519420028}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 1
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 0
-  m_HDR: 1
-  m_AllowMSAA: 0
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 0
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
--- !u!4 &519420032
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 519420028}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &672262252
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 672262257}
-  - component: {fileID: 672262256}
-  - component: {fileID: 672262255}
-  - component: {fileID: 672262258}
-  - component: {fileID: 672262254}
-  - component: {fileID: 672262253}
-  m_Layer: 0
-  m_Name: Player
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &672262253
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 672262252}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Actions: {fileID: -944628639613478452, guid: d3b3a33a062226becb420ab91e65fe8a, type: 3}
-  m_NotificationBehavior: 0
-  m_UIInputModule: {fileID: 0}
-  m_DeviceLostEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_DeviceRegainedEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ControlsChangedEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ActionEvents: []
-  m_NeverAutoSwitchControlSchemes: 0
-  m_DefaultControlScheme: 
-  m_DefaultActionMap: Player
-  m_SplitScreenIndex: -1
-  m_Camera: {fileID: 0}
--- !u!114 &672262254
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 672262252}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7b873819f9a3f36ef898a0403972da28, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  speed: 1.41
-  rb: {fileID: 672262255}
--- !u!50 &672262255
-Rigidbody2D:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 672262252}
-  m_BodyType: 0
-  m_Simulated: 1
-  m_UseFullKinematicContacts: 0
-  m_UseAutoMass: 0
-  m_Mass: 1
-  m_LinearDrag: 0
-  m_AngularDrag: 0.05
-  m_GravityScale: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_Interpolate: 0
-  m_SleepingMode: 1
-  m_CollisionDetection: 0
-  m_Constraints: 0
--- !u!212 &672262256
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 672262252}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 360e7fd61fa8c14ceacaeb0c2551c769, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
--- !u!4 &672262257
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 672262252}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &672262258
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 672262252}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_ForceSendLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ForceReceiveLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ContactCaptureLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_CallbackLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 0.64, y: 0.64}
-    newSize: {x: 1, y: 1}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1}
-  m_EdgeRadius: 0
--- a/Assets/Scenes/TransitionToClarinet.unity
+++ b/Assets/Scenes/TransitionToClarinet.unity
@@ -926,6 +926,7 @@ MonoBehaviour:
  backgroundImageObject: {fileID: 619461775}
  images:
  - {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
+<<<<<<< HEAD
  - {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
  - {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
  - {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
@@ -939,6 +940,8 @@ MonoBehaviour:
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
+=======
+>>>>>>> de5abe740beb93351416d6c0905424958e37e702
  backToMenuButton: {fileID: 0}
 --- !u!114 &1404700850
 MonoBehaviour:
--- a/Assets/Scenes/TransitionToCymbal.unity
+++ b/Assets/Scenes/TransitionToCymbal.unity
@@ -840,7 +840,7 @@ MonoBehaviour:
  - (This level was built by Nick.)
  backgroundImageObject: {fileID: 619461775}
  images:
-  - {fileID: 21300000, guid: 5b5741406b7c15a46b51bc33b1138ec1, type: 3}
+  - {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
  backToMenuButton: {fileID: 0}
 --- !u!114 &1404700850
 MonoBehaviour:
--- a/Assets/Scripts/CameraMovement.cs
+++ b/Assets/Scripts/CameraMovement.cs
@@ -45,8 +45,5 @@ public class CameraMovement : MonoBehaviour {

    public void FindPlayer() {
        player = GameObject.FindGameObjectWithTag("Player");
-        // if (player == null) {
-        //     print("null player!");
-        // }
    }
 }
--- a/Assets/Scripts/DebugSceneSwitcher.cs
+++ b/Assets/Scripts/DebugSceneSwitcher.cs
@@ -33,7 +33,6 @@ public class DebugSceneSwitcher : MonoBehaviour
                for (int i = 0; i < SceneManager.sceneCountInBuildSettings; i++)
                {
                    string newName = System.IO.Path.GetFileNameWithoutExtension(SceneUtility.GetScenePathByBuildIndex(i));
-                    print(newName);
                    sceneNames.Add(newName);
                }
                sceneDropdown.AddOptions(sceneNames);
@@ -45,7 +44,6 @@ public class DebugSceneSwitcher : MonoBehaviour

    public void ChangeScene(int index)
    {
-        // print(index);
        SceneController.Instance.LoadChosenScene(index);
        this.gameObject.SetActive(false);
    }
--- a/Assets/Scripts/DialogBoxes.cs
+++ b/Assets/Scripts/DialogBoxes.cs
@@ -22,7 +22,7 @@ public class DialogBoxes : MonoBehaviour


    // Start is called before the first frame update
-    void Start()
+    void Awake()
    {
        textField = this.gameObject.GetComponent<TMP_Text>();
        ReconfigureSpriteArray();
@@ -56,7 +56,11 @@ public class DialogBoxes : MonoBehaviour
            Sprite[] newImagesArray = new Sprite[dialogMessages.Length];
            for (int i = 0; i < newImagesArray.Length; i++)
            {
+                if (i < images.Length) {
                    newImagesArray[i] = images[i];
+                } else {
+                    newImagesArray[i] = null;
+                }
            }
            images = newImagesArray;
        }
--- a/Assets/Scripts/EnemyPatrol.cs
+++ b/Assets/Scripts/EnemyPatrol.cs
@@ -4,7 +4,9 @@ using UnityEngine;

 public class EnemyPatrol : MonoBehaviour {

+    [Header("Tambourine")]
    [HideInInspector] public bool pinned = false;
+    [HideInInspector] public TambourineBehavior pinnedTambourine;
    
    [Header("Horizontal")]
    public bool isHorizontal;
@@ -45,7 +47,7 @@ public class EnemyPatrol : MonoBehaviour {
    void Update() {
        if (!pinned) {
            if (isHorizontal) {
-                if (transform.position.x >= xRight || transform.position.x <= xLeft) {
+                if (transform.position.x > xRight || transform.position.x < xLeft) {
                    movementVectorHorizontal = -movementVectorHorizontal;
                    GetComponent<SpriteRenderer>().flipX = !GetComponent<SpriteRenderer>().flipX;
                }
@@ -60,13 +62,15 @@ public class EnemyPatrol : MonoBehaviour {
        }
    }

-    public void TogglePin(bool isPinned) {
+    public void TogglePin(bool isPinned, TambourineBehavior tambourine) {
+        this.pinned = isPinned;
        if (isPinned) {
            animator.speed = 0;
+            this.pinnedTambourine = tambourine;
        } else {
            animator.speed = 1;
+            this.pinnedTambourine = null;
        }
-
    }

    public void DefeatEnemy() {
@@ -75,10 +79,15 @@ public class EnemyPatrol : MonoBehaviour {

    IEnumerator Defeat() {
        isPlayingDefeatAnimation = true;
+        if (pinned) {
+            pinnedTambourine.DestroySelf();
+            TogglePin(false, this.pinnedTambourine);
+        }
        this.gameObject.GetComponent<BoxCollider2D>().enabled = false;
        animator.Play("Explosion");
+        float explosionTime = .25f;
        this.gameObject.GetComponent<AudioSource>().Play();
-        yield return new WaitForSeconds(animator.GetCurrentAnimatorStateInfo(0).length);
+        yield return new WaitForSeconds(explosionTime);
        this.gameObject.GetComponent<BoxCollider2D>().enabled = true;
        isPlayingDefeatAnimation = false;
        this.gameObject.SetActive(false);
--- a/Assets/Scripts/PlayerBehavior.cs
+++ b/Assets/Scripts/PlayerBehavior.cs
@@ -24,7 +24,6 @@ public class PlayerBehavior : MonoBehaviour
    private bool isDash = false;
    public float dashForce = 1f;
    public float dashTime = 1.0f;
-    private float dashInc = 0.1f;
    private float currentDash = 0.0f;
    private bool forceAdded = false;
    Vector2 dashVec;
@@ -146,9 +145,6 @@ public class PlayerBehavior : MonoBehaviour
                if (this.playerInput.actions["CymbalCrash"].WasPressedThisFrame()) {
                    // Play the sound
                    this.gameUI.ToggleCymbal(false);
-                    // this.audioSource.clip = cymbalSound;
-                    // this.audioSource.loop = false;
-                    // this.audioSource.Play();
                    cymbalAudio.Play();

                    // Set the cymbal active for the equivalent of one second
@@ -226,7 +222,6 @@ public class PlayerBehavior : MonoBehaviour
    void LetGoOfGrapple() {
        bool currentlyPaused = StateController.Instance.isPaused;
        if (grapplingRope.isGrappling && !currentlyPaused) {
-            print("currently paused is " + currentlyPaused + ", releasing grapple");
            if (tambourine != null) {
                tambourine.GetComponent<TambourineBehavior>().DestroySelf();
            }
@@ -241,7 +236,6 @@ public class PlayerBehavior : MonoBehaviour
        }
        else {
            reflect = new Vector2(saveVelocity.x * reflectForce, -(saveVelocity.y) * reflectForce);
-            //reflect = new Vector2(saveVelocity.x * 1.1f, -(saveVelocity.y) * reflectForce);
            hasBounced = true;
        }
        _rb.AddForce(reflect, ForceMode2D.Impulse);
@@ -250,7 +244,6 @@ public class PlayerBehavior : MonoBehaviour
    }

    void Water() {
-        print("water dash " + isDash);
        if(isDash) {
            saveVelocity = _rb.velocity / velocityCut;
            if (isDash) {
@@ -268,7 +261,6 @@ public class PlayerBehavior : MonoBehaviour
            grappleSurface = col.gameObject;
        }
        else if (col.tag == "instaDeath") {
-            print("player fell in spikes");
            StartCoroutine(DestroyPlayer());
        }
        else if (col.tag == "spawnPoint") {
@@ -331,7 +323,6 @@ public class PlayerBehavior : MonoBehaviour
            }
            else {
                StartCoroutine(DestroyPlayer());
-                print("enemy defeated player");
            }
        }
        else if (collision.gameObject.tag == "Projectile") {
@@ -362,7 +353,9 @@ public class PlayerBehavior : MonoBehaviour

    IEnumerator DestroyPlayer() {
        if (playerIsAlive) {
-            print("destroyPlayer called");
+            if (grapplingRope.isGrappling) {
+                LetGoOfGrapple();
+            }
            playerIsAlive = false;
            audioSource.clip = deathSound;
            audioSource.loop = false;
@@ -371,25 +364,14 @@ public class PlayerBehavior : MonoBehaviour

            // animate
            animator.Play("Die");
-            // yield return new WaitForSeconds(animator.GetCurrentAnimatorStateInfo(0).length);
            yield return new WaitForSeconds(audioSource.clip.length);

-            // this.stateController.SetDeathCanvasActive(true);
-
-            if (grapplingRope.isGrappling) {
-                LetGoOfGrapple();
-            }
-
            // destroy all tambourines
            GameObject[] currentTambourines = GameObject.FindGameObjectsWithTag("tambourine");
-            print("tambs found: " + currentTambourines.Length);
            if (currentTambourines != null) {
                foreach (GameObject tambourine in currentTambourines) {
                    if (tambourine != null) {
                        tambourine.GetComponent<TambourineBehavior>().DestroySelf();
-                        print("tamb destroyed");
-                    } else {
-                        print("null tamb");
                    }
                }
            }
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -125,7 +125,6 @@ public class PlayerMovement : MonoBehaviour
                isRegFalling = false;
            }
            else {
-                // print("not jumping");
                if (!_isJumpFalling && !isRegFalling) {
                    if (unlockedTrumpet) {
                        trumpet = 1;
@@ -143,7 +142,6 @@ public class PlayerMovement : MonoBehaviour
        #region JUMP CHECKS
        if (IsJumping && RB.velocity.y <= 0) {
            IsJumping = false;
-            // print("isJumping " + IsJumping);
            _isJumpFalling = true;
        }

@@ -162,7 +160,6 @@ public class PlayerMovement : MonoBehaviour
            _isJumpFalling = false;

            bool inCoyoteTime = LastOnGroundTime > 0;
-            //print("coyote time: " + inCoyoteTime);

            Jump();

@@ -186,7 +183,6 @@ public class PlayerMovement : MonoBehaviour

        // stop sound if needed
        if (soundPlaying && (isRegFalling || IsJumping || _isJumpFalling)) {
-            print("footsteps stop");
            audioSource.Stop();
            soundPlaying = false;
        }
@@ -201,10 +197,6 @@ public class PlayerMovement : MonoBehaviour

        #region GRAVITY
        //Higher gravity if we've released the jump input or are falling
-        // if (IsSliding)
-        // {
-        //     SetGravityScale(0);
-        // }
        if (RB.velocity.y < 0 && _moveInput.y < 0) {
            //Much higher gravity if holding down
            SetGravityScale(Data.gravityScale * Data.fastFallGravityMult);
@@ -234,13 +226,11 @@ public class PlayerMovement : MonoBehaviour
        #region SOUND CHECKS
        if (!IsJumping && !_isJumpFalling && !isRegFalling && _moveInput.x != 0) {
            if (!soundPlaying) {
-                // print("footsteps PLAY");
                audioSource.Play();
                soundPlaying = true;
            }
        }
        else if (soundPlaying && audioSource.clip.name == "footsteps") {
-            // print("footsteps stop");
            audioSource.Stop();
            soundPlaying = false;
        }
@@ -287,15 +277,14 @@ public class PlayerMovement : MonoBehaviour
        #region Calculate AccelRate
        float accelRate;

-        //Gets an acceleration value based on if we are accelerating (includes turning) 
-        //or trying to decelerate (stop). As well as applying a multiplier if we're air borne.
-        if (LastOnGroundTime > 0) {
+        // accelerate or decelerate
+        if (LastOnGroundTime > 0) { // if grounded
            accelRate = (Mathf.Abs(targetSpeed) > 0.01f) ? Data.runAccelAmount : Data.runDeccelAmount;
        }
-        else if (wasGrappling) {
+        else if (wasGrappling) { // if grappling
            accelRate = (Mathf.Abs(targetSpeed) > 0.01f) ? Data.runAccelAmount * Data.accelInAir : Data.runDeccelAmount * (Data.deccelInAir / 5);
        }
-        else {
+        else { // if in air
            accelRate = (Mathf.Abs(targetSpeed) > 0.01f) ? Data.runAccelAmount * Data.accelInAir : Data.runDeccelAmount * Data.deccelInAir;
        }
        #endregion
@@ -376,7 +365,6 @@ public class PlayerMovement : MonoBehaviour
    }

    public bool IsGrounded() {
-        // print(Physics2D.OverlapBox(this.transform.position, _groundCheckSize, 0, _groundLayer) && !IsJumping);
        return (Physics2D.OverlapBox(new Vector2(this.transform.position.x, this.transform.position.y - _groundCheckOffset), _groundCheckSize, 0, _groundLayer) && !IsJumping);
    }

--- a/Assets/Scripts/PlayerData.cs
+++ b/Assets/Scripts/PlayerData.cs
@@ -44,19 +44,8 @@ public class PlayerData : ScriptableObject
    public float jumpHangAccelerationMult;
    public float jumpHangMaxSpeedMult;

-    [Header("Wall Jump")]
-    public Vector2 wallJumpForce; //The actual force (this time set by us) applied to the player when wall jumping.
-    [Space(5)]
-    [Range(0f, 1f)] public float wallJumpRunLerp; //Reduces the effect of player's movement while wall jumping.
-    [Range(0f, 1.5f)] public float wallJumpTime; //Time after wall jumping the player's movement is slowed for.
-    public bool doTurnOnWallJump; //Player will rotate to face wall jumping direction
-
    [Space(20)]

-    [Header("Slide")]
-    public float slideSpeed;
-    public float slideAccel;
-
    [Header("Assists")]
    [Range(0.01f, 0.5f)] public float coyoteTime; //Grace period after falling off a platform, where you can still jump
    [Range(0.01f, 0.5f)] public float jumpInputBufferTime; //Grace period after pressing jump where a jump will be automatically performed once the requirements (eg. being grounded) are met.
--- a/Assets/Scripts/SceneController.cs
+++ b/Assets/Scripts/SceneController.cs
@@ -29,11 +29,6 @@ public class SceneController : MonoBehaviour
    void OnSceneLoaded(Scene scene, LoadSceneMode mode)
    {
        GameObject pauseMenu = GameObject.Find("PauseMenuCanvas");
-        if (pauseMenu != null)
-        {
-            // Button quitButton = GameObject.Find("QuitButton").GetComponent<Button>();
-            // quitButton.onClick.AddListener(BackToMainMenu);
-        }
        if (scene.buildIndex == 0)
        { // if this is the menu
            GameObject.Find("NewGameButton").GetComponent<Button>().onClick.AddListener(NextScene);
--- a/Assets/Scripts/StateController.cs
+++ b/Assets/Scripts/StateController.cs
@@ -92,10 +92,6 @@ public class StateController : MonoBehaviour
        if (deathCanvas != null)
        {
            Button respawnButton = GameObject.Find("RespawnButton").GetComponent<Button>();
-            if (respawnButton == null)
-            {
-                print("respawn button not found!");
-            }
            respawnButton.onClick.AddListener(RespawnPlayer);
            deathCanvas.SetActive(false);
        }
@@ -120,7 +116,6 @@ public class StateController : MonoBehaviour

        // keep track of all enemies
        enemiesInScene = GameObject.FindGameObjectsWithTag("Enemy");
-        // print(enemiesInScene);

        if (isPaused)
        {
--- a/Assets/Scripts/TambourineBehavior.cs
+++ b/Assets/Scripts/TambourineBehavior.cs
@@ -30,7 +30,6 @@ public class TambourineBehavior : MonoBehaviour {

    
    void Start() {
-        // rb.AddForce(new Vector2(horizSpeed, vertSpeed), ForceMode2D.Impulse);
        this.gameObject.transform.localScale = new Vector2(transform.localScale.x * player.GetComponent<PlayerBehavior>().forward, transform.localScale.y);
        StartCoroutine(CheckToDestroy());
    }
@@ -41,15 +40,12 @@ public class TambourineBehavior : MonoBehaviour {
        } else {
            if (collidedObject != null && collidedObject.tag != "grappleSurface" && !returnToPlayer) {
                rb.constraints = RigidbodyConstraints2D.FreezeAll;
-                // this.gameObject.transform.position = col.transform.position;
                timeLerped += Time.deltaTime;
                this.gameObject.transform.position = Vector2.Lerp(this.gameObject.transform.position, collidedObject.transform.position, timeLerped/timeToLerp);
                if (this.gameObject.transform.position.x == collidedObject.transform.position.x && this.gameObject.transform.position.y == collidedObject.transform.position.y && !animator.GetBool("pinned")) {
                    pinned = true;
                    animator.SetBool("pinned", true);
                    tambourineHitSound.Play();
-                } else {
-                    // print("pinned, but not same position: " + this.gameObject.transform.position + " / " + collidedObject.transform.position);
                }
            } else if (returnToPlayer) {
                Destroy(rb);
@@ -68,18 +64,14 @@ public class TambourineBehavior : MonoBehaviour {
    }

    void OnTriggerEnter2D(Collider2D col) {
-        // print(col.tag);
        if (col.tag == "Enemy") {
            this.gameObject.GetComponent<BoxCollider2D>().enabled = false;
            collidedObject = col.gameObject;
-            print("Pinning to enemy");
            this.gameObject.GetComponent<CircleCollider2D>().enabled = false;
-            collidedObject.GetComponent<EnemyPatrol>().pinned = true;
-            collidedObject.GetComponent<EnemyPatrol>().TogglePin(true);
+            collidedObject.GetComponent<EnemyPatrol>().TogglePin(true, this);
        } else if (col.tag == "Projectile") {
            this.gameObject.GetComponent<BoxCollider2D>().enabled = false;
            collidedObject = col.gameObject;
-            print("pinned to projectile");
            this.gameObject.GetComponent<CircleCollider2D>().enabled = false;
            collidedObject.GetComponent<ProjectileBehavior>().Pin();
        }
@@ -93,7 +85,6 @@ public class TambourineBehavior : MonoBehaviour {

    IEnumerator CheckToDestroy() {
        yield return new WaitForSeconds(3f);
-        // print("waited 5");
        if (!player.GetComponent<PlayerBehavior>().grapplingRope.isGrappling) {
            DestroySelf();
        }
@@ -106,8 +97,10 @@ public class TambourineBehavior : MonoBehaviour {
        }

        if (collidedObject != null && collidedObject.tag == "Enemy") {
-            collidedObject.GetComponent<EnemyPatrol>().pinned = false;
-            collidedObject.GetComponent<EnemyPatrol>().TogglePin(false);
+            EnemyPatrol enemy = collidedObject.GetComponent<EnemyPatrol>();
+            if (!enemy.isPlayingDefeatAnimation) {
+                enemy.TogglePin(false, this);
+            }
        } else if (collidedObject != null && collidedObject.tag == "Projectile") {
            collidedObject.GetComponent<ProjectileBehavior>().Explode();
        }
--- a/Assets/Scripts/Tutorial_GrapplingGun.cs
+++ b/Assets/Scripts/Tutorial_GrapplingGun.cs
@@ -8,9 +8,6 @@ public class Tutorial_GrapplingGun : MonoBehaviour {
    [Header("Scripts References:")]
    public Tutorial_GrapplingRope grappleRope;

-    [Header("Main Camera:")]
-    public Camera m_camera;
-
    [Header("Transform References:")]
    public Transform gunHolder;
    public Transform gunPivot;
@@ -41,7 +38,6 @@ public class Tutorial_GrapplingGun : MonoBehaviour {


    void Start() {
-        m_camera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>();
        grappleRope.enabled = false;
        m_springJoint2D.enabled = false;
        m_distanceJoint2D.distance = targetDistance + .5f;
@@ -51,11 +47,7 @@ public class Tutorial_GrapplingGun : MonoBehaviour {

    void Update() {
        
-        // Vector2 mousePos = m_camera.ScreenToWorldPoint(Mouse.current.position.ReadValue());
-        // RotateGun(mousePos, true);
-
        if (grappleRope.isGrappling && !inDistanceRange && Vector2.Distance(grapplePoint, new Vector2(m_rigidBody2D.transform.position.x, m_rigidBody2D.transform.position.y)) < targetDistance) {
-            // print(Vector2.Distance(grapplePoint, new Vector2(m_rigidBody2D.transform.position.x, m_rigidBody2D.transform.position.y)) + ", target: " + targetDistance);
            inDistanceRange = true;
        }
        if (grappleRope.isGrappling) {
@@ -80,14 +72,12 @@ public class Tutorial_GrapplingGun : MonoBehaviour {

    public void Grapple() {
        grappleDistanceVector = grapplePoint - (Vector2)gunPivot.position;
-        // print("grapple");
+
        m_springJoint2D.autoConfigureDistance = false;
        m_distanceJoint2D.autoConfigureDistance = false;

        m_springJoint2D.connectedAnchor = grapplePoint;
        m_springJoint2D.enabled = true;
-        // print("Spring Joint Enabled");
-        // print("Sprint Joint Distance:" + m_springJoint2D.distance);

        m_distanceJoint2D.connectedAnchor = grapplePoint;
    }
@@ -105,7 +95,6 @@ public class Tutorial_GrapplingGun : MonoBehaviour {

        m_springJoint2D.connectedAnchor = grapplePoint;
        m_springJoint2D.enabled = true;
-        // print("Spring Joint Enabled");

        m_distanceJoint2D.connectedAnchor = grapplePoint;
    }
@@ -123,7 +112,6 @@ public class Tutorial_GrapplingGun : MonoBehaviour {

        m_springJoint2D.connectedAnchor = grapplePoint;
        m_springJoint2D.enabled = true;
-        // print("Spring Joint Enabled");

        m_distanceJoint2D.connectedAnchor = grapplePoint;
    }
@@ -135,7 +123,6 @@ public class Tutorial_GrapplingGun : MonoBehaviour {
        inDistanceRange = false;
        m_rigidBody2D.gravityScale = 1;
        gunPivot.rotation = Quaternion.AngleAxis(90, Vector3.forward);
-        // print("disabled");
    }

 }
--- a/Assets/Scripts/Tutorial_GrapplingRope.cs
+++ b/Assets/Scripts/Tutorial_GrapplingRope.cs
@@ -32,7 +32,6 @@ public class Tutorial_GrapplingRope : MonoBehaviour {


    private void OnEnable() {
-        // print("on enabled called");
        moveTime = 0;
        m_lineRenderer.positionCount = precision;
        waveSize = startWaveSize;
@@ -45,7 +44,6 @@ public class Tutorial_GrapplingRope : MonoBehaviour {
    }

    private void OnDisable() {
-        // print("on disabled called");
        m_lineRenderer.enabled = false;
        isGrappling = false;
        hasPlayedThwip = false;
@@ -69,13 +67,7 @@ public class Tutorial_GrapplingRope : MonoBehaviour {
    }

    void DrawRope() {
-        // print("drawing");
-        // print("isGrappling: " + isGrappling);
        if (!straightLine) {
-            // float roundedLinePos = Mathf.Round(m_lineRenderer.GetPosition(precision - 1).x * 100.0f) * .01f;
-            // float roundedGrapplePos = Mathf.Round(m_lineRenderer.GetPosition(precision - 1).x * 100.0f) * .01f;
-            // // print(roundedLinePos + " / " + roundedGrapplePos);
-            // if (roundedLinePos == roundedGrapplePos) {
            if (m_lineRenderer.GetPosition(precision - 1).x == grapplingGun.grapplePoint.x) {
                straightLine = true;
            } else {
@@ -100,7 +92,6 @@ public class Tutorial_GrapplingRope : MonoBehaviour {
    }

    void DrawRopeWaves() {
-        // print(moveTime);
        for (int i = 0; i < precision; i++) {
            float delta = (float)i / ((float)precision - 1f);
            Vector2 offset = Vector2.Perpendicular(grapplingGun.grappleDistanceVector).normalized * ropeAnimationCurve.Evaluate(delta) * waveSize;
--- a/Assets/Sprites/Items/Materials/tambourine.mat
+++ b/Assets/Sprites/Items/Materials/tambourine.mat
@@ -0,0 +1,110 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: tambourine
+  m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Cube:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FaceTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: b5f64a07787ea48ad8d00b3ec2d138e4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OutlineTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Ambient: 0.5
+    - _Bevel: 0.5
+    - _BevelClamp: 0
+    - _BevelOffset: 0
+    - _BevelRoundness: 0
+    - _BevelWidth: 0
+    - _BumpFace: 0
+    - _BumpOutline: 0
+    - _ColorMask: 15
+    - _CullMode: 0
+    - _Diffuse: 0.5
+    - _FaceDilate: 0
+    - _FaceUVSpeedX: 0
+    - _FaceUVSpeedY: 0
+    - _GlowInner: 0.05
+    - _GlowOffset: 0
+    - _GlowOuter: 0.05
+    - _GlowPower: 0.75
+    - _GradientScale: 5
+    - _LightAngle: 3.1416
+    - _MaskSoftnessX: 0
+    - _MaskSoftnessY: 0
+    - _OutlineSoftness: 0
+    - _OutlineUVSpeedX: 0
+    - _OutlineUVSpeedY: 0
+    - _OutlineWidth: 0
+    - _PerspectiveFilter: 0.875
+    - _Reflectivity: 10
+    - _ScaleRatioA: 1
+    - _ScaleRatioB: 1
+    - _ScaleRatioC: 1
+    - _ScaleX: 1
+    - _ScaleY: 1
+    - _ShaderFlags: 0
+    - _Sharpness: 0
+    - _SpecularPower: 2
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _TextureHeight: 512
+    - _TextureWidth: 512
+    - _UnderlayDilate: 0
+    - _UnderlayOffsetX: 0
+    - _UnderlayOffsetY: 0
+    - _UnderlaySoftness: 0
+    - _VertexOffsetX: 0
+    - _VertexOffsetY: 0
+    - _WeightBold: 0.5
+    - _WeightNormal: 0
+    m_Colors:
+    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
+    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
+    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
+    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
+    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_BuildTextureStacks: []
--- a/Assets/Sprites/Items/Materials/tambourine.mat.meta
+++ b/Assets/Sprites/Items/Materials/tambourine.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b0a1b0f0d77937546862b5ee955b27cd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/SampleScene.unity.meta
+++ b/Assets/Scenes/SampleScene.unity.meta
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 2cda990e2423bbf4892e6590ba056729
+guid: 9a3feeaba8f298d4397f36b6abc8f8f4
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Sprites/UI/Materials/Big
+++ b/Assets/Sprites/UI/Materials/Big
@@ -0,0 +1,110 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Big Wood 2 Btn
+  m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Cube:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FaceTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 94804c0dfcee74009a8e281c1494d8db, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OutlineTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Ambient: 0.5
+    - _Bevel: 0.5
+    - _BevelClamp: 0
+    - _BevelOffset: 0
+    - _BevelRoundness: 0
+    - _BevelWidth: 0
+    - _BumpFace: 0
+    - _BumpOutline: 0
+    - _ColorMask: 15
+    - _CullMode: 0
+    - _Diffuse: 0.5
+    - _FaceDilate: 0
+    - _FaceUVSpeedX: 0
+    - _FaceUVSpeedY: 0
+    - _GlowInner: 0.05
+    - _GlowOffset: 0
+    - _GlowOuter: 0.05
+    - _GlowPower: 0.75
+    - _GradientScale: 5
+    - _LightAngle: 3.1416
+    - _MaskSoftnessX: 0
+    - _MaskSoftnessY: 0
+    - _OutlineSoftness: 0
+    - _OutlineUVSpeedX: 0
+    - _OutlineUVSpeedY: 0
+    - _OutlineWidth: 0
+    - _PerspectiveFilter: 0.875
+    - _Reflectivity: 10
+    - _ScaleRatioA: 1
+    - _ScaleRatioB: 1
+    - _ScaleRatioC: 1
+    - _ScaleX: 1
+    - _ScaleY: 1
+    - _ShaderFlags: 0
+    - _Sharpness: 0
+    - _SpecularPower: 2
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _TextureHeight: 512
+    - _TextureWidth: 512
+    - _UnderlayDilate: 0
+    - _UnderlayOffsetX: 0
+    - _UnderlayOffsetY: 0
+    - _UnderlaySoftness: 0
+    - _VertexOffsetX: 0
+    - _VertexOffsetY: 0
+    - _WeightBold: 0.5
+    - _WeightNormal: 0
+    m_Colors:
+    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
+    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
+    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
+    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
+    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_BuildTextureStacks: []
--- a/Assets/Sprites/UI/Materials/Big
+++ b/Assets/Sprites/UI/Materials/Big
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3d739c94f272ffc4b969ca2b16c5c0f8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: