From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sat, 4 Sep 2021 16:32:55 +0000 (+0200)
Subject: Merge branch 'main' of https://github.com/KG0104/2DGame into main
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=2481f810c12d56728ecddfe15b4f3886c6c6bc05;p=SuperMouseAdventure.git

Merge branch 'main' of https://github.com/KG0104/2DGame into main
---

2481f810c12d56728ecddfe15b4f3886c6c6bc05
diff --cc 2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity
index 59f68a9,39bdbdf..6b36fac
--- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity
+++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity
@@@ -885,8 -885,8 +885,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1ef543ae79779264dad553f77239ae34, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
  --- !u!212 &66658443
  SpriteRenderer:
    m_ObjectHideFlags: 0
@@@ -988,8 -988,8 +988,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 0}
    m_Color: {r: 0, g: 0, b: 0, a: 0.8784314}
    m_RaycastTarget: 1
@@@ -1732,8 -1716,8 +1716,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    bumperForce: 100
    mouse: {fileID: 936765968}
  --- !u!212 &180334515
@@@ -1965,8 -1949,8 +1949,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    bumperForce: 100
    mouse: {fileID: 936765968}
  --- !u!212 &191038587
@@@ -2063,8 -2047,8 +2047,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3}
  --- !u!61 &214740915
  BoxCollider2D:
@@@ -2204,8 -2188,8 +2188,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -2279,8 -2263,8 +2263,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
    m_LookaheadTime: 0
    m_LookaheadSmoothing: 0
@@@ -2322,8 -2306,8 +2306,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
    m_LookaheadTime: 0
    m_LookaheadSmoothing: 0
@@@ -2349,8 -2333,8 +2333,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
  --- !u!1 &292106542
  GameObject:
    m_ObjectHideFlags: 0
@@@ -2378,8 -2362,8 +2362,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 877fd518f8e969e4993b4f52073a9bca, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    sounds:
    - name: sprung
      clip: {fileID: 8300000, guid: d3531d40a8de83b43a9a75af09138830, type: 3}
@@@ -2591,8 -2575,8 +2575,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -2668,8 -2652,8 +2652,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Navigation:
      m_Mode: 3
      m_WrapAround: 0
@@@ -2711,7 -2695,7 +2695,7 @@@
            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
            m_IntArgument: 0
            m_FloatArgument: 0
--          m_StringArgument: 
++          m_StringArgument:
            m_BoolArgument: 0
          m_CallState: 1
  --- !u!114 &336217344
@@@ -2724,8 -2708,8 +2708,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -2783,8 -2767,8 +2767,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -2798,8 -2782,8 +2782,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &345396788
  BoxCollider2D:
@@@ -3213,8 -3197,8 +3197,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -3407,8 -3391,8 +3391,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    bumperForce: 160
    mouse: {fileID: 936765968}
  --- !u!212 &429880756
@@@ -3743,8 -3727,8 +3727,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Navigation:
      m_Mode: 3
      m_WrapAround: 0
@@@ -3786,7 -3770,7 +3770,7 @@@
            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
            m_IntArgument: 0
            m_FloatArgument: 0
--          m_StringArgument: 
++          m_StringArgument:
            m_BoolArgument: 0
          m_CallState: 1
  --- !u!114 &445692664
@@@ -3799,8 -3783,8 +3783,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -3933,8 -3917,8 +3917,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -4166,8 -4150,8 +4150,8 @@@ MonoBehaviour
    m_Enabled: 0
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 0d8051f3ea1f9294c890e6d3a53d6837, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    begrenzer: {fileID: 1284463699}
    mouse: {fileID: 936765968}
    cameraLock: {fileID: 1790915304}
@@@ -4240,8 -4224,8 +4224,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_RenderShadows: 1
    m_RequiresDepthTextureOption: 2
    m_RequiresOpaqueTextureOption: 2
@@@ -4272,8 -4256,8 +4256,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_ShowDebugText: 0
    m_ShowCameraFrustum: 1
    m_IgnoreTimeScale: 0
@@@ -4686,8 -4670,8 +4670,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -4701,8 -4685,8 +4685,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &631259027
  BoxCollider2D:
@@@ -4920,7 -4904,7 +4904,7 @@@ Animator
    m_UpdateMode: 0
    m_ApplyRootMotion: 0
    m_LinearVelocityBlending: 0
--  m_WarningMessage: 
++  m_WarningMessage:
    m_HasTransformHierarchy: 1
    m_AllowConstantClipSamplingOptimization: 1
    m_KeepAnimatorControllerStateOnDisable: 0
@@@ -4934,8 -4918,8 +4918,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 5c29d09f2b5174b07812a2ca95ed3316, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    dialogueManager: {fileID: 2036393123}
    speakers:
    - {fileID: 1423490228}
@@@ -5370,7 -5354,7 +5354,7 @@@ Animator
    m_UpdateMode: 0
    m_ApplyRootMotion: 0
    m_LinearVelocityBlending: 0
--  m_WarningMessage: 
++  m_WarningMessage:
    m_HasTransformHierarchy: 1
    m_AllowConstantClipSamplingOptimization: 1
    m_KeepAnimatorControllerStateOnDisable: 0
@@@ -5384,8 -5368,8 +5368,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_RootBone: {fileID: 1518807717}
    m_BoneTransforms:
    - {fileID: 1518807717}
@@@ -5407,8 -5391,8 +5391,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!114 &717537043
  MonoBehaviour:
@@@ -5420,8 -5404,8 +5404,8 @@@
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 0
@@@ -5435,8 -5419,8 +5419,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    player: {fileID: 936765971}
    agroRange: 20
    MoveSpeed: 5
@@@ -10536,8 -10520,8 +10520,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 2100000, guid: 200465f962603d7488fd52abd3da2c88, type: 3}
    m_Color: {r: 0, g: 0, b: 0, a: 1}
    m_RaycastTarget: 0
@@@ -10559,7 -10543,7 +10543,7 @@@
      m_HorizontalOverflow: 0
      m_VerticalOverflow: 0
      m_LineSpacing: 1
--  m_Text: 
++  m_Text:
  --- !u!222 &746902509
  CanvasRenderer:
    m_ObjectHideFlags: 0
@@@ -10836,32 -10820,32 +10820,6 @@@ GameObject
    m_IsActive: 1
  --- !u!61 &795583263
  BoxCollider2D:
--  m_ObjectHideFlags: 0
--  m_CorrespondingSourceObject: {fileID: 0}
--  m_PrefabInstance: {fileID: 0}
--  m_PrefabAsset: {fileID: 0}
--  m_GameObject: {fileID: 795583261}
--  m_Enabled: 1
--  m_Density: 1
--  m_Material: {fileID: 0}
--  m_IsTrigger: 1
--  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: 9.86, y: 7.85}
--    newSize: {x: 9.86, y: 7.85}
--    adaptiveTilingThreshold: 0.5
--    drawMode: 0
--    adaptiveTiling: 0
--  m_AutoTiling: 0
--  serializedVersion: 2
--  m_Size: {x: 9.86, y: 7.85}
--  m_EdgeRadius: 0
----- !u!212 &795583264
--SpriteRenderer:
    m_ObjectHideFlags: 0
    m_CorrespondingSourceObject: {fileID: 0}
    m_PrefabInstance: {fileID: 0}
@@@ -11271,8 -11255,8 +11229,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 5964ae9a0d2d6c849bce0d023f7c45b8, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    isGolden: 0
    mouse: {fileID: 936765968}
  --- !u!1 &876283298
@@@ -11461,8 -11445,8 +11419,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -11901,8 -11885,8 +11859,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 09ce03f84d2a0384eaeb226cb6fbdf5b, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    speed: 36
    jumpForce: 54
    jumptime: 0.4
@@@ -12033,8 -12017,8 +11991,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: d449e328434351d4d90e70cf9fb6df9f, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    countText: {fileID: 1283337208}
    cheesecount: 0
    collected: 0
@@@ -12048,8 -12032,8 +12006,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: e8701f94365053a46bc5e370013d2409, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    mouseHealth: 5
    numberOfHearts: 5
    hearts:
@@@ -12070,8 -12054,8 +12028,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: e51156189eaae2245924b136bb893dfb, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
  --- !u!114 &936765978
  MonoBehaviour:
    m_ObjectHideFlags: 0
@@@ -12082,8 -12066,8 +12040,8 @@@
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 71be00732d00ec748ac1dd603acbe7da, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    fallenDown: 0
  --- !u!114 &936765979
  MonoBehaviour:
@@@ -12095,8 -12079,8 +12053,8 @@@
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: d51b0901a7480d44791bc856ca71009c, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    cheeseCoinCollected: 0
    cheeseCoin: {fileID: 169271316}
    cheeseCoinImage: {fileID: 1206416087}
@@@ -12114,8 -12098,8 +12072,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 86228eec2ce28124cae697faf008036d, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    gardenCheese: {fileID: 405401497}
    mouseRenderer: {fileID: 936765970}
    mouseIsGardener: 0
@@@ -12129,8 -12113,8 +12087,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 8ac99ea6be6a20540aa6abf5606d2875, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
  --- !u!114 &936765982
  MonoBehaviour:
    m_ObjectHideFlags: 0
@@@ -12141,8 -12125,8 +12099,8 @@@
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 5573110b00c79574da30b77e3fc52360, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    stampingSpeed: 100
  --- !u!95 &936765983
  Animator:
@@@ -12159,7 -12143,7 +12117,7 @@@
    m_UpdateMode: 0
    m_ApplyRootMotion: 0
    m_LinearVelocityBlending: 0
--  m_WarningMessage: 
++  m_WarningMessage:
    m_HasTransformHierarchy: 1
    m_AllowConstantClipSamplingOptimization: 1
    m_KeepAnimatorControllerStateOnDisable: 0
@@@ -12330,8 -12314,8 +12288,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7de0136e8f7b5d943beace14be2d4deb, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    mouse: {fileID: 936765968}
    knockBackValue: 30
  --- !u!1 &973671302
@@@ -12385,32 -12369,32 +12343,6 @@@ GameObject
    m_IsActive: 1
  --- !u!61 &974511291
  BoxCollider2D:
--  m_ObjectHideFlags: 0
--  m_CorrespondingSourceObject: {fileID: 0}
--  m_PrefabInstance: {fileID: 0}
--  m_PrefabAsset: {fileID: 0}
--  m_GameObject: {fileID: 974511289}
--  m_Enabled: 1
--  m_Density: 1
--  m_Material: {fileID: 0}
--  m_IsTrigger: 1
--  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: 9.86, y: 7.85}
--    newSize: {x: 9.86, y: 7.85}
--    adaptiveTilingThreshold: 0.5
--    drawMode: 0
--    adaptiveTiling: 0
--  m_AutoTiling: 0
--  serializedVersion: 2
--  m_Size: {x: 9.86, y: 7.85}
--  m_EdgeRadius: 0
----- !u!212 &974511292
--SpriteRenderer:
    m_ObjectHideFlags: 0
    m_CorrespondingSourceObject: {fileID: 0}
    m_PrefabInstance: {fileID: 0}
@@@ -12630,8 -12614,8 +12562,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -12687,8 -12671,8 +12619,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3}
  --- !u!61 &1002661581
  BoxCollider2D:
@@@ -12820,7 -12804,7 +12752,7 @@@ Animator
    m_UpdateMode: 0
    m_ApplyRootMotion: 0
    m_LinearVelocityBlending: 0
--  m_WarningMessage: 
++  m_WarningMessage:
    m_HasTransformHierarchy: 1
    m_AllowConstantClipSamplingOptimization: 1
    m_KeepAnimatorControllerStateOnDisable: 0
@@@ -12834,8 -12818,8 +12766,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_RootBone: {fileID: 1452174929}
    m_BoneTransforms:
    - {fileID: 1452174929}
@@@ -12857,8 -12841,8 +12789,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!114 &1006420615
  MonoBehaviour:
@@@ -12870,8 -12854,8 +12802,8 @@@
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 0
@@@ -12885,8 -12869,8 +12817,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    player: {fileID: 936765971}
    agroRange: 20
    MoveSpeed: 5
@@@ -13453,8 -13437,8 +13385,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3}
  --- !u!61 &1081637521
  BoxCollider2D:
@@@ -13714,11 -13698,11 +13646,11 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_ExcludedPropertiesInInspector:
    - m_Script
--  m_LockStageInInspector: 
++  m_LockStageInInspector:
    m_StreamingVersion: 20170927
    m_Priority: 10
    m_StandbyUpdate: 2
@@@ -13912,8 -13896,8 +13844,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 0
@@@ -13927,8 -13911,8 +13859,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!212 &1106877275
  SpriteRenderer:
@@@ -14010,7 -13994,7 +13942,7 @@@ Animator
    m_UpdateMode: 0
    m_ApplyRootMotion: 0
    m_LinearVelocityBlending: 0
--  m_WarningMessage: 
++  m_WarningMessage:
    m_HasTransformHierarchy: 1
    m_AllowConstantClipSamplingOptimization: 1
    m_KeepAnimatorControllerStateOnDisable: 0
@@@ -14045,8 -14029,8 +13977,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    player: {fileID: 936765971}
    agroRange: 0
    MoveSpeed: 0
@@@ -14083,8 -14067,8 +14015,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_IgnoreReversedGraphics: 1
    m_BlockingObjects: 0
    m_BlockingMask:
@@@ -14100,8 -14084,8 +14032,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_UiScaleMode: 0
    m_ReferencePixelsPerUnit: 100
    m_ScaleFactor: 1
@@@ -14180,8 -14164,8 +14112,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 819a2e792ae3efb44a738d759f050b68, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    pauseMenuUI: {fileID: 87876803}
  --- !u!1 &1112764634
  GameObject:
@@@ -14238,8 -14222,8 +14170,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    bumperForce: 100
    mouse: {fileID: 936765968}
  --- !u!212 &1112764637
@@@ -27269,8 -27253,8 +27201,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: bc2cf8de166e6c04fba789ac331ec852, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    groundCheck: {fileID: 972365581}
    dustEffect: {fileID: 723835315}
  --- !u!1 &1152173203
@@@ -27936,8 -27920,8 +27868,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -28064,8 -28048,8 +27996,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_HorizontalAxis: Horizontal
    m_VerticalAxis: Vertical
    m_SubmitButton: Submit
@@@ -28083,8 -28067,8 +28015,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_FirstSelected: {fileID: 0}
    m_sendNavigationEvents: 1
    m_DragThreshold: 10
@@@ -28226,8 -28210,8 +28158,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3}
  --- !u!61 &1230926688
  BoxCollider2D:
@@@ -28348,8 -28332,8 +28280,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1ef543ae79779264dad553f77239ae34, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
  --- !u!212 &1236178934
  SpriteRenderer:
    m_ObjectHideFlags: 0
@@@ -28507,8 -28491,8 +28439,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -28522,8 -28506,8 +28454,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &1261625990
  BoxCollider2D:
@@@ -29071,8 -29055,8 +29003,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -29086,8 -29070,8 +29018,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &1263841769
  BoxCollider2D:
@@@ -29253,8 -29237,8 +29185,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 0}
    m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
    m_RaycastTarget: 1
@@@ -29364,8 -29348,8 +29296,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -29439,8 -29423,8 +29371,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -29498,8 -29482,8 +29430,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -29513,8 -29497,8 +29445,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &1340959646
  BoxCollider2D:
@@@ -29754,8 -29738,8 +29686,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 04fb4457cc4eca346ae4b0599f20569e, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    DialogueManager: {fileID: 2036393123}
  --- !u!1 &1356534580
  GameObject:
@@@ -30431,8 -30415,8 +30363,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 735e97089dfbe134483f6327a5a31fc9, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    lastCheckpointPos: {x: 0, y: 0, z: 0}
    firstCheckpoint: {fileID: 936765971}
    mouse: {fileID: 1649732366}
@@@ -30477,7 -30461,7 +30409,7 @@@ Animator
    m_UpdateMode: 0
    m_ApplyRootMotion: 0
    m_LinearVelocityBlending: 0
--  m_WarningMessage: 
++  m_WarningMessage:
    m_HasTransformHierarchy: 1
    m_AllowConstantClipSamplingOptimization: 1
    m_KeepAnimatorControllerStateOnDisable: 0
@@@ -30491,8 -30475,8 +30423,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_RootBone: {fileID: 1889886567}
    m_BoneTransforms:
    - {fileID: 1889886567}
@@@ -30514,8 -30498,8 +30446,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!114 &1423339816
  MonoBehaviour:
@@@ -30527,8 -30511,8 +30459,8 @@@
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 0
@@@ -30542,8 -30526,8 +30474,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    player: {fileID: 936765971}
    agroRange: 20
    MoveSpeed: 5
@@@ -30900,8 -30884,8 +30832,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -30959,8 -30943,8 +30891,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -30974,8 -30958,8 +30906,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &1510844751
  BoxCollider2D:
@@@ -31221,7 -31205,7 +31153,7 @@@ Animator
    m_UpdateMode: 0
    m_ApplyRootMotion: 0
    m_LinearVelocityBlending: 0
--  m_WarningMessage: 
++  m_WarningMessage:
    m_HasTransformHierarchy: 1
    m_AllowConstantClipSamplingOptimization: 1
    m_KeepAnimatorControllerStateOnDisable: 0
@@@ -31235,8 -31219,8 +31167,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_RootBone: {fileID: 1375631336}
    m_BoneTransforms:
    - {fileID: 1375631336}
@@@ -31258,8 -31242,8 +31190,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!114 &1554536749
  MonoBehaviour:
@@@ -31271,8 -31255,8 +31203,8 @@@
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 0
@@@ -31286,8 -31270,8 +31218,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    player: {fileID: 936765971}
    agroRange: 20
    MoveSpeed: 5
@@@ -31427,8 -31411,8 +31359,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: a1366c1812a392446877373e9e4583b1, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    speed: 14
    rightTurningPoint: {fileID: 19821604}
    leftTurningPoint: {fileID: 680485543}
@@@ -31533,8 -31517,8 +31465,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: f4a0dc3a9183ba740a3206b453791f11, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
  --- !u!1 &1575923596
  GameObject:
    m_ObjectHideFlags: 0
@@@ -32394,8 -32378,8 +32326,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3}
  --- !u!1 &1723894137
  GameObject:
@@@ -32428,8 -32412,8 +32360,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -32443,8 -32427,8 +32375,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &1723894140
  BoxCollider2D:
@@@ -33417,8 -33401,8 +33349,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -33432,8 -33416,8 +33364,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &1820232476
  BoxCollider2D:
@@@ -33801,8 -33785,8 +33733,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -33816,8 -33800,8 +33748,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &1864677726
  BoxCollider2D:
@@@ -34094,8 -34078,8 +34026,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Navigation:
      m_Mode: 3
      m_WrapAround: 0
@@@ -34137,7 -34121,7 +34069,7 @@@
            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
            m_IntArgument: 0
            m_FloatArgument: 0
--          m_StringArgument: 
++          m_StringArgument:
            m_BoolArgument: 0
          m_CallState: 1
  --- !u!114 &1887736393
@@@ -34150,8 -34134,8 +34082,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -34322,8 -34306,8 +34254,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    enemyHealth: 1
    enemyDamage: 1
    spiky: 1
@@@ -34337,8 -34321,8 +34269,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    flashingTime: 0.3
  --- !u!61 &1901651473
  BoxCollider2D:
@@@ -34487,8 -34471,8 +34419,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: f4a0dc3a9183ba740a3206b453791f11, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
  --- !u!114 &1909309305
  MonoBehaviour:
    m_ObjectHideFlags: 0
@@@ -34499,8 -34483,8 +34431,8 @@@
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: a1366c1812a392446877373e9e4583b1, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    speed: 14
    rightTurningPoint: {fileID: 2030985964}
    leftTurningPoint: {fileID: 1633153119}
@@@ -34890,8 -34874,8 +34822,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -35777,8 -35761,8 +35709,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 84f62f9206a55914bb1e69401b9a1b82, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    continueButton: {fileID: 445692660}
    dialogueBox: {fileID: 1304108836}
    SpeechBubble: {fileID: 631343912}
@@@ -36019,8 -36003,8 +35951,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    m_Material: {fileID: 0}
    m_Color: {r: 1, g: 1, b: 1, a: 1}
    m_RaycastTarget: 1
@@@ -36215,8 -36199,8 +36147,8 @@@ MonoBehaviour
    m_Enabled: 1
    m_EditorHideFlags: 0
    m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3}
--  m_Name: 
--  m_EditorClassIdentifier: 
++  m_Name:
++  m_EditorClassIdentifier:
    bumperForce: 100
    mouse: {fileID: 936765968}
  --- !u!212 &2142996817
diff --cc 2DGame/Assets/Scripts/Dialogue/Dialogue.cs
index b013419,105abf3..146a87e
--- a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
+++ b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
@@@ -1,3 -1,4 +1,4 @@@
 -using System;
++using System;
  using System.Collections;
  using System.Collections.Generic;
  using UnityEngine;
@@@ -15,7 -16,7 +16,7 @@@ public class Dialogue : MonoBehaviou
      public Text dialogueText;
  
      public string[] sentences;
--    
++
      [HideInInspector]
      public int index;
  
@@@ -70,4 -91,4 +91,4 @@@
              mouse.GetComponent<MouseController>().enabled = true;
          }
      }
--}
++}
diff --cc 2DGame/UserSettings/EditorUserSettings.asset
index d84c05a,222ea1c..d4ab26f
--- a/2DGame/UserSettings/EditorUserSettings.asset
+++ b/2DGame/UserSettings/EditorUserSettings.asset
@@@ -21,19 -21,19 +21,19 @@@ EditorUserSettings
        value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353db7721130082beb
        flags: 0
      RecentlyUsedScenePath-5:
 -      value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe6c4a2b0f36e613
 +      value: 22424703114646680e0b0227036c5315001214153f2d2a352e3d143cecae2136ebf32f
        flags: 0
      RecentlyUsedScenePath-6:
 -      value: 22424703114646680e0b0227036c5315001214153f2d2a352e3d143cecae2136ebf32f
 +      value: 22424703114646680e0b0227036c5315001214152926227e38271427fb
        flags: 0
      RecentlyUsedScenePath-7:
 -      value: 22424703114646680e0b0227036c5315001214152926227e38271427fb
 +      value: 22424703114646680e0b0227036c6c0417050c192f3a23352367083debf42d
        flags: 0
      RecentlyUsedScenePath-8:
-       value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe721130082beb
 -      value: 22424703114646680e0b0227036c6c0417050c192f3a23352367083debf42d
++      value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe6c4a2b0f36e613
        flags: 0
      RecentlyUsedScenePath-9:
-       value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe6c4a2b0f36e613
+       value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe721130082beb
        flags: 0
      vcSharedLogLevel:
        value: 0d5e400f0650