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

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

@@ -545,6 +545,7 @@ MonoBehaviour:
   hitJumpTime: 1
   hitTime: 1.5
   hitWaitTime: 1
+  hitStopTime: 1
   jumpAnimationCurve:
     serializedVersion: 2
     m_Curve:
@@ -575,15 +576,15 @@ MonoBehaviour:
     - serializedVersion: 3
       time: 0
       value: 1
-      inSlope: 6.026828
-      outSlope: 6.026828
+      inSlope: 12.27234
+      outSlope: 12.27234
       tangentMode: 0
       weightedMode: 0
       inWeight: 0
-      outWeight: 0.08312589
+      outWeight: 0.15086818
     - serializedVersion: 3
-      time: 0.30518538
-      value: 1.9853464
+      time: 0.5001393
+      value: 4.010124
       inSlope: 0
       outSlope: 0
       tangentMode: 136
@@ -591,13 +592,13 @@ MonoBehaviour:
       inWeight: 0.33333334
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 1
+      time: 1.002533
       value: 0
-      inSlope: -2.3362193
-      outSlope: -2.3362193
+      inSlope: -17.60592
+      outSlope: -17.60592
       tangentMode: 0
       weightedMode: 0
-      inWeight: 0.05080726
+      inWeight: 0.0641635
       outWeight: 0
     m_PreInfinity: 2
     m_PostInfinity: 2