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

popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim

@@ -70,7 +70,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 1.2833333
+        time: 1
         value: {x: 0, y: 0, z: -19.897736}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -95,7 +95,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.691212}
       - serializedVersion: 3
-        time: 1.6666666
+        time: 0.98333335
         value: {x: 0, y: 0, z: -19.336334}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -165,14 +165,14 @@ AnimationClip:
         time: 0.53333336
         value: {x: 1.3457108, y: -1.2956285, z: 0}
         inSlope: {x: 4.6796384, y: 0.6901133, z: 0}
-        outSlope: {x: 0, y: 0.6901133, z: 0}
+        outSlope: {x: 0, y: 4.9674244, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.45025653, y: 0.27362296, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.34686986, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.30549812, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.73333335
+        time: 0.78333336
-        value: {x: 1.3457108, y: -0.7121545, z: 0}
+        value: {x: 1.3457108, y: -0.6538049, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -180,7 +180,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.9166667
+        time: 1
         value: {x: 1.3457108, y: -1.2956285, z: 0}
         inSlope: {x: 0, y: -7.207347, z: 0}
         outSlope: {x: 0, y: 3.3245983, z: 0}
@@ -188,51 +188,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.3571108, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.6611337, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.1166667
-        value: {x: 1.3457108, y: -0.9585297, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.3166667
-        value: {x: 1.3457108, y: -1.2956285, z: 0}
-        inSlope: {x: 0, y: -3.7606313, z: 0}
-        outSlope: {x: 0, y: 3.0077975, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.4563444, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.6939897, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.4666667
-        value: {x: 1.3457108, y: -1.0983431, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.6333333
-        value: {x: 1.3457108, y: -1.2956285, z: 0}
-        inSlope: {x: 0, y: -2.3859308, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.65
-        value: {x: 1.3457108, y: -1.2956285, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -828,7 +783,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1.6666666
+    m_StopTime: 1
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -931,15 +886,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.45025653
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.65
-        value: 1.3457108
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -963,14 +909,14 @@ AnimationClip:
         time: 0.53333336
         value: -1.2956285
         inSlope: 0.6901133
-        outSlope: 0.6901133
+        outSlope: 4.9674244
-        tangentMode: 0
+        tangentMode: 1
         weightedMode: 0
         inWeight: 0.27362296
-        outWeight: 0.34686986
+        outWeight: 0.30549812
       - serializedVersion: 3
-        time: 0.73333335
+        time: 0.78333336
-        value: -0.7121545
+        value: -0.6538049
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -978,7 +924,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.9166667
+        time: 1
         value: -1.2956285
         inSlope: -7.207347
         outSlope: 3.3245983
@@ -986,42 +932,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.3571108
         outWeight: 0.6611337
-      - serializedVersion: 3
-        time: 1.1166667
-        value: -0.9585297
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.3166667
-        value: -1.2956285
-        inSlope: -3.7606313
-        outSlope: 3.0077975
-        tangentMode: 1
-        weightedMode: 0
-        inWeight: 0.4563444
-        outWeight: 0.6939897
-      - serializedVersion: 3
-        time: 1.4666667
-        value: -1.0983431
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.6333333
-        value: -1.2956285
-        inSlope: -2.3859308
-        outSlope: 0
-        tangentMode: 1
-        weightedMode: 0
-        inWeight: 1
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1335,7 +1245,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.2833333
+        time: 1
         value: -19.897736
         inSlope: 0
         outSlope: 0
@@ -1477,7 +1387,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.691212
       - serializedVersion: 3
-        time: 1.6666666
+        time: 0.98333335
         value: -19.336334
         inSlope: 0
         outSlope: 0
@@ -2006,7 +1916,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: AnimationPivot_pink/pink/wing/right_b
+    path: AnimationPivot_pink
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -2016,7 +1926,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: AnimationPivot_pink/pink/wing/right_b
+    path: AnimationPivot_pink
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -2026,7 +1936,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: AnimationPivot_pink/pink/wing/right_b
+    path: AnimationPivot_pink
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -2096,7 +2006,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: AnimationPivot_pink/pink/wing/right_b_back
+    path: AnimationPivot_pink/pink/wing/right_b
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -2106,7 +2016,17 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: AnimationPivot_pink/pink/wing/right_b_back
+    path: AnimationPivot_pink/pink/wing/right_b
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: AnimationPivot_pink/pink/wing/right_b
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -2119,16 +2039,6 @@ AnimationClip:
     path: AnimationPivot_pink/pink/wing/right_b_back
     classID: 4
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: AnimationPivot_pink
-    classID: 4
-    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve: []
@@ -2136,7 +2046,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: AnimationPivot_pink
+    path: AnimationPivot_pink/pink/wing/right_b_back
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -2146,7 +2056,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: AnimationPivot_pink
+    path: AnimationPivot_pink/pink/wing/right_b_back
     classID: 4
     script: {fileID: 0}
   m_HasGenericRootTransform: 0

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

@@ -233,18 +233,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 184442866}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &184442868 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 184442866}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &275350936
 GameObject:
   m_ObjectHideFlags: 0
@@ -337,7 +325,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mTarget: {fileID: 7328251774669809641}
+  mTarget: {fileID: 0}
 --- !u!114 &342304218
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -504,18 +492,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 480107651}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &480107653 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 480107651}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &515787033
 GameObject:
   m_ObjectHideFlags: 0
@@ -744,18 +720,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 628830307}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &628830309 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 628830307}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!4 &644307298 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 153722296424896321, guid: acd6e6365b5fe4863aedc684a50b8028,
@@ -850,18 +814,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 894575453}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &894575455 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 894575453}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &896692871
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -955,18 +907,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 930800255}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &930800257 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 930800255}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &931896956
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1047,18 +987,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 931896956}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &931896958 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 931896956}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &962275290
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1139,18 +1067,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 962275290}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &962275292 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 962275290}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &963314161
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1407,6 +1323,11 @@ PrefabInstance:
       propertyPath: hitTime
       value: 1.4
       objectReference: {fileID: 0}
+    - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
+        type: 3}
+      propertyPath: fallLimit
+      value: -7.59
+      objectReference: {fileID: 0}
     - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
         type: 3}
       propertyPath: fallSpeed
@@ -1802,18 +1723,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1328382762}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1328382764 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 1328382762}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &1340402662
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1907,18 +1816,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1363981460}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1363981462 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 1363981460}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &1426747593
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1956,7 +1853,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1450368325}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 9.285316, y: -2.5877247, z: -5.716469}
+  m_LocalPosition: {x: 0, y: -2.5877247, z: -5.716469}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2383,18 +2280,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1862591111}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1862591113 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 1862591111}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1870432532
 GameObject:
   m_ObjectHideFlags: 0
@@ -2426,7 +2311,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 96c2b99ef2e6c42dd998b782def0bd0e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  timeLimit: 30
   headerView: {fileID: 7328251774669809638}
   player: {fileID: 1261404582}
   stageSelectView: {fileID: 2071735749}
@@ -2482,19 +2366,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 92d8af3e7a454c858429c462d377f112, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  backGrounds:
-  - {fileID: 894575455}
-  - {fileID: 2044773547}
-  - {fileID: 184442868}
-  - {fileID: 628830309}
-  - {fileID: 962275292}
-  - {fileID: 931896958}
-  - {fileID: 480107653}
-  - {fileID: 1328382764}
-  - {fileID: 1862591113}
-  - {fileID: 930800257}
-  - {fileID: 1363981462}
   stageTarget: {fileID: 1450368326}
+  normalTime: 2
+  hardTime: 4
+  extraTime: 6
+  stageGenerateDistance: 10
+  generateStageCount: 1
+  beginStageOffset: 0.5
+  partsToPartsOffset: 3
 --- !u!114 &1932485204
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2583,18 +2462,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2044773545}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &2044773547 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
-    type: 3}
-  m_PrefabInstance: {fileID: 2044773545}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &2055584752
 GameObject:
   m_ObjectHideFlags: 0
@@ -2860,7 +2727,7 @@ PrefabInstance:
     - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 2.3
       objectReference: {fileID: 0}
     - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9,
         type: 3}
@@ -2917,6 +2784,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 9198101237787776717, guid: 4700f2d6cab15484295a1f9b42d78ec9,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 7.5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3}
 --- !u!4 &2104274173 stripped
@@ -4008,18 +3880,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &7328251774669809641 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1458058295471017772, guid: b46e011db918bbe42a91795497f90b9c,
-    type: 3}
-  m_PrefabInstance: {fileID: 7328251774669809636}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &9117079082731140882
 PrefabInstance:
   m_ObjectHideFlags: 0

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

@@ -619,7 +619,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2855901227758250091
 Transform:
   m_ObjectHideFlags: 0

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

@@ -1,532 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1458058294643249405
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1458058294643249404}
-  m_Layer: 5
-  m_Name: Icon_ChiliPepper
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1458058294643249404
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058294643249405}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1458058294872508362}
-  m_Father: {fileID: 1458058295471017775}
-  m_RootOrder: 0
-  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: 92}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1458058294872508363
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1458058294872508362}
-  - component: {fileID: 1458058294872508360}
-  - component: {fileID: 1458058294872508361}
-  m_Layer: 5
-  m_Name: Image_ChiliPepper
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1458058294872508362
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058294872508363}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1458058294643249404}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 44, y: 56}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1458058294872508360
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058294872508363}
-  m_CullTransparentMesh: 0
---- !u!114 &1458058294872508361
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058294872508363}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 33fff9747be05d34b8004db0be557dd1, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &1458058295471017760
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1458058295471017775}
-  - component: {fileID: 1458058295471017771}
-  - component: {fileID: 1458058295471017772}
-  - component: {fileID: 1458058295471017773}
-  - component: {fileID: 1458058295471017774}
-  - component: {fileID: 8309997995485196036}
-  m_Layer: 5
-  m_Name: Score
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1458058295471017775
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295471017760}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1458058294643249404}
-  - {fileID: 1458058295484164565}
-  m_Father: {fileID: 7328251774731631637}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 29, y: -38}
-  m_SizeDelta: {x: 0, y: 94}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &1458058295471017771
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295471017760}
-  m_CullTransparentMesh: 0
---- !u!114 &1458058295471017772
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295471017760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7cf3290f89d6c3b4eaa04d0e5980591b, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &1458058295471017773
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295471017760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
---- !u!114 &1458058295471017774
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295471017760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 192
-    m_Right: 37
-    m_Top: 1
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_Spacing: 54
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!114 &8309997995485196036
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295471017760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mTerm: minigame_main_Score
-  mTermSecondary: 
-  PrimaryTermModifier: 0
-  SecondaryTermModifier: 0
-  TermPrefix: 
-  TermSuffix: 
-  LocalizeOnAwake: 1
-  IgnoreRTL: 0
-  MaxCharactersInRTL: 0
-  IgnoreNumbersInRTL: 1
-  CorrectAlignmentForRTL: 1
-  AddSpacesToJoinedLanguages: 0
-  AllowLocalizedParameters: 1
-  AllowParameters: 1
-  TranslatedObjects:
-  - {fileID: 21300000, guid: 7cf3290f89d6c3b4eaa04d0e5980591b, type: 3}
-  LocalizeEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  AlwaysForceLocalize: 0
-  LocalizeCallBack:
-    Target: {fileID: 0}
-    MethodName: 
-  mGUI_ShowReferences: 0
-  mGUI_ShowTems: 1
-  mGUI_ShowCallback: 0
-  mLocalizeTarget: {fileID: 0}
-  mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image
---- !u!1 &1458058295484164566
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1458058295484164565}
-  - component: {fileID: 1458058295484164563}
-  - component: {fileID: 1458058295484164564}
-  m_Layer: 5
-  m_Name: Text_score
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1458058295484164565
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295484164566}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1458058295471017775}
-  m_RootOrder: 1
-  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: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1458058295484164563
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295484164566}
-  m_CullTransparentMesh: 0
---- !u!114 &1458058295484164564
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1458058295484164566}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.3372549, g: 0.21960784, b: 0.14117648, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
-    m_FontSize: 45
-    m_FontStyle: 1
-    m_BestFit: 1
-    m_MinSize: 45
-    m_MaxSize: 45
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 100
---- !u!1 &2570823429725665912
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7957151030862449602}
-  - component: {fileID: 7090706454885209789}
-  - component: {fileID: 6898933620753137981}
-  m_Layer: 5
-  m_Name: Text_countDown
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7957151030862449602
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2570823429725665912}
-  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: 2.3549}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1812783774180679619}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7090706454885209789
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2570823429725665912}
-  m_CullTransparentMesh: 0
---- !u!114 &6898933620753137981
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2570823429725665912}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 1
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555, type: 2}
-  m_sharedMaterial: {fileID: 5374284371091958195, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555,
-    type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 200
-  m_fontSizeBase: 200
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 1
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &3654461001691508598
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1812783774180679619}
-  m_Layer: 5
-  m_Name: CountDown
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1812783774180679619
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3654461001691508598}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7957151030862449602}
-  m_Father: {fileID: 7328251774731631637}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 714}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7328251774731631636
 GameObject:
   m_ObjectHideFlags: 0
@@ -556,10 +29,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1458058295471017775}
   - {fileID: 7328251775215910466}
   - {fileID: 7328251775992443661}
-  - {fileID: 1812783774180679619}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -580,10 +51,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 109145d75cad47b886be1e9be454f54b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  text: {fileID: 1458058295484164564}
+  text: {fileID: 7932948163013127618}
   timeText: {fileID: 7932948163013127618}
   countDownAnimator: {fileID: 0}
-  countDownText: {fileID: 6898933620753137981}
+  countDownText: {fileID: 0}
 --- !u!1 &7328251775195385351
 GameObject:
   m_ObjectHideFlags: 0
@@ -755,7 +226,7 @@ RectTransform:
   m_Children:
   - {fileID: 7932948163013127619}
   m_Father: {fileID: 7328251774731631637}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -871,7 +342,7 @@ RectTransform:
   - {fileID: 7328251776013493869}
   - {fileID: 7328251775195385344}
   m_Father: {fileID: 7328251774731631637}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle hole.prefab

@@ -1731,7 +1731,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: -0.2889824, y: 2.8983488}
+  m_Offset: {x: -0.03571558, y: 2.8983488}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -1742,7 +1742,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 3.6252136, y: 0.8828268}
+  m_Size: {x: 3.11868, y: 0.8828268}
   m_EdgeRadius: 0
 --- !u!1001 &4896317741957177885
 PrefabInstance:

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

@@ -114,7 +114,7 @@ PrefabInstance:
     - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 15.71
+      value: 18.7
       objectReference: {fileID: 0}
     - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
         type: 3}
@@ -193,7 +193,7 @@ PrefabInstance:
     - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 14.45
+      value: 17.439999
       objectReference: {fileID: 0}
     - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
         type: 3}
@@ -257,7 +257,7 @@ PrefabInstance:
     - target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 8.87
+      value: 11.86
       objectReference: {fileID: 0}
     - target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
         type: 3}
@@ -954,7 +954,7 @@ PrefabInstance:
     - target: {fileID: 5140115440945204540, guid: 4d9cf56629464933924296f3980217ce,
         type: 3}
       propertyPath: m_Name
-      value: StagePartsOriginal V
+      value: StagePartsDemo
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4d9cf56629464933924296f3980217ce, type: 3}

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

@@ -62,5 +62,13 @@ namespace MyGame.Scenes.MiniGame.Scripts
                 bg.GetComponent<BackGround>()?.SetFence(nextFenceXPos);
             }
         }
+
+        public void SetSky(ScrollGameDifficulty difficulty)
+        {
+            foreach (var bg in bgArray)
+            {
+                bg.GetComponent<BackGround>()?.SetSky(difficulty);
+            }
+        }
     }
 }

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

@@ -26,6 +26,9 @@ namespace MyGame.Scenes.MiniGame.Scripts
                 case ScrollGameDifficulty.Hard:
                     animator.Play("sky_switching_b_c", 0, 0f);
                     break;
+                case ScrollGameDifficulty.Extra:
+                    animator.Play("sky_switching_c_d", 0, 0f);
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(difficulty), difficulty, null);
             }

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

@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using MyGame.Scripts;
 using UniRx;
-using UniRx.Diagnostics;
 using UniRx.Triggers;
 using UnityEditor;
 using UnityEngine;
@@ -25,7 +23,6 @@ namespace MyGame.Scenes.MiniGame.Scripts
             Failure
         }
 
-        [SerializeField] private float timeLimit = 30f;
         [SerializeField] private HeaderView headerView;
         [SerializeField] private Player player;
         [SerializeField] private StageSelectView stageSelectView;
@@ -148,6 +145,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
             this.UpdateAsObservable()
                 .Where(_ => Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
                 .Where(_ => menuState.Value == MenuState.Game && state.Value == GameState.Ready)
+                .DelayFrame(1)
                 .Subscribe(_ =>
                 {
                     state.Value = GameState.Play;
@@ -162,28 +160,12 @@ namespace MyGame.Scenes.MiniGame.Scripts
                         break;
                     case GameState.Play:
                         SoundManager.Instance.PlaySE("se_minigame_Start");
-                        var sharedTimer = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f))
+                        stageManager.StartTimer();
-                            .Select(time => (int)(timeLimit - time))
-                            .TakeWhile(time => time >= 0)
-                            .Share();
-                        sharedTimer.Subscribe(time =>
-                        {
-                            headerView.ChangeTimeCount(time);
-                        }, () =>
-                        {
-                            headerView.ChangeTimeCount(0f);
-                            state.Value = GameState.Success;
-                        }).AddTo(gameCompositeDisposable);
-                        sharedTimer
-                            .Where(time => time <= 5)
-                            .Take(1)
-                            .Subscribe(time =>
-                            {
-                                SoundManager.Instance.PlaySE("se_minigame_RemainingTimeLeft");
-                                headerView.StartCountDown();
-                            }).AddTo(gameCompositeDisposable);
                         break;
                     case GameState.Success:
+                        SoundManager.Instance.PlaySE("se_minigame_End");
+                        stageManager.StopTimer();
+                        player.Result();
                         break;
                     case GameState.Failure:
                         break;
@@ -203,11 +185,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
                 cameraTransform.position = playerPosX * Vector3.right + cameraOffset;
                 bgManager.ResetBg(playerPosX);
             }).AddTo(this);
-            state.Where(x => x == GameState.Play)
+            this.UpdateAsObservable()
-                .Select(_ => this.UpdateAsObservable())
-                .Switch()
                 .Where(_ => state.Value == GameState.Play)
-                .Skip(1)
                 .Subscribe(_ =>
                 {
                     if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
@@ -220,6 +199,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
                     // カメラ移動
                     cameraTransform.position = playerPosX * Vector3.right + cameraOffset;
                     bgManager.UpdatePos(playerPosX);
+                    stageManager.UpdatePos(playerPosX);
                 }).AddTo(this);
 
             stageManager.OnFence.Subscribe(x =>
@@ -227,6 +207,12 @@ namespace MyGame.Scenes.MiniGame.Scripts
                 bgManager.SetFenceXPos(x);
             }).AddTo(this);
 
+            // コース難易度変更
+            stageManager.Difficulty.SkipLatestValueOnSubscribe().Subscribe(x =>
+            {
+                bgManager.SetSky(x);
+            }).AddTo(this);
+
             player.OnHitItem.Where(_ => state.Value == GameState.Play).Subscribe(x =>
             {
                 if (!x.TryGetComponent<StageItem>(out var item))
@@ -277,6 +263,11 @@ namespace MyGame.Scenes.MiniGame.Scripts
                         }
                         player.Hit(x.ClosestPoint(playerTransform.position));
                         x.enabled = false;
+                        // ゲーム終了
+                        Observable.Timer(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
+                        {
+                            state.Value = GameState.Success;
+                        }).AddTo(this);
                         break;
                     case StageItem.Type.Item1:
                         break;
@@ -296,34 +287,20 @@ namespace MyGame.Scenes.MiniGame.Scripts
         {
             SoundManager.Instance.ChangeVolumeUniqueBGM(1f);
             // ステージ読み込み
-            stageManager.SetSky(stageData.Difficulty);
             stageManager.SetBeginStages(stageData.GetBeginStagePrefabs());
             player.transform.position = characterBeginPos;
             player.ResetPlayer();
             scoreCount.Value = 0;
-            headerView.ChangeTimeCount(timeLimit);
             resultManager.Reset();
             gameCompositeDisposable.Clear();
             state.SkipLatestValueOnSubscribe().Subscribe(x =>
             {
-                switch (x)
+                if (x == GameState.Success)
                 {
-                    case GameState.Ready:
+                    this.CallWaitForSeconds(1f, () =>
-                        break;
+                    {
-                    case GameState.Play:
+                        resultManager.ShowResult(scoreCount.Value, placeList, stageData);
-                        break;
+                    });
-                    case GameState.Success:
-                        SoundManager.Instance.PlaySE("se_minigame_End");
-                        player.Result();
-                        this.CallWaitForSeconds(1f, () =>
-                        {
-                            resultManager.ShowResult(scoreCount.Value, placeList, stageData);
-                        });
-                        break;
-                    case GameState.Failure:
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(x), x, null);
                 }
             }).AddTo(gameCompositeDisposable);
 

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

@@ -15,6 +15,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
         [SerializeField] private AnimationCurve hitAnimationCurve;
         [SerializeField] private float flyingFallSpeed = 1f;
         [SerializeField] private float fallAcceleration = 9.8f;
+        [SerializeField] private float fallLimit = -6f;
         [SerializeField] private GameObject itemHitCollider;
         [SerializeField] private GameObject obstacleHitCollider;
         [SerializeField] private GameObject level1;
@@ -28,18 +29,15 @@ namespace MyGame.Scenes.MiniGame.Scripts
         private bool isJump;
         private bool isFall;
         private bool isButtonHold;
-        private bool isFlying;
-        private bool isResult;
         private bool isHit;
+        private bool isHitStay;
         private bool isHole;
         private bool isWall;
+        private bool isResult;
         private float currentFallSpeed;
         public bool IsHit => isHit;
-        private readonly BoolReactiveProperty isHitStay = new BoolReactiveProperty();
+        private readonly CompositeDisposable jumpCompositeDisposable = new CompositeDisposable();
         private readonly CompositeDisposable hitCompositeDisposable = new CompositeDisposable();
-        private IDisposable jumpHoldDisposable;
-        private Coroutine jumpCoroutine;
-        private Coroutine jumpFallCoroutine;
         private Vector3 basePos;
         private readonly ReactiveProperty<int> count = new ReactiveProperty<int>();
         public IObservable<Collider2D> OnHitItem => itemHitCollider.OnTriggerEnter2DAsObservable().TakeUntilDestroy(this);
@@ -47,8 +45,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
         
         private void Start()
         {
-            isHitStay.AddTo(this);
             count.AddTo(this);
+            jumpCompositeDisposable.AddTo(this);
             hitCompositeDisposable.AddTo(this);
             animator = GetComponent<Animator>();
             basePos = transform.localPosition;
@@ -67,9 +65,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
             ResetCount();
             isJump = false;
             isFall = false;
-            isFlying = false;
             isHit = false;
-            isHitStay.Value = false;
+            isHitStay = false;
             isHole = false;
             isWall = false;
             isResult = false;
@@ -86,12 +83,12 @@ namespace MyGame.Scenes.MiniGame.Scripts
 
         public void Move()
         {
-            if (isHitStay.Value || isWall)
+            if (isHitStay || isWall)
             {
                 return;
             }
             transform.AddPositionX(speed * Time.deltaTime);
-            if (isJump || isHit || isHole)
+            if (isJump || isHit || isFall)
             {
                 return;
             }
@@ -100,89 +97,85 @@ namespace MyGame.Scenes.MiniGame.Scripts
 
         public void Jump()
         {
-            if (isJump || isHit || isHole)
+            if (isJump || isHit || isFall)
             {
                 return;
             }
 
             animator?.Play("Brother_pink_jump", 0, 0);
+            jumpCompositeDisposable.Clear();
             isJump = true;
             isFall = false;
             var lastFrame = jumpAnimationCurve[jumpAnimationCurve.length - 1];
             // 最高点までのジャンプ
-            jumpCoroutine = this.CallLerp(lastFrame.time, t =>
+            var jumpCoroutine = MonoBehaviourExtensions.DoCallLerp(lastFrame.time, t =>
             {
                 transform.SetLocalPositionY(basePos.y + jumpAnimationCurve.Evaluate(t * lastFrame.time));
             }, () =>
             {
                 // 最高点到達後、落下
+                isJump = false;
                 isFall = true;
-                jumpFallCoroutine = this.CallLerp(lastFrame.time, t =>
-                {
-                    transform.SetLocalPositionY(basePos.y + jumpAnimationCurve.Evaluate(t * lastFrame.time + lastFrame.time));
-                }, () =>
-                {
-                    isJump = false;
-                    isFall = false;
-                    if (isResult)
-                    {
-                        Result();
-                    }
-                });
             });
+            // 通常落下
+            var jumpFallCoroutine = MonoBehaviourExtensions.DoCallLerp(lastFrame.time, t =>
+            {
+                transform.SetLocalPositionY(basePos.y + jumpAnimationCurve.Evaluate((t + 1) * lastFrame.time));
+            }, () =>
+            {
+                isFall = false;
+                if (isResult)
+                {
+                    Result();
+                }
+            });
+            Observable.FromCoroutine(_ => jumpCoroutine)
+                .SelectMany(_ => jumpFallCoroutine)
+                .Subscribe().AddTo(jumpCompositeDisposable);
+            // ボタンが押されたら滑空モード開始
+            this.UpdateAsObservable()
+                .First(_ => isButtonHold && isFall)
+                .Subscribe(_ => Flying()).AddTo(jumpCompositeDisposable);
         }
 
         /// <summary>
         /// ジャンプ最高点到達後 isFall
         /// 滑空時はflyingFallSpeedで緩やかに落ちる。滑空後にボタン離すとfallSpeedで落ちる
         /// </summary>
-        /// <param name="active"></param>
+        private void Flying()
-        public void SetJumpHold(bool active)
         {
-            if (isHit)
+            currentFallSpeed = 0f;
-            {
+            jumpCompositeDisposable.Clear();
-                return;
+            this.UpdateAsObservable()
-            }
+                .TakeWhile(_ => transform.localPosition.y > basePos.y)
-
+                .Subscribe(_ =>
-            isButtonHold = active;
+                {
-            // 滑空モード開始
+                    // 滑空or落下切り替え
-            if (isFall && active && !isFlying)
+                    if (isButtonHold)
-            {
-                isFlying = true;
-                currentFallSpeed = 0f;
-                this.SafeStopCoroutine(jumpFallCoroutine);
-                jumpHoldDisposable?.Dispose();
-                jumpHoldDisposable = this.UpdateAsObservable()
-                    .TakeWhile(_ => transform.localPosition.y > basePos.y)
-                    .Subscribe(_ =>
                     {
-                        // 滑空or落下切り替え
+                        animator.Play("Brother_pink_Gliding");
-                        if (isButtonHold)
+                        currentFallSpeed = -flyingFallSpeed;
-                        {
+                    }
-                            animator.Play("Brother_pink_Gliding");
+                    else
-                            currentFallSpeed = -flyingFallSpeed;
-                        }
-                        else
-                        {
-                            Stay();
-                            currentFallSpeed -= fallAcceleration * Time.deltaTime;
-                        }
-
-                        transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime);
-                    }, () =>
                     {
-                        currentFallSpeed = 0f;
+                        Stay();
-                        isJump = false;
+                        currentFallSpeed -= fallAcceleration * Time.deltaTime;
-                        isFall = false;
+                    }
-                        isFlying = false;
+
-                        if (isResult)
+                    transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime);
-                        {
+                }, () =>
-                            Result();
+                {
-                        }
+                    currentFallSpeed = 0f;
-                    }).AddTo(this);
+                    isFall = false;
-            }
+                    if (isResult)
+                    {
+                        Result();
+                    }
+                }).AddTo(jumpCompositeDisposable);
         }
         
+        public void SetJumpHold(bool active) => isButtonHold = active;
+
         // こける
         public void Hit(Vector3 hitPos)
         {
@@ -194,26 +187,22 @@ namespace MyGame.Scenes.MiniGame.Scripts
             Instantiate(hitEffectPrefab, hitPos, Quaternion.identity, transform.parent);
             animator?.Play("Brother_pink_FallDown", 0, 0f);
             isHit = true;
-            hitCompositeDisposable?.Clear();
+            hitCompositeDisposable.Clear();
-            
+            jumpCompositeDisposable.Clear();
-            // ヒット以外動作停止
-            this.SafeStopCoroutine(jumpCoroutine);
-            this.SafeStopCoroutine(jumpFallCoroutine);
-            jumpHoldDisposable?.Dispose();
-
             var cachePosY = transform.localPosition.y;
             var diffHeight = cachePosY - basePos.y;
             var groundPos = isHole ? cachePosY : basePos.y;
-            jumpCoroutine = this.CallLerp(diffHeight <= 0f ? 0f : hitJumpTime, t =>
+            var hitJumpCoroutine = MonoBehaviourExtensions.DoCallLerp(diffHeight <= 0f ? 0f : hitJumpTime, t =>
             {
                 transform.SetLocalPositionY(cachePosY + hitAnimationCurve.Evaluate(t));
-            }, () =>
+            });
+            Observable.FromCoroutine(_ => hitJumpCoroutine).Subscribe(_ =>
             {
                 // 落下時間不定によりアニメ再生停止
                 animator.speed = 0f;
                 currentFallSpeed = 0f;
                 this.UpdateAsObservable()
-                    .TakeWhile(_ => transform.localPosition.y > groundPos)
+                    .TakeWhile(_ => transform.localPosition.y > basePos.y)
                     .Subscribe(_ =>
                     {
                         currentFallSpeed -= fallAcceleration * Time.deltaTime;
@@ -227,14 +216,14 @@ namespace MyGame.Scenes.MiniGame.Scripts
                         currentFallSpeed = 0f;
                         isJump = false;
                         isFall = false;
-                        isFlying = false;
                         Observable.Timer(TimeSpan.FromSeconds(hitTime)).Subscribe(_ => { }, () =>
                         {
-                            isHitStay.Value = true;
+                            isHitStay = true;
                             Observable.Timer(TimeSpan.FromSeconds(hitWaitTime)).Subscribe(_ => { }, () =>
                             {
+                                // 入れ子対策するならコルーチンにして工程ごとに分けてSelectManyするのがよい。
                                 isHit = false;
-                                isHitStay.Value = false;
+                                isHitStay = false;
                                 if (isResult)
                                 {
                                     Result();
@@ -246,31 +235,35 @@ namespace MyGame.Scenes.MiniGame.Scripts
                             }).AddTo(hitCompositeDisposable);
                         }).AddTo(hitCompositeDisposable);
                     }).AddTo(hitCompositeDisposable);
-            });
+            }).AddTo(hitCompositeDisposable);
         }
 
         public void Hole()
         {
             // 落下開始
             isHole = true;
-            
+            isFall = true;
-            // animator?.Play("Brother_pink_main_stay");
             isJump = false;
-            isFall = false;
-            isFlying = false;
             isHit = false;
-            isHitStay.Value = false;
+            isHitStay = false;
-            hitCompositeDisposable?.Clear();
+            
-            jumpHoldDisposable?.Dispose();
+            hitCompositeDisposable.Clear();
-            jumpHoldDisposable = this.UpdateAsObservable()
+            jumpCompositeDisposable.Clear();
-                // .TakeWhile(_ => transform.localPosition.y > basePos.y)
+            this.UpdateAsObservable()
+                .TakeWhile(_ => transform.localPosition.y > fallLimit)
                 .Subscribe(_ =>
                 {
                     currentFallSpeed -= fallAcceleration * Time.deltaTime;
                     transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime);
                 }, () =>
                 {
-                }).AddTo(this);
+                    isFall = false;
+                    currentFallSpeed = 0f;
+                    if (isResult)
+                    {
+                        Result();
+                    }
+                }).AddTo(jumpCompositeDisposable);
         }
 
         public void Wall()
@@ -280,13 +273,14 @@ namespace MyGame.Scenes.MiniGame.Scripts
 
         public void Result()
         {
-            if (isJump || isHit)
+            if (isJump || isHit || isFall)
             {
                 isResult = true;
                 return;
             }
             isResult = false;
             animator?.Play("Brother_pink_glad");
+            animator.speed = 1f;
         }
 
         public void AddCount()

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

@@ -6,54 +6,114 @@ namespace MyGame.Scenes.MiniGame.Scripts
 {
     public class StageManager : MonoBehaviour
     {
-        [SerializeField] private BackGround[] backGrounds;
         [SerializeField] private Transform stageTarget;
+        [SerializeField] private float normalTime;
+        [SerializeField] private float hardTime;
+        [SerializeField] private float extraTime;
+        [SerializeField] private float stageGenerateDistance;
+        [SerializeField] private int generateStageCount;
+        [SerializeField] private float beginStageOffset;
+        [SerializeField] private float partsToPartsOffset;
+        private Transform[] stagePrefabs;
         private Transform[] stages;
+        private float stageEndXPos;
+        private float cacheTargetXPos;
         public IObservable<float> OnFence => fenceSubject;
         private readonly Subject<float> fenceSubject = new();
+        public IReadOnlyReactiveProperty<ScrollGameDifficulty> Difficulty => difficulty;
+        private readonly ReactiveProperty<ScrollGameDifficulty> difficulty = new();
+        private IDisposable timerDisposable; 
 
         private void Start()
         {
             fenceSubject.AddTo(this);
+            difficulty.AddTo(this);
         }
 
         public void SetBeginStages(Transform[] newStages)
         {
+            difficulty.SetValueAndForceNotify(ScrollGameDifficulty.Easy);
+            stagePrefabs = newStages;
             stageTarget.DestroyAllChildrens();
-            stages = new Transform[newStages.Length];
+            stageEndXPos = stageTarget.position.x + beginStageOffset;
-            var selectIndex = UnityEngine.Random.Range(0, stages.Length);
+            cacheTargetXPos = stageEndXPos;
-            for (var i = 0; i < newStages.Length; i++)
+            GenerateStage();
+        }
+
+        private void GenerateStage()
+        {
+            var selectIndex = UnityEngine.Random.Range(0, stagePrefabs.Length);
+            for (var i = 0; i < generateStageCount; i++)
             {
-                stages[i] = Instantiate(newStages[i], stageTarget.position, Quaternion.identity, stageTarget);
+                var stage = Instantiate(stagePrefabs[selectIndex], stageTarget.position + Vector3.left * 100f, Quaternion.identity, stageTarget);
-                stages[i].gameObject.SetActive(i == selectIndex);
+                var minPos = float.MaxValue;
-            }
+                var maxPos = float.MinValue;
-            stages[0].FindAllChildrensComponent<StageItem>(x =>
+                var holePos = float.MinValue;
-            {
+                stage.FindAllChildrensComponent<StageItem>(x =>
-                if (x.ItemType != StageItem.Type.Hole)
                 {
-                    return;
+                    var xPos = x.transform.position.x;
+                    minPos = Mathf.Min(minPos, xPos);
+                    maxPos = Mathf.Max(maxPos, xPos);
+                    // 落とし穴があった場合通知
+                    if (x.ItemType != StageItem.Type.Hole)
+                    {
+                        return;
+                    }
+                    holePos = xPos;
+                });
+                var xPos = stage.position.x;
+                var minDiff = minPos - xPos;
+                var maxDiff = maxPos - xPos;
+                stage.SetPositionX(stageEndXPos - minDiff);
+                // endPos更新
+                stageEndXPos = stage.position.x + maxDiff + partsToPartsOffset;
+                // ステージの破棄
+                Observable.Interval(TimeSpan.FromSeconds(.5f))
+                    .Where(_ => stageEndXPos < cacheTargetXPos)
+                    .Subscribe(_ =>
+                    {
+                        Destroy(stage.gameObject);
+                    }).AddTo(this);
+                if (holePos > float.MinValue)
+                {
+                    Observable.NextFrame().Subscribe(_ => fenceSubject.OnNext(stage.position.x + holePos - xPos)).AddTo(this);
                 }
-
-                Observable.NextFrame().Subscribe(_ => fenceSubject.OnNext(x.transform.position.x)).AddTo(this);
-            });
-        }
-
-        public void SetSky(ScrollGameDifficulty difficulty)
-        {
-            foreach (var backGround in backGrounds)
-            {
-                backGround.SetSky(difficulty);
             }
         }
 
-        public void GenerateStage()
-        {
-            
-        }
-
         public void UpdatePos(float targetXPos)
         {
+            cacheTargetXPos = targetXPos;
+            if (stageEndXPos - targetXPos <= stageGenerateDistance)
+            {
+                GenerateStage();
+            }
+        }
 
+        public void StartTimer()
+        {
+            StopTimer();
+            timerDisposable = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1))
+                .Subscribe(x =>
+                {
+                    if (x >= extraTime)
+                    {
+                        difficulty.Value = ScrollGameDifficulty.Extra;
+                    }
+                    else if (x >= hardTime)
+                    {
+                        difficulty.Value = ScrollGameDifficulty.Hard;
+                    } 
+                    else if (x >= normalTime)
+                    {
+                        difficulty.Value = ScrollGameDifficulty.Normal;
+                    }
+                }).AddTo(this);
+        }
+
+        public void StopTimer()
+        {
+            timerDisposable?.Dispose();
         }
     }
 }

popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs

@@ -172,6 +172,7 @@ public enum ScrollGameDifficulty
     Easy = 1,
     Normal = 2,
     Hard = 3,
+    Extra = 4
 }
 
 [Serializable]