diff --git a/popcorn/Assets/MyGame/Scenes/Main/Corn.cs b/popcorn/Assets/MyGame/Scenes/Main/Corn.cs index 5ad11cd9..64d1967d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Corn.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Corn.cs @@ -44,11 +44,23 @@ public class Corn : MonoBehaviour rigidbody2D.position = new Vector2(Random.value, Random.value); } + private float maxVelocity; private void Update() { cornVelocity = rigidbody2D.velocity.magnitude; cornLifeTime = Time.time - cornSpawnTime; - + + if (rigidbody2D.velocity.magnitude > maxVelocity) + { + maxVelocity = Mathf.Max(rigidbody2D.velocity.magnitude, maxVelocity); + Debug.Log(maxVelocity); + } + + if (maxVelocity >= 50f) + { + GetComponent().enabled = false; + } + // アニメーション向けに回転をリセット rotationResolverTransform.rotation = Quaternion.identity; // コーンの回転を伝搬 diff --git a/popcorn/Assets/MyGame/Scenes/Main/PanController.cs b/popcorn/Assets/MyGame/Scenes/Main/PanController.cs index f9192309..066faf66 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/PanController.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/PanController.cs @@ -13,7 +13,7 @@ public class PanController : MonoBehaviour, IDragHandler, IBeginDragHandler private Vector3 firstPos; private Vector3 offset; private readonly (float min, float max) borderX = (-1.2f, 3.1f); - private readonly (float min, float max) borderY = (-1.1f, 0.3f); + private readonly (float min, float max) borderY = (-2.1f, 1.3f); private Vector2 direction; // public Vector2 Direction => direction; diff --git a/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D index ceef943f..532f9b9d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D +++ b/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D @@ -7,5 +7,5 @@ PhysicsMaterial2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PanEdge - friction: 1 - bounciness: 0 + friction: 0 + bounciness: 0.64