From 627c53d1bf52a438119e8deec731e90437a7cc49 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 9 Jul 2021 11:54:32 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=AE=E5=90=B9?=
 =?UTF-8?q?=E3=81=A3=E9=A3=9B=E3=81=B3/=E5=BC=BE=E3=81=91=E3=83=91?=
 =?UTF-8?q?=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=82=92=E8=AA=BF=E6=95=B4?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs | 12 +++++++-----
 .../MyGame/Scenes/Cooking/Scripts/CornManager.cs     |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
index 29fb7949..729ad60f 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
@@ -32,8 +32,8 @@ public class Corn : MonoBehaviour
     private float cornBurntTime;
     private float cornGrowTime;
     private float cornGrowSpeed;
-    private float maxSpeed = 50f;
-    private float popSpeed = 20f;
+    private float cornSpillSpeed;
+    private float cornPopSpeed;
     
     public IReadOnlyReactiveProperty<CornCondition> Condition => condition;
     private readonly ReactiveProperty<CornCondition> condition = new ReactiveProperty<CornCondition>(CornCondition.Seed);
@@ -59,7 +59,7 @@ public class Corn : MonoBehaviour
 
         // コーンが飛んでいく
         this.ObserveEveryValueChanged(x => x.rigidbody.velocity.magnitude)
-            .Where(x => x >= maxSpeed)
+            .Where(x => x >= cornSpillSpeed)
             .FirstOrDefault()
             .Subscribe(_ =>
         {
@@ -116,7 +116,7 @@ public class Corn : MonoBehaviour
     private void CornPop()
     {
         spriteRenderer.sprite = cornSimpleSprite;
-        rigidbody.AddForce(popSpeed * new Vector2(Random.value * 2 - 1, Random.value * 2 - 1), ForceMode2D.Impulse);
+        rigidbody.AddForce(cornPopSpeed * new Vector2(Random.value * 2 - 1, Random.value * 2 - 1), ForceMode2D.Impulse);
         animator.SetTrigger(HashCornGrow);
     }
 
@@ -132,10 +132,12 @@ public class Corn : MonoBehaviour
         GetComponent<Collider2D>().enabled = false;
     }
 
-    public void SetCornProperty(float popTime, float burntDuration)
+    public void SetCornProperty(float popTime, float burntDuration, float spillSpeed, float popSpeed)
     {
         cornPopTime = popTime + Random.Range(0, 2f);
         cornBurntTime = cornPopTime + burntDuration + Random.Range(0, 1f);
+        cornSpillSpeed = spillSpeed;
+        cornPopSpeed = popSpeed;
     }
 
     public void ChangeGrowSpeed(float speed)
diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
index d7e2ebf2..4f581109 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
@@ -21,6 +21,8 @@ public class CornManager : MonoBehaviour
     [SerializeField] private float hotGrowSpeed;
     [SerializeField] private float baseCornPopTime = 5f;
     [SerializeField] private float cornBurntDuration = 5f;
+    [SerializeField] private float cornSpillSpeed = 50f;
+    [SerializeField] private float cornPopSpeed = 20f;
 
     public IReadOnlyReactiveProperty<CornResult> Result => result;
     private readonly ReactiveProperty<CornResult> result = new ReactiveProperty<CornResult>();
@@ -62,7 +64,7 @@ public class CornManager : MonoBehaviour
         {
             var corn = Instantiate(cornPrefab, cornSpawnTarget);
             cornArray[i] = corn;
-            corn.SetCornProperty(baseCornPopTime, cornBurntDuration);
+            corn.SetCornProperty(baseCornPopTime, cornBurntDuration, cornSpillSpeed, cornPopSpeed);
             
             // 進行速度の変更時、コーン速度変更
             cornGrowSpeed.TakeWhile(_ => !isCompleted).Subscribe(x =>