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

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

@@ -892,7 +892,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mTarget: {fileID: 7328251774669809639}
+  mTarget: {fileID: 0}
 --- !u!114 &1023393926 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7328251775195385346, guid: b46e011db918bbe42a91795497f90b9c,
@@ -1041,7 +1041,7 @@ PrefabInstance:
     - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
         type: 3}
       propertyPath: normalSpeedMultiply
-      value: 1
+      value: 1.2
       objectReference: {fileID: 0}
     - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
         type: 3}
@@ -1840,9 +1840,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   stageTarget: {fileID: 1450368326}
-  normalTime: 2
-  hardTime: 4
-  extraTime: 6
+  normalTime: 15
+  hardTime: 30
+  extraTime: 45
   stageGenerateDistance: 15
   generateStageCount: 1
   beginStageOffset: 0.5
@@ -3341,18 +3341,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 109145d75cad47b886be1e9be454f54b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &7328251774669809639 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7328251775215910467, 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