Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated

Assets/_Game/Animations/Box.controller

@@ -11,6 +11,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 1
     m_ConditionEvent: TriggerTeleport
     m_EventTreshold: 0
+  - m_ConditionMode: 1
+    m_ConditionEvent: isBox
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: -1776799687280865887}
   m_Solo: 0
@@ -25,6 +28,56 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &-4548306943154343541
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: TriggerTeleport
+    m_EventTreshold: 0
+  - m_ConditionMode: 1
+    m_ConditionEvent: isSteel
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1900629327346482966}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-3717353801058244125
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 6867248645899112359}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8148148
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-1776799687280865887
 AnimatorState:
   serializedVersion: 5
@@ -73,6 +126,18 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+  - m_Name: isBox
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: isSteel
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -86,6 +151,33 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1102 &1900629327346482966
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: box_metal_tele
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -3717353801058244125}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 24ea1e1332152be40a7a5963ed3fd954, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &5900061077820952591
 AnimatorStateMachine:
   serializedVersion: 5
@@ -101,6 +193,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -1776799687280865887}
     m_Position: {x: 320, y: 20, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1900629327346482966}
+    m_Position: {x: 520, y: 170, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -123,6 +218,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -6153413997401798269}
+  - {fileID: -4548306943154343541}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

Assets/_Game/Animations/Box_tele.meta

+fileFormatVersion: 2
+guid: d9f3c48f1d9ff79418d419a3f10acb2e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Animations/Box_tele/box_metal_tele.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: box_metal_tele
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -5949414184907635584, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.033333335
+      value: {fileID: -1892080504000676217, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.06666667
+      value: {fileID: -7689641175478942709, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.11666667
+      value: {fileID: -3842604632534496133, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.15
+      value: {fileID: -3423044540001979401, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.18333334
+      value: {fileID: 6697863983064718086, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.23333333
+      value: {fileID: 4728818467373932062, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.3
+      value: {fileID: -1993792170067870633, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.36666667
+      value: {fileID: 2064591487064483266, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.43333334
+      value: {fileID: -3827568213847254078, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 91656613186247956, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - time: 0.55
+      value: {fileID: 1183612224413011031, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.6166667
+      value: {fileID: 4003694204860578412, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.6666667
+      value: {fileID: 807346465925773099, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.71666664
+      value: {fileID: 4003694204860578412, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.78333336
+      value: {fileID: 1247701235980005215, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.85
+      value: {fileID: 7650842911443579628, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.9
+      value: {fileID: 3063343499038564815, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.95
+      value: {fileID: 4728818467373932062, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.0166667
+      value: {fileID: 6697863983064718086, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.0833334
+      value: {fileID: -3423044540001979401, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.1666666
+      value: {fileID: -3842604632534496133, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.1833333
+      value: {fileID: -7689641175478942709, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.2666667
+      value: {fileID: -1892080504000676217, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.3333334
+      value: {fileID: -5949414184907635584, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -5949414184907635584, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -1892080504000676217, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -7689641175478942709, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -3842604632534496133, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -3423044540001979401, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 6697863983064718086, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 4728818467373932062, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -1993792170067870633, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 2064591487064483266, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -3827568213847254078, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 91656613186247956, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 1183612224413011031, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 4003694204860578412, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 807346465925773099, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 4003694204860578412, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 1247701235980005215, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 7650842911443579628, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 3063343499038564815, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 4728818467373932062, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 6697863983064718086, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -3423044540001979401, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -3842604632534496133, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -7689641175478942709, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -1892080504000676217, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -5949414184907635584, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.35
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/_Game/Animations/Box_tele/box_metal_tele.anim.meta

+fileFormatVersion: 2
+guid: 24ea1e1332152be40a7a5963ed3fd954
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Animations/Box_tele/box_paper_tele.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: box_paper_tele
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -3450343503830638726, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.06666667
+      value: {fileID: 737023048783857181, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.15
+      value: {fileID: -5408107145713080418, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.21666667
+      value: {fileID: 984402249649089753, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.28333333
+      value: {fileID: 4728818467373932062, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.35
+      value: {fileID: -1993792170067870633, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.41666666
+      value: {fileID: 2064591487064483266, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.48333332
+      value: {fileID: -3827568213847254078, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 0.55
+      value: {fileID: 91656613186247956, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - time: 0.6
+      value: {fileID: 1183612224413011031, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.6666667
+      value: {fileID: 4003694204860578412, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.71666664
+      value: {fileID: 807346465925773099, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.76666665
+      value: {fileID: 4003694204860578412, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.8333333
+      value: {fileID: 1247701235980005215, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.9
+      value: {fileID: 7650842911443579628, guid: 0621ddb50f221004d97153d0c28f6dae,
+        type: 3}
+    - time: 0.95
+      value: {fileID: 3063343499038564815, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1
+      value: {fileID: 4728818467373932062, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.0666667
+      value: {fileID: 984402249649089753, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.1666666
+      value: {fileID: -5408107145713080418, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.25
+      value: {fileID: 737023048783857181, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.2833333
+      value: {fileID: -5033267028658201850, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.3666667
+      value: {fileID: -2325536217268089460, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    - time: 1.45
+      value: {fileID: -3450343503830638726, guid: f43dc1e791ff46c41802df217aa24ba0,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -3450343503830638726, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 737023048783857181, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -5408107145713080418, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 984402249649089753, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 4728818467373932062, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -1993792170067870633, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 2064591487064483266, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -3827568213847254078, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 91656613186247956, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 1183612224413011031, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 4003694204860578412, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 807346465925773099, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 4003694204860578412, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 1247701235980005215, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 7650842911443579628, guid: 0621ddb50f221004d97153d0c28f6dae, type: 3}
+    - {fileID: 3063343499038564815, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 4728818467373932062, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 984402249649089753, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -5408107145713080418, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: 737023048783857181, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -5033267028658201850, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -2325536217268089460, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+    - {fileID: -3450343503830638726, guid: f43dc1e791ff46c41802df217aa24ba0, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.4666667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/_Game/Animations/Box_tele/box_paper_tele.anim.meta

+fileFormatVersion: 2
+guid: c1d0abcfd4019964d9b664962d67a9b8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Prefabs/Box.prefab

@@ -146,6 +146,7 @@ MonoBehaviour:
   boxSpriteRenderer: {fileID: 1289835444445307101}
   boxSprite: {fileID: -3607300160614655489, guid: 4e0289c8b2242b64399c5c1f9255746c,
     type: 3}
+  teleAnim: {fileID: -1423085054306266722}
 --- !u!50 &3360699364253786611
 Rigidbody2D:
   serializedVersion: 4

Assets/_Game/Prefabs/Box_Metallic.prefab

@@ -7,6 +7,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: -1423085054306266722, guid: a7364e26a9832294ba20cdc69c316a47,
+        type: 3}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: 6434c7829b1e2b642b0e7a93c1f2dae1, type: 2}
     - target: {fileID: 4750809880497945980, guid: a7364e26a9832294ba20cdc69c316a47,
         type: 3}
       propertyPath: m_Name
@@ -67,6 +72,22 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1289835444445307101, guid: a7364e26a9832294ba20cdc69c316a47,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -2493382446028924894, guid: fb03fa1f6b66a2a47a593378965eab6f,
+        type: 3}
+    - target: {fileID: 1289835444445307101, guid: a7364e26a9832294ba20cdc69c316a47,
+        type: 3}
+      propertyPath: m_SortingLayerID
+      value: 1734376287
+      objectReference: {fileID: 0}
+    - target: {fileID: 1289835444445307101, guid: a7364e26a9832294ba20cdc69c316a47,
+        type: 3}
+      propertyPath: m_SortingLayer
+      value: 4
+      objectReference: {fileID: 0}
     - target: {fileID: 5567568139991448763, guid: a7364e26a9832294ba20cdc69c316a47,
         type: 3}
       propertyPath: boxSpriteRenderer
@@ -83,12 +104,6 @@ PrefabInstance:
       value: 
       objectReference: {fileID: -6683888619758338254, guid: 4e0289c8b2242b64399c5c1f9255746c,
         type: 3}
-    - target: {fileID: 1289835444445307101, guid: a7364e26a9832294ba20cdc69c316a47,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: -2493382446028924894, guid: fb03fa1f6b66a2a47a593378965eab6f,
-        type: 3}
     - target: {fileID: 5567568139991448763, guid: a7364e26a9832294ba20cdc69c316a47,
         type: 3}
       propertyPath: boxSpriteRenderer
@@ -105,16 +120,6 @@ PrefabInstance:
       value: 
       objectReference: {fileID: -6683888619758338254, guid: 4e0289c8b2242b64399c5c1f9255746c,
         type: 3}
-    - target: {fileID: 1289835444445307101, guid: a7364e26a9832294ba20cdc69c316a47,
-        type: 3}
-      propertyPath: m_SortingLayerID
-      value: 1734376287
-      objectReference: {fileID: 0}
-    - target: {fileID: 1289835444445307101, guid: a7364e26a9832294ba20cdc69c316a47,
-        type: 3}
-      propertyPath: m_SortingLayer
-      value: 3
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a7364e26a9832294ba20cdc69c316a47, type: 3}
 --- !u!212 &4576147147886417368 stripped

Assets/_Game/Scenes/Level 2.unity

@@ -271,7 +271,7 @@ PrefabInstance:
         type: 3}
       propertyPath: deathCanvas
       value: 
-      objectReference: {fileID: 1432049875}
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 845f91cea7baaa34bb00869e19dd41a3, type: 3}
 --- !u!4 &10269126 stripped
@@ -431,7 +431,7 @@ PrefabInstance:
         type: 3}
       propertyPath: deathCanvas
       value: 
-      objectReference: {fileID: 1432049875}
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 845f91cea7baaa34bb00869e19dd41a3, type: 3}
 --- !u!4 &49970829 stripped
@@ -522,7 +522,7 @@ PrefabInstance:
         type: 3}
       propertyPath: deathCanvas
       value: