Merge branch 'dev' into soulaha

Assets/Animations/BigKnight_Death.anim

@@ -87,7 +87,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

Assets/Prefabs/Audio Source 2D.prefab

@@ -40,7 +40,7 @@ AudioSource:
   m_GameObject: {fileID: 2758730940586161386}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: -12631357001976263, guid: 06ed4a4573fabf84580596dba3e0c116, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 0
   m_Volume: 1

Assets/Prefabs/Audio Source 3D.prefab

@@ -40,7 +40,7 @@ AudioSource:
   m_GameObject: {fileID: 6915619910278317271}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: -12631357001976263, guid: 06ed4a4573fabf84580596dba3e0c116, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 0
   m_Volume: 1

Assets/Prefabs/MainMenu.prefab

@@ -404,6 +404,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine
+        m_MethodName: Play
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &1568932900757633595
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -859,7 +871,7 @@ MonoBehaviour:
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 1
+          m_IntArgument: 0
           m_FloatArgument: 0
           m_StringArgument: 
           m_BoolArgument: 0

Assets/Prefabs/SceneStuff.prefab

@@ -72,6 +72,43 @@ MonoBehaviour:
   - {x: 0.5, y: -0.5, z: 0}
   - {x: 0.5, y: 0.5, z: 0}
   - {x: -0.5, y: 0.5, z: 0}
+--- !u!1 &1003602831
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1003602832}
+  m_Layer: 5
+  m_Name: Audio Sources
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1003602832
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1003602831}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 10}
+  m_LocalScale: {x: 3.2, y: 3.2, z: 3.2}
+  m_Children:
+  - {fileID: 8739270310400334818}
+  - {fileID: 8739270309170515439}
+  m_Father: {fileID: 8365024801698166081}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1280, y: 720}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1005651896
 GameObject:
   m_ObjectHideFlags: 0
@@ -205,8 +242,135 @@ MonoBehaviour:
   m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
   m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
   m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_DeselectOnBackgroundClick: 1
+  m_DeselectOnBackgroundClick: 0
   m_PointerBehavior: 0
+--- !u!1 &2593205999227463710
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8595136747862204686}
+  - component: {fileID: 8524814605665108988}
+  m_Layer: 0
+  m_Name: Music Source
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8595136747862204686
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2593205999227463710}
+  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_Children: []
+  m_Father: {fileID: 3240649040312459155}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &8524814605665108988
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2593205999227463710}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 44585d646b36b32449dec43b29a3b930, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &3328484984159178892
 GameObject:
   m_ObjectHideFlags: 0
@@ -301,7 +465,8 @@ Transform:
   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_Children: []
+  m_Children:
+  - {fileID: 8595136747862204686}
   m_Father: {fileID: 8365024801698166081}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -556,6 +721,7 @@ Transform:
   - {fileID: 1005651898}
   - {fileID: 2678552953295986148}
   - {fileID: 3240649040312459155}
+  - {fileID: 1003602832}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -817,3 +983,135 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &782531423
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1003602832}
+    m_Modifications:
+    - target: {fileID: 2620472399707132429, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_audioClip
+      value: 
+      objectReference: {fileID: 8300000, guid: 0a4892c42cfb94b4eae53b6dc8f970d9, type: 3}
+    - target: {fileID: 2758730940586161386, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_Name
+      value: Menu Hover
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+--- !u!4 &8739270310400334818 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+  m_PrefabInstance: {fileID: 782531423}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1729752402
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1003602832}
+    m_Modifications:
+    - target: {fileID: 2620472399707132429, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_audioClip
+      value: 
+      objectReference: {fileID: 8300000, guid: 7b44149069a99684b84224d6588efe7f, type: 3}
+    - target: {fileID: 2758730940586161386, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_Name
+      value: Menu Click
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+--- !u!4 &8739270309170515439 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
+  m_PrefabInstance: {fileID: 1729752402}
+  m_PrefabAsset: {fileID: 0}

Assets/Prefabs/Vampire.prefab

@@ -970,6 +970,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
+      propertyPath: m_Volume
+      value: 0.7
+      objectReference: {fileID: 0}
     - target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
       propertyPath: m_Name
       value: Sucking Source
@@ -1037,6 +1041,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
+      propertyPath: m_Volume
+      value: 0.7
+      objectReference: {fileID: 0}
     - target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
       propertyPath: m_Name
       value: Suck Source

Assets/Scenes/YannTest.unity

@@ -123,7 +123,23 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!114 &397851252 stripped
+--- !u!82 &137443903 stripped
+AudioSource:
+  m_CorrespondingSourceObject: {fileID: 2620472400489621842, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
+  m_PrefabInstance: {fileID: 647315810}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &171858601 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
+  m_PrefabInstance: {fileID: 1359990804}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &171858602 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
   m_PrefabInstance: {fileID: 1359990804}
@@ -141,6 +157,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 1599369357879094150, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
+      propertyPath: m_FirstSelected
+      value: 
+      objectReference: {fileID: 1896701251}
     - target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
       propertyPath: m_Follow
       value: 
@@ -151,7 +171,7 @@ PrefabInstance:
       objectReference: {fileID: 720678398}
     - target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
       propertyPath: m_LocalPosition.x
@@ -215,6 +235,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a53670f9cd399ea4a8ae3ed81b923aa8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!223 &851326008 stripped
+Canvas:
+  m_CorrespondingSourceObject: {fileID: 1878107874060227344, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
+  m_PrefabInstance: {fileID: 1551362086}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &931097994 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1568061621804763920, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+  m_PrefabInstance: {fileID: 1896701250}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8560765ad764680488938e0b0912b914, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &938365833 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2632752448933966535, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
@@ -226,6 +262,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!82 &1099738162 stripped
+AudioSource:
+  m_CorrespondingSourceObject: {fileID: 2620472401436852063, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
+  m_PrefabInstance: {fileID: 647315810}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1202184212 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8306990693830195191, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
@@ -248,6 +289,14 @@ PrefabInstance:
       propertyPath: endTxt
       value: 
       objectReference: {fileID: 938365833}
+    - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
+      propertyPath: UICanvas
+      value: 
+      objectReference: {fileID: 851326008}
+    - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
+      propertyPath: mainMenu
+      value: 
+      objectReference: {fileID: 931097994}
     - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
       propertyPath: startTxt
       value: 
@@ -258,7 +307,7 @@ PrefabInstance:
       objectReference: {fileID: 836972483}
     - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
       propertyPath: m_LocalPosition.x
@@ -306,17 +355,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
---- !u!114 &1359990806 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
-  m_PrefabInstance: {fileID: 1359990804}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &1464970062 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1878107874314509256, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
@@ -349,7 +387,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1878107874060227351, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 1878107874060227351, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
       propertyPath: m_AnchorMax.x
@@ -449,6 +487,136 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
   m_PrefabInstance: {fileID: 647315810}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1896701250
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 182458770, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 137443903}
+    - target: {fileID: 182458771, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
+      value: 
+      objectReference: {fileID: 1099738162}
+    - target: {fileID: 1568932900757633595, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 137443903}
+    - target: {fileID: 4394421820717285768, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
+      value: 
+      objectReference: {fileID: 1099738162}
+    - target: {fileID: 4394421820928219480, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_Name
+      value: MainMenu
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 171858601}
+    - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
+      value: 
+      objectReference: {fileID: 1099738162}
+    - target: {fileID: 8613547101879964415, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 137443903}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+--- !u!1 &1896701251 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4394421821813469862, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+  m_PrefabInstance: {fileID: 1896701250}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1942557562
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -463,11 +631,19 @@ PrefabInstance:
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 1359990806}
+      objectReference: {fileID: 171858601}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 1359990806}
+      objectReference: {fileID: 171858601}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnStart
+      objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnAccept
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: globalCamera
       value: 
@@ -475,14 +651,14 @@ PrefabInstance:
     - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: gameFlowManager
       value: 
-      objectReference: {fileID: 1359990806}
+      objectReference: {fileID: 171858601}
     - target: {fileID: 1214567908930553593, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_Name
       value: Vampire
       objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_LocalPosition.x
@@ -527,15 +703,15 @@ PrefabInstance:
     - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: arena
       value: 
-      objectReference: {fileID: 397851252}
+      objectReference: {fileID: 171858602}
     - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: gameFlowManager
       value: 
-      objectReference: {fileID: 1359990806}
+      objectReference: {fileID: 171858601}
     - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: arena
       value: 
-      objectReference: {fileID: 397851252}
+      objectReference: {fileID: 171858602}
     - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: healthBar
       value: 
@@ -543,6 +719,6 @@ PrefabInstance:
     - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: gameFlowManager
       value: 
-      objectReference: {fileID: 1359990806}
+      objectReference: {fileID: 171858601}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}

Assets/Scenes/YannTest.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 769076b2e2713c84e8f8a2b36af587d9
+guid: ed1c3d7fbe0c90e41a8c73cd9949a3a9
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/BloodSucker.cs

@@ -18,12 +18,14 @@ public class BloodSucker : MonoBehaviour {
     VampireEntity vampireEntity;
     bool isSucking;
     float currentSuckTimer;
+    [HideInInspector] public ScreenShaker screenShaker;
     [HideInInspector] public SoundManager soundManager;
 
     void Awake() {
         vampireEntity = GetComponent<VampireEntity>();
         bloodParticles.Stop(true, ParticleSystemStopBehavior.StopEmitting);
         soundManager = FindObjectOfType<SoundManager>();
+        screenShaker = FindObjectOfType<ScreenShaker>();
     }
 
     void FixedUpdate() {
@@ -101,6 +103,7 @@ public class BloodSucker : MonoBehaviour {
             currentTarget.bloodTokens -= 1;
             vampireEntity.HealDamage(healthGainFromSuck);
             // print("One token sucked");
+            screenShaker.Shake();
             soundManager.PlaySound(suckSource, suckSounds, randomPitch:true, createTempSourceIfBusy:true);
             if (currentTarget.bloodTokens == 0) {
                 SetIsSucking(false);

Assets/Scripts/PlayerMovement.cs

@@ -21,6 +21,7 @@ public class PlayerMovement : MonoBehaviour {
 	VampireEntity vampireEntity = null!;
 	Animator animator = null!;
 	public bool facingRight { get; private set; } = true;
+    [HideInInspector] public ScreenShaker screenShaker;
 
     [SerializeField] AudioSource jumpSource;
     [SerializeField] AudioClip[] jumpSounds;
@@ -40,6 +41,7 @@ public class PlayerMovement : MonoBehaviour {
         animator = GetComponentInChildren<Animator>();
 		currentState = new ImmobileMovementState(this);
         soundManager = FindObjectOfType<SoundManager>();
+        screenShaker = FindObjectOfType<ScreenShaker>();
 	}
 
 	void Start() {
@@ -193,11 +195,13 @@ public class PlayerMovement : MonoBehaviour {
             // playerMovement.animator.SetBool("Jumping", true);
 			playerMovement.animator.Play("Player_Jump");
             playerMovement.soundManager.PlaySound(playerMovement.jumpSource, playerMovement.jumpSounds, randomPitch: true, createTempSourceIfBusy: true);
+            playerMovement.screenShaker.Shake();
         }
         public override void LeaveState() {
             // playerMovement.animator.SetBool("Jumping", false);
             playerMovement.animator.Play("Player_Idle");
             playerMovement.soundManager.PlaySound(playerMovement.landSource, playerMovement.landSounds, randomPitch: true, createTempSourceIfBusy: true);
+            playerMovement.screenShaker.Shake();
         }
 
 		public override BaseState? FixedUpdateState() {

Assets/Scripts/VampireEntity.cs

@@ -2,16 +2,19 @@
 using UnityEngine;
 
 public class VampireEntity : Entity {
-	[SerializeField] [field: Required]
+    [SerializeField]
+    [field: Required]
     PlayerStats playerStats = null!;
 
     // [SerializeField] [Required]
     // HealthBar healthBar;
     [HideInInspector] public PlayerMovement playerMovement;
+    [HideInInspector] public ScreenShaker screenShaker;
 
     protected override void Awake() {
         base.Awake();
         transform.SetParent(arena.minionParent);
+        screenShaker = FindObjectOfType<ScreenShaker>();
     }
 
     protected override void Start() {
@@ -27,10 +30,13 @@ public class VampireEntity : Entity {
             TakeDamage(playerStats.bloodLossRate * Time.deltaTime, this, sound: false);
     }
 
-	// public override void TakeDamage(float amount) {
+    public override bool TakeDamage(float amount, Entity other, bool sound = true) {
-	// 	base.TakeDamage(amount);
+        if (sound) {
-	// 	healthBar.SetHealthFraction(Health / initialHealth);
+            screenShaker.Shake();
-	// }
+        }
+
+        return base.TakeDamage(amount, other, sound);
+    }
 
     public bool IsInSafeZone() => playerMovement.IsInSafeZone;
 

Assets/Sound/Y2Mate.is - Castlevania (NES) Music - Stage 01 Vampire Killer-btgi3TPL3AE-48k-1649024338113.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 44585d646b36b32449dec43b29a3b930
+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: 

ProjectSettings/EditorBuildSettings.asset

@@ -5,9 +5,6 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
-    path: Assets/Scenes/Main Menu.unity
-    guid: 68bb79cf26688ab46a0c4c582d1cb315
   - enabled: 1
     path: Assets/Scenes/SampleScene.unity
     guid: 2cda990e2423bbf4892e6590ba056729