From dbaa7d294a2b2501d6ae0cdbc74a988dfc16032e Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 25 Jun 2021 18:41:08 +0900
Subject: [PATCH] =?UTF-8?q?=E5=90=B9=E3=81=A3=E9=A3=9B=E3=81=B3=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scenes/Main/Corn.cs          | 14 +++++++++++++-
 popcorn/Assets/MyGame/Scenes/Main/PanController.cs |  2 +-
 .../MyGame/Scenes/Main/PanEdge.physicsMaterial2D   |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

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<Collider2D>().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