Extracted code to Grid class, adjusted jump time to get better game feel

Also fixed scaling of score ui element

Assets/Prefabs/Chunks/Corridor_I 5.prefab

@@ -17,7 +17,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &96461661196683943
 Transform:
@@ -114,7 +114,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &96461661196762209
 Transform:
@@ -209,7 +209,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &6446285907898863301
 Transform:
@@ -278,7 +278,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &831280777384168858
 Transform:
@@ -374,7 +374,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &831280777384187622
 Transform:
@@ -473,7 +473,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &698029541116997622
 Transform:
@@ -557,7 +557,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &359509862147818852
 Transform:
@@ -639,7 +639,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &8960787494111689333
 Transform:
@@ -672,7 +672,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &1537947445481458753
 Transform:
@@ -757,7 +757,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &1904789675920430490
 Transform:
@@ -856,7 +856,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &1930304146026046311
 Transform:
@@ -954,7 +954,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &1481197180270425536
 Transform:
@@ -1025,7 +1025,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &4580938772284018755
 Transform:
@@ -1110,7 +1110,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &3231417360218924505
 Transform:
@@ -1208,7 +1208,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &7056382705426911732
 Transform:
@@ -1278,7 +1278,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &3265931218458703143
 Transform:
@@ -1364,7 +1364,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &4965981231653529008
 Transform:
@@ -1462,7 +1462,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &4965981231653551820
 Transform:
@@ -1557,7 +1557,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &2279133657129105154
 Transform:
@@ -1642,7 +1642,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117063331
 Transform:
@@ -1712,7 +1712,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117028343
 Transform:
@@ -1793,7 +1793,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117126045
 Transform:
@@ -1866,7 +1866,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117040365
 Transform:
@@ -1952,7 +1952,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117109057
 Transform:
@@ -2023,7 +2023,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117129173
 Transform:
@@ -2109,7 +2109,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117064147
 Transform:
@@ -2192,7 +2192,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117111195
 Transform:
@@ -2276,7 +2276,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117140403
 Transform:
@@ -2359,7 +2359,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117128599
 Transform:
@@ -2445,7 +2445,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117085237
 Transform:
@@ -2530,7 +2530,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117103533
 Transform:
@@ -2603,7 +2603,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117116713
 Transform:
@@ -2689,7 +2689,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5613211205117031763
 Transform:
@@ -2774,7 +2774,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &5757616955126159612
 Transform:
@@ -2872,7 +2872,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &3698448241964440323
 Transform:
@@ -2944,7 +2944,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &6796968398226975104
 Transform:
@@ -3041,7 +3041,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &6796968398226906950
 Transform:
@@ -3135,7 +3135,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &6906897417620130704
 Transform:
@@ -3231,7 +3231,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &6906897417620148460
 Transform:
@@ -3328,7 +3328,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &8331850446012945034
 Transform:
@@ -3362,7 +3362,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &8368511245192071097
 Transform:

Assets/Prefabs/Views/HeartImage.prefab

@@ -37,7 +37,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 30, y: -25}
-  m_SizeDelta: {x: 60, y: 50}
+  m_SizeDelta: {x: 50, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7612804925605912136
 CanvasRenderer:

Assets/Scenes/GameScene.unity

@@ -570,11 +570,11 @@ RectTransform:
   - {fileID: 1421905534}
   - {fileID: 2086036638}
   m_Father: {fileID: 1858832248}
-  m_RootOrder: 2
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -1.0768433}
+  m_AnchoredPosition: {x: 0, y: -1.076828}
   m_SizeDelta: {x: -534.24976, y: -25.013092}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &245285642
@@ -608,6 +608,7 @@ Transform:
   - {fileID: 1858832248}
   - {fileID: 1791311983}
   - {fileID: 214096430}
+  - {fileID: 378990291}
   m_Father: {fileID: 0}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -746,6 +747,107 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 377940177}
   m_CullTransparentMesh: 1
+--- !u!1 &378990290
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 378990291}
+  - component: {fileID: 378990294}
+  - component: {fileID: 378990293}
+  - component: {fileID: 378990292}
+  m_Layer: 0
+  m_Name: ScoreCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &378990291
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378990290}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 678372250}
+  m_Father: {fileID: 245285643}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &378990292
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378990290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &378990293
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378990290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &378990294
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378990290}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
 --- !u!1 &634835457
 GameObject:
   m_ObjectHideFlags: 0
@@ -801,7 +903,6 @@ GameObject:
   m_Component:
   - component: {fileID: 654164606}
   - component: {fileID: 654164605}
-  - component: {fileID: 654164607}
   m_Layer: 0
   m_Name: Directional Light
   m_TagString: Untagged
@@ -886,26 +987,6 @@ Transform:
   m_Father: {fileID: 2033098991}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!114 &654164607
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 654164604}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Version: 1
-  m_UsePipelineSettings: 1
-  m_AdditionalLightsShadowResolutionTier: 2
-  m_LightLayerMask: 1
-  m_CustomShadowLayers: 0
-  m_ShadowLayerMask: 1
-  m_LightCookieSize: {x: 1, y: 1}
-  m_LightCookieOffset: {x: 0, y: 0}
 --- !u!224 &678372250 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
@@ -2090,9 +2171,8 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 678372250}
-  - {fileID: 1754320530}
   - {fileID: 220002229}
+  - {fileID: 1754320530}
   m_Father: {fileID: 245285643}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2764,7 +2844,7 @@ PrefabInstance:
       objectReference: {fileID: 1872880027}
     - target: {fileID: 6347578780605603613, guid: f1719db018a1324408d90c8d16384871, type: 3}
       propertyPath: <Capacity>k__BackingField
-      value: 25
+      value: 20
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f1719db018a1324408d90c8d16384871, type: 3}
@@ -2773,7 +2853,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1858832248}
+    m_TransformParent: {fileID: 378990291}
     m_Modifications:
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_Pivot.x
@@ -2805,11 +2885,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: -93.99994
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_SizeDelta.y
-      value: -0.19000244
+      value: -60.33316
+      objectReference: {fileID: 0}
+    - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.1175
+      objectReference: {fileID: 0}
+    - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.1175
+      objectReference: {fileID: 0}
+    - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.1175
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_LocalPosition.x
@@ -2829,15 +2921,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_AnchoredPosition.x
@@ -2845,7 +2937,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.099853516
+      value: 0.111572266
       objectReference: {fileID: 0}
     - target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2886,7 +2978,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6190724271798382203, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -0.0001373291
+      value: -0.00015258789
       objectReference: {fileID: 0}
     - target: {fileID: 6190724271798382203, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
       propertyPath: m_AnchoredPosition.y

Assets/ScriptableObjects/PlayerData.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9055f72a604bc3f4ba01bc120f0643d2, type: 3}
   m_Name: PlayerData
   m_EditorClassIdentifier: 
-  <InvincibilityTime>k__BackingField: 3
+  <InvincibilityTime>k__BackingField: 300
   <JumpHeight>k__BackingField: 5.3
   <LaneSwitchSpeed>k__BackingField: 25
   <Speed>k__BackingField: 20

Assets/Scripts/Obstacles/Obstacle.cs

@@ -6,8 +6,8 @@ using UnityEngine;
 public class Obstacle : PoolingObject<Obstacle>, IObstacle,IDamageDealer,IResettable
 {
     [field: SerializeField] public bool IsOnAllLanes { get; private set; }
+    [field: SerializeField] public bool IsInevitable { get; private set; }
     public BoxCollider Collider { get; private set; }
-    //public BasePool<Obstacle> OwningPool { private get;  set; }
  
     private void Awake()
     {
@@ -30,9 +30,4 @@ public class Obstacle : PoolingObject<Obstacle>, IObstacle,IDamageDealer,IResett
     {
         target.TakeDamage(amount);
     }
-
-    //public void ReturnToPool()
-    //{
-    //    OwningPool.ReturnToPool(this);
-    //}
 }

Assets/Scripts/Player/States/JumpState.cs

@@ -9,7 +9,7 @@ public class JumpState : MovingState
     private float expiredTime = 0;
     private float previousDeltaY = 0;
     private float jumpHeight;
-    private float internalJumpTime = 0.55f;
+    private float internalJumpTime = 0.45f;
     public JumpState(PlayerStateMachine playerStateMachine, AnimationCurve curve) : base(playerStateMachine)
     {
         deltaYCurve = curve;
@@ -42,8 +42,6 @@ public class JumpState : MovingState
         playerSM.VerticalDeltaPosition = diff;
         if (jumpProgress > internalJumpTime)
         {  
-            expiredTime = 0;
-            playerSM.VerticalDeltaPosition = 0;
             playerSM.SetState(playerSM.PlayerGroundState);
         }
     }
@@ -52,5 +50,6 @@ public class JumpState : MovingState
         previousDeltaY = 0;
         expiredTime = 0;
         playerSM.VerticalDeltaPosition = 0;
+        playerSM.VerticalDeltaPosition = 0;
     }
 }

Assets/Scripts/Road/ChunkGenerator.cs

@@ -10,11 +10,13 @@ public class ChunkGenerator : MonoBehaviour
     
     public Chunk Generate(Chunk chunkToFill)
     {
+        if (ObstaclePools.IsEmpty())
+            return chunkToFill;
         var obstaclePool = ObstaclePools.GetRandomElement();
         var obstacle = obstaclePool.GetFromPool();
         chunkToFill.Obstacles.Add(obstacle);    
         obstacle.transform.SetParent(chunkToFill.transform, true);
-        obstacle.transform.localPosition = chunkToFill.GridPositions.GetRandomElement();
+        obstacle.transform.localPosition = chunkToFill.Grid.GetRandomPosition();
         if (obstacle.IsOnAllLanes)
         {
             obstacle.transform.localPosition = new Vector3(LaneSystem.CenterLane * LaneSystem.LaneWidth, transform.localPosition.y, transform.localPosition.z);

Assets/Scripts/Road/ChunkSpawner.cs

@@ -18,11 +18,7 @@ public class ChunkSpawner : MonoBehaviour // TODO: ISpawner
         waitBeforeSpawn = new WaitForSeconds(spawnDelay);
         SpawnInitialChunks();
     }
-    private void Update()
+
-    {
-        if (Input.GetKeyDown(KeyCode.S))
-            Spawn();
-    }
     public void SpawnInitialChunks()
     {
         lastChunk = chunkPool.GetFromPool();

Assets/Scripts/Road/Chunks/Chunk.cs

@@ -12,13 +12,11 @@ public abstract class Chunk : PoolingObject<Chunk>, IResettable
     [field: SerializeField] public Transform Begin { get;  private set; } 
     [field: SerializeField] public Transform End { get; private set; }
 
-    [SerializeField] private int gridRowCount;
     public List<Coin> Coins { get; private set; }
     public List<Obstacle> Obstacles { get; private set; }
     public BoxCollider Collider { get; private set; }
-    //public BasePool<Chunk> OwningPool { private get;  set; }
+    public Grid Grid { get; private set; }
 
-    public readonly List<Vector3> GridPositions = new List<Vector3>();
     virtual public void Init(ChunkSpawner spawner)
     {
         this.spawner = spawner;
@@ -28,7 +26,6 @@ public abstract class Chunk : PoolingObject<Chunk>, IResettable
         Collider = GetComponent<BoxCollider>();
         Coins = new List<Coin>();   
         Obstacles = new List<Obstacle>();
-
         InitializeGrid();
     }
 
@@ -36,18 +33,7 @@ public abstract class Chunk : PoolingObject<Chunk>, IResettable
     {
         Vector3 chunkLengthVector = (End.position - Begin.position);
         float chunkLength = chunkLengthVector.magnitude;
-        float rowLength = chunkLength / gridRowCount;
+        Grid = new Grid(chunkLength);
-        Debug.DrawLine(Vector3.zero, new Vector3(0, 5, 0), Color.red);
-        foreach (var lane in LaneSystem.Instance.Lanes)
-        {
-            float lanePosition = lane * LaneSystem.Instance.LaneWidth;
-            for (int i = 0; i < gridRowCount; i++)
-            {
-                Vector3 gridPosition = new Vector3(lanePosition, 0, i * rowLength);
-                Debug.DrawLine(gridPosition, Vector3.up* 100,Color.red,500);    
-                GridPositions.Add(gridPosition);
-            }
-        }
     }
 
     public void ResetToDefault()
@@ -82,19 +68,4 @@ public abstract class Chunk : PoolingObject<Chunk>, IResettable
     private void ChangeRotationBasedOnPreviousChunk(Chunk previousChunk)
     {
     }
-
-    //public void ReturnToPool()
-    //{
-    //    OwningPool.ReturnToPool(this);
-    //}
-
-    //public void GetOwningPool<T>(BasePool<T> pool) where T : MonoBehaviour, IPoolable
-    //{
-    //    throw new NotImplementedException();
-    //}
-
-    //public void SetOwningPool<T>(BasePool<T> pool) where T : MonoBehaviour, IPoolable
-    //{
-    //    throw new NotImplementedException();
-    //}
 }

Assets/Scripts/Road/Chunks/Grid.cs

@@ -1,21 +1,28 @@
 using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
 
-namespace Assets.Scripts.Road.Chunks
+public class Grid 
 {
-    public class Grid : MonoBehaviour
+    public readonly List<Vector3> GridPositions = new List<Vector3>();
-    {
+    private int gridRowCount;
 
-        // Use this for initialization
+    public Grid(float gridLength)
-        void Start()
     {
-
+        gridRowCount = 1;
+        float rowLength = gridLength / gridRowCount;
+        foreach (var lane in LaneSystem.Instance.Lanes)
+        {
+            float lanePosition = lane * LaneSystem.Instance.LaneWidth;
+            for (int i = 0; i < gridRowCount; i++)
+            {
+                Vector3 gridPosition = new Vector3(lanePosition, 0, i * rowLength);
+                GridPositions.Add(gridPosition);
             }
-
-        // Update is called once per frame
-        void Update()
-        {
-
         }
     }
+    public Vector3 GetRandomPosition()
+    {
+       return GridPositions.GetRandomElement();   
+    }
 }