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

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

@@ -362,7 +362,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2116348896259355144}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -0.4199995, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1359,7 +1359,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8502678247275007622}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.38, y: 1.3, z: 0}
+  m_LocalPosition: {x: -1.83, y: 1.3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1696,7 +1696,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9202194284233474589}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -0.8299995, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1742,7 +1742,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 3.11868, y: 0.8828268}
+  m_Size: {x: 3.96, y: 0.8828268}
   m_EdgeRadius: 0
 --- !u!1001 &4896317741957177885
 PrefabInstance:
@@ -1761,6 +1761,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Obstacle hole
       objectReference: {fileID: 0}
+    - target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.71
+      objectReference: {fileID: 0}
     - target: {fileID: 4498234376221693369, guid: b82d5b841abe54f95aee9a8a5a023f6a,
         type: 3}
       propertyPath: m_Name
@@ -1801,6 +1806,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.7899995
+      objectReference: {fileID: 0}
     - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
         type: 3}
       propertyPath: m_RootOrder
@@ -1869,7 +1879,7 @@ PrefabInstance:
     - target: {fileID: 8948517510153873636, guid: b82d5b841abe54f95aee9a8a5a023f6a,
         type: 3}
       propertyPath: m_Size.x
-      value: 5
+      value: 5.7
       objectReference: {fileID: 0}
     - target: {fileID: 8948517510153873636, guid: b82d5b841abe54f95aee9a8a5a023f6a,
         type: 3}