Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame

popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity

@@ -497,6 +497,8 @@ MonoBehaviour:
   headerView: {fileID: 2098933370}
   player: {fileID: 2498033716723453586}
   stageManager: {fileID: 1870432536}
+  resultManager: {fileID: 0}
+  isDebug: 0
 --- !u!4 &1870432534
 Transform:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab

@@ -9,9 +9,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1149133266888835658}
-  - component: {fileID: 1149133266888835662}
-  - component: {fileID: 1149133266888835660}
-  - component: {fileID: 1149133266888835661}
   m_Layer: 0
   m_Name: Item
   m_TagString: Untagged
@@ -27,65 +24,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1149133266888835659}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 4.45, y: -1.84, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 8234367247832625597}
+  - {fileID: 6539942726493018669}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1149133266888835662
+--- !u!1 &1639218262903504554
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1149133266888835659}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b62a13975f3446e1b15bf182305ce742, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  itemType: 0
-  point: 100
---- !u!61 &1149133266888835660
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1149133266888835659}
-  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: 0.56, y: 0.56}
-    newSize: {x: 1.5, y: 1.5}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 0.56, y: 1.176997}
-  m_EdgeRadius: 0
---- !u!210 &1149133266888835661
-SortingGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1149133266888835659}
-  m_Enabled: 1
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 4
---- !u!1 &6067883180531073526
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -93,8 +39,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8234367247832625597}
+  - component: {fileID: 7728463243266716518}
-  - component: {fileID: 5598536773799968534}
+  - component: {fileID: 695127001350975139}
   m_Layer: 0
   m_Name: Sprite
   m_TagString: Untagged
@@ -102,27 +48,27 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8234367247832625597
+--- !u!4 &7728463243266716518
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6067883180531073526}
+  m_GameObject: {fileID: 1639218262903504554}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 3, y: 3, z: 3}
   m_Children: []
-  m_Father: {fileID: 1149133266888835658}
+  m_Father: {fileID: 6539942726493018669}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &5598536773799968534
+--- !u!212 &695127001350975139
 SpriteRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6067883180531073526}
+  m_GameObject: {fileID: 1639218262903504554}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -166,3 +112,88 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &5601708155711038756
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6539942726493018669}
+  - component: {fileID: 6882041833225575364}
+  - component: {fileID: 6926480996713002648}
+  - component: {fileID: 7505178801258639712}
+  m_Layer: 0
+  m_Name: Collider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6539942726493018669
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5601708155711038756}
+  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:
+  - {fileID: 7728463243266716518}
+  m_Father: {fileID: 1149133266888835658}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6882041833225575364
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5601708155711038756}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b62a13975f3446e1b15bf182305ce742, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemType: 0
+  point: 100
+--- !u!61 &6926480996713002648
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5601708155711038756}
+  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: 0.56, y: 0.56}
+    newSize: {x: 1.5, y: 1.5}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.56, y: 1.176997}
+  m_EdgeRadius: 0
+--- !u!210 &7505178801258639712
+SortingGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5601708155711038756}
+  m_Enabled: 1
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 4

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab

@@ -0,0 +1,260 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4612740703592252992
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7170547486884922313}
+  m_Layer: 0
+  m_Name: ItemTree
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7170547486884922313
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4612740703592252992}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.36, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4826568820401640802}
+  - {fileID: 6296419824617624433}
+  - {fileID: 3743485536561059171}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &4323740264674268969
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7170547486884922313}
+    m_Modifications:
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835659, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_Name
+      value: Item bottom
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, type: 3}
+--- !u!4 &3743485536561059171 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+    type: 3}
+  m_PrefabInstance: {fileID: 4323740264674268969}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5551214698037925672
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7170547486884922313}
+    m_Modifications:
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835659, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_Name
+      value: Item top
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, type: 3}
+--- !u!4 &4826568820401640802 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+    type: 3}
+  m_PrefabInstance: {fileID: 5551214698037925672}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6382703371944579387
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7170547486884922313}
+    m_Modifications:
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149133266888835659, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+        type: 3}
+      propertyPath: m_Name
+      value: Item center
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, type: 3}
+--- !u!4 &6296419824617624433 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b,
+    type: 3}
+  m_PrefabInstance: {fileID: 6382703371944579387}
+  m_PrefabAsset: {fileID: 0}

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f8d3cedbbe834fd595f363516033eb1
+guid: 9909b8ac6fba54dcd98d1a129a7c8c09
 PrefabImporter:
   externalObjects: {}
   userData: 

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1149133266888835659
+--- !u!1 &3565643019619598235
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,10 +8,41 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1149133266888835658}
+  - component: {fileID: 6091183625377926242}
-  - component: {fileID: 1149133266888835662}
+  m_Layer: 0
-  - component: {fileID: 1149133266888835660}
+  m_Name: Obstacle 1x1
-  - component: {fileID: 1149133266888835661}
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6091183625377926242
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3565643019619598235}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.5, y: 0.5, z: 0}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
+  m_Children:
+  - {fileID: 4498234376221693368}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4498234376221693369
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4498234376221693368}
+  - component: {fileID: 4498234376221693372}
+  - component: {fileID: 4498234376221693374}
+  - component: {fileID: 4498234376221693375}
   m_Layer: 0
   m_Name: Obstacle
   m_TagString: Untagged
@@ -19,28 +50,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1149133266888835658
+--- !u!4 &4498234376221693368
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1149133266888835659}
+  m_GameObject: {fileID: 4498234376221693369}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 4.45, y: -1.84, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 8234367247832625597}
+  - {fileID: 4888696605717816911}
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 6091183625377926242}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1149133266888835662
+--- !u!114 &4498234376221693372
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1149133266888835659}
+  m_GameObject: {fileID: 4498234376221693369}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b62a13975f3446e1b15bf182305ce742, type: 3}
@@ -48,13 +79,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   itemType: 1
   point: 0
---- !u!61 &1149133266888835660
+--- !u!61 &4498234376221693374
 BoxCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1149133266888835659}
+  m_GameObject: {fileID: 4498234376221693369}
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
@@ -72,20 +103,20 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1.5124912, y: 2.2887788}
+  m_Size: {x: 1, y: 1}
   m_EdgeRadius: 0
---- !u!210 &1149133266888835661
+--- !u!210 &4498234376221693375
 SortingGroup:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1149133266888835659}
+  m_GameObject: {fileID: 4498234376221693369}
   m_Enabled: 1
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 4
---- !u!1 &6067883180531073526
+--- !u!1 &7325959465453491716
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -93,8 +124,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8234367247832625597}
+  - component: {fileID: 4888696605717816911}
-  - component: {fileID: 5598536773799968534}
+  - component: {fileID: 8948517510153873636}
   m_Layer: 0
   m_Name: Sprite
   m_TagString: Untagged
@@ -102,27 +133,27 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8234367247832625597
+--- !u!4 &4888696605717816911
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6067883180531073526}
+  m_GameObject: {fileID: 7325959465453491716}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.00000011921, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.7932179, y: 1.7932179, z: 1.7932179}
+  m_LocalScale: {x: 1.19475, y: 0.7897765, z: 1}
   m_Children: []
-  m_Father: {fileID: 1149133266888835658}
+  m_Father: {fileID: 4498234376221693368}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &5598536773799968534
+--- !u!212 &8948517510153873636
 SpriteRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6067883180531073526}
+  m_GameObject: {fileID: 7325959465453491716}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b82d5b841abe54f95aee9a8a5a023f6a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x2.prefab

@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &4696369714068265835
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3565643019619598235, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_Name
+      value: Obstacle 1x2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_Size.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.579553
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 7.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3}

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ba1b2ce02b6d94ff480b6d688878ce0a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x1.prefab

@@ -0,0 +1,81 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &7244240817860771824
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3565643019619598235, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_Name
+      value: Obstacle 2x1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_Size.x
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.3895
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3}

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3ba6d16d008f749e78832383e04dda6c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x2.prefab

@@ -0,0 +1,96 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &4896317741957177885
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3565643019619598235, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_Name
+      value: Obstacle 2x2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_Size.x
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_Size.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.3895
+      objectReference: {fileID: 0}
+    - target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.579553
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 11.35
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3}

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dc3600eefd5374093819de1b4c04b6ae
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab

@@ -31,6 +31,8 @@ Transform:
   - {fileID: 2498033717167142639}
   - {fileID: 2498033717226844050}
   - {fileID: 2498033717336319282}
+  - {fileID: 4023274041187776678}
+  - {fileID: 2845075459559541233}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1392,7 +1394,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2498033717167142638}
   m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
-  m_LocalPosition: {x: -14.616316, y: -4.6622753, z: 76.31647}
+  m_LocalPosition: {x: -14, y: -4.6622753, z: 76.31647}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2498033717831380894}
@@ -1444,7 +1446,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: -0.76048136, y: -0.060187817}
+  m_Offset: {x: -0.51403904, y: -0.060187817}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -1455,7 +1457,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1.2645235, y: 3.2100582}
+  m_Size: {x: 0.7716389, y: 3.2100582}
   m_EdgeRadius: 0
 --- !u!50 &2498033717167142418
 Rigidbody2D:
@@ -1508,7 +1510,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0.015013218, y: 1.6362767}
+  m_Offset: {x: -0.016281128, y: 1.6362767}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -1519,7 +1521,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1.4087534, y: 0.43771267}
+  m_Size: {x: 1.3461647, y: 0.43771267}
   m_EdgeRadius: 0
 --- !u!1 &2498033717224243930
 GameObject:
@@ -1806,7 +1808,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2498033717336319282
 Transform:
   m_ObjectHideFlags: 0
@@ -1822,7 +1824,7 @@ Transform:
   - {fileID: 2498033717630274411}
   - {fileID: 4746805955649701969}
   - {fileID: 1160505026435208106}
-  - {fileID: 9168428630421231863}
+  - {fileID: 4612936347841386449}
   - {fileID: 4626877786095415448}
   m_Father: {fileID: 8987015135604457535}
   m_RootOrder: 3
@@ -2882,6 +2884,71 @@ Transform:
   m_Father: {fileID: 2498033717315373858}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4858745001267193434
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2845075459559541233}
+  m_Layer: 0
+  m_Name: Stage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2845075459559541233
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4858745001267193434}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -5.89, z: 70.6}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 7299868319642549078}
+  - {fileID: 6456401233483068362}
+  - {fileID: 8477804094190655380}
+  - {fileID: 8480268388009420091}
+  - {fileID: 3051576594862347254}
+  m_Father: {fileID: 8987015135604457535}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5814129463620590856
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4023274041187776678}
+  m_Layer: 0
+  m_Name: 30seconds point
+  m_TagString: Untagged
+  m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4023274041187776678
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5814129463620590856}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 148.91467, y: -3.5722752, z: 70.6}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8987015135604457535}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7127942323429120581
 GameObject:
   m_ObjectHideFlags: 0
@@ -2892,7 +2959,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8586512469031994946}
   m_Layer: 0
-  m_Name: 30seconds.
+  m_Name: 30seconds point
   m_TagString: Untagged
   m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
@@ -2993,6 +3060,218 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &8575146851560075872
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 8128513394056174269}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4612936347841386449}
+  m_Layer: 0
+  m_Name: Obstacle (Missing Prefab)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4612936347841386449
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 8128513394056174269}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8575146851560075872}
+  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:
+  - {fileID: 9168428630421231863}
+  m_Father: {fileID: 2498033717336319282}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &9203538401845259212
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 8128513394056174269}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9168428630421231863}
+  m_Layer: 0
+  m_Name: Missing Prefab (Dummy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9168428630421231863
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 1149133266888835658, guid: 0f8d3cedbbe834fd595f363516033eb1,
+    type: 3}
+  m_PrefabInstance: {fileID: 8128513394056174269}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9203538401845259212}
+  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: 4612936347841386449}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &489961613323106463
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2845075459559541233}
+    m_Modifications:
+    - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_Name
+      value: ItemTree
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1.36
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3}
+--- !u!4 &7299868319642549078 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
+    type: 3}
+  m_PrefabInstance: {fileID: 489961613323106463}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &941680629101445032
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2845075459559541233}
+    m_Modifications:
+    - target: {fileID: 3565643019619598235, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_Name
+      value: Obstacle 1x1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3}
+--- !u!4 &6456401233483068362 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+    type: 3}
+  m_PrefabInstance: {fileID: 941680629101445032}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2204964373705807971
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3488,6 +3767,156 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 3267439528212908321}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4405202724496719241
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2845075459559541233}
+    m_Modifications:
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 40.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8252989683844914566, guid: dc3600eefd5374093819de1b4c04b6ae,
+        type: 3}
+      propertyPath: m_Name
+      value: Obstacle 2x2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: dc3600eefd5374093819de1b4c04b6ae, type: 3}
+--- !u!4 &3051576594862347254 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1691959517394185855, guid: dc3600eefd5374093819de1b4c04b6ae,
+    type: 3}
+  m_PrefabInstance: {fileID: 4405202724496719241}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5021367020251027113
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2845075459559541233}
+    m_Modifications:
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 21.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6193298083711746155, guid: 3ba6d16d008f749e78832383e04dda6c,
+        type: 3}
+      propertyPath: m_Name
+      value: Obstacle 2x1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3ba6d16d008f749e78832383e04dda6c, type: 3}
+--- !u!4 &8480268388009420091 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3458920199869838226, guid: 3ba6d16d008f749e78832383e04dda6c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5021367020251027113}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5625699913419180571
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3638,6 +4067,81 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 5748689116466426578}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6918608246709469341
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2845075459559541233}
+    m_Modifications:
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 7.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8095060007939728624, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+        type: 3}
+      propertyPath: m_Name
+      value: Obstacle 1x2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ba1b2ce02b6d94ff480b6d688878ce0a, type: 3}
+--- !u!4 &8477804094190655380 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1559618087867832073, guid: ba1b2ce02b6d94ff480b6d688878ce0a,
+    type: 3}
+  m_PrefabInstance: {fileID: 6918608246709469341}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8128513394056174269
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3707,9 +4211,3 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0f8d3cedbbe834fd595f363516033eb1, type: 3}
---- !u!4 &9168428630421231863 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1149133266888835658, guid: 0f8d3cedbbe834fd595f363516033eb1,
-    type: 3}
-  m_PrefabInstance: {fileID: 8128513394056174269}
-  m_PrefabAsset: {fileID: 0}

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs

@@ -1,6 +1,7 @@
 using System;
 using UniRx;
 using UniRx.Triggers;
+using UnityEditor;
 using UnityEngine;
 
 namespace MyGame.Scenes.MiniGame.Scripts
@@ -24,6 +25,10 @@ namespace MyGame.Scenes.MiniGame.Scripts
         [SerializeField] private HeaderView headerView;
         [SerializeField] private Player player;
         [SerializeField] private StageManager stageManager;
+        [SerializeField] private ResultManager resultManager;
+#if UNITY_EDITOR
+        [SerializeField] private bool isDebug;
+#endif
 
         private readonly ReactiveProperty<MenuState> menuState = new ReactiveProperty<MenuState>();
         private readonly ReactiveProperty<GameState> state = new ReactiveProperty<GameState>();
@@ -55,7 +60,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
 
             this.UpdateAsObservable()
                 .Where(_ => menuState.Value == MenuState.Game)
-                .Where(_ => Input.GetMouseButtonDown(0))
+                .Where(_ => Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
                 .Subscribe(_ =>
                 {
                     state.Value = GameState.Play;
@@ -74,15 +79,17 @@ namespace MyGame.Scenes.MiniGame.Scripts
                         timerDisposable?.Dispose();
                         timerDisposable = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f))
                             .Select(time => (int)(timeLimit - time))
-                            .TakeWhile(time => time > 0)
+                            .TakeWhile(time => time >= 0)
                             .Subscribe(time =>
                             {
                                 headerView.ChangeTimeCount(time);
                             }, () =>
                             {
+                                state.Value = GameState.Success;
                             }).AddTo(this);
                         break;
                     case GameState.Success:
+                        resultManager.ShowResult();
                         break;
                     case GameState.Failure:
                         break;
@@ -102,7 +109,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
                     player.Move();
                     // カメラ移動
                     cameraTransform.position = playerTransform.position.x * Vector3.right + cameraOffset;
-                    if (Input.GetMouseButtonDown(0))
+                    if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
                     {
                         player.Jump();
                     }
@@ -116,6 +123,17 @@ namespace MyGame.Scenes.MiniGame.Scripts
                     return;
                 }
                 x.enabled = false;
+#if UNITY_EDITOR
+                var sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+                sphere.GetComponent<MeshRenderer>().material.color = Color.red;
+                sphere.transform.SetLocalScale(.4f);
+                sphere.transform.position = x.ClosestPoint(playerTransform.position);
+                sphere.transform.SetPositionZ(-5f);
+                if (item.ItemType == StageItem.Type.Obstacle && isDebug)
+                {
+                    EditorApplication.isPaused = true;
+                }
+#endif
                 switch (item.ItemType)
                 {
                     case StageItem.Type.Item1:

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs

@@ -1,6 +1,5 @@
 using System;
 using UniRx;
-using UniRx.Diagnostics;
 using UniRx.Triggers;
 using UnityEngine;
 
@@ -14,6 +13,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
         [SerializeField] private float hitTime = 1.5f;
         [SerializeField] private float hitWaitTime = 1f;
         private bool isJump;
+        private bool isPreHit;
         private readonly BoolReactiveProperty isHit = new BoolReactiveProperty();
         private IDisposable hitDisposable;
         
@@ -33,7 +33,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
 
         public void Jump()
         {
-            if (isJump)
+            if (isJump || isPreHit)
             {
                 return;
             }
@@ -52,18 +52,27 @@ namespace MyGame.Scenes.MiniGame.Scripts
         // こける
         public void Hit()
         {
+            if (isPreHit)
+            {
+                return;
+            }
+            isPreHit = true;
             hitDisposable?.Dispose();
             // ジャンプが終わるのを待つ
-            hitDisposable = this.UpdateAsObservable().First(_ => !isJump).Debug("Hit").Subscribe(_ =>
+            hitDisposable = this.UpdateAsObservable().First(_ => !isJump).Subscribe(_ =>
             {
+                var orgRotation = transform.localRotation;
+                var orgYAngle = orgRotation.eulerAngles.y;
+                transform.rotation = Quaternion.identity;
                 this.CallLerp(hitTime, t =>
                 {
-                    // transform.SetLocalPositionY(cachePos.y + Mathf.Sin(Mathf.PI * t) * jumpHeight);
+                    transform.localRotation = Quaternion.AngleAxis(orgYAngle + t * (3f * 360), Vector3.up);
                 }, () =>
                 {
                     isHit.Value = true;
                     this.CallWaitForSeconds(hitWaitTime, () =>
                     {
+                        isPreHit = false;
                         isHit.Value = false;
                     });
                 });

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs

@@ -0,0 +1,14 @@
+using UnityEngine;
+
+namespace MyGame.Scenes.MiniGame.Scripts
+{
+    public class ResultManager : MonoBehaviour
+    {
+        [SerializeField] private ResultView resultView;
+
+        public void ShowResult()
+        {
+      
+        }
+    }
+}

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1fc24dbddd0945f88b3f12d9fa309fa7
+timeCreated: 1655774996

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultView.cs

@@ -0,0 +1,17 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace MyGame.Scenes.MiniGame.Scripts
+{
+    public class ResultView : MonoBehaviour
+    {
+        [SerializeField] private Button closeButton;
+        [SerializeField] private Button retryButton;
+
+        private void Start()
+        {
+            
+        }
+    }
+}

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7f2d9998fe34453ca2ef6df451a75184
+timeCreated: 1655717498

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageManager.cs

@@ -0,0 +1,25 @@
+using UnityEngine;
+
+namespace MyGame.Scenes.MiniGame.Scripts
+{
+    public class StageManager : MonoBehaviour
+    {
+
+        private Transform[] stages;
+
+        public void SetBeginStages(Transform[] newStages)
+        {
+            stages = newStages;
+        }
+
+        public void GenerateStage()
+        {
+            
+        }
+
+        public void ResetStage()
+        {
+            
+        }
+    }
+}

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 92d8af3e7a454c858429c462d377f112
+timeCreated: 1655695700