From 7994d4ad104cd134c7ee72b4eba36064d2f728e3 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Mon, 26 Jul 2021 13:19:46 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=AE=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90/=E7=84=A6=E3=81=92=E3=82=BF=E3=82=A4=E3=83=9F?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=82=92=E9=85=8D=E5=88=97=E3=81=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Cooking/Scripts/CornManager.cs     |  17 +--
 .../Cooking/Scripts/CornPopParameters.cs      | 108 ++++++++++++++++++
 .../Cooking/Scripts/CornPopParameters.cs.meta |   3 +
 3 files changed, 112 insertions(+), 16 deletions(-)
 create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs
 create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs.meta

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
index 64286062..a11432d0 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
@@ -126,26 +126,11 @@ public class CornManager : MonoBehaviour
         cornArray = new Corn[cornSpawnCount];
         
         // コーン生成
-        var popTime = 1f;
         for (int i = 0; i < cornSpawnCount; i++)
         {
-            // コーン生成テーブル
-            if (1 <= i && i <= 5)
-            {
-                popTime += 3 - (i - 1) * .5f;
-            }
-            else if (6 <= i && i <= 10)
-            {
-                popTime += 0.5f - (i - 6) * .1f;
-            }
-            else if (11 <= i)
-            {
-                popTime += .1f;
-            }
-
             var corn = Instantiate(cornPrefab, cornSpawnTarget);
             cornArray[i] = corn;
-            corn.SetCornProperty(popTime, cornBurntDuration + Random.Range(0, cornBurntRandom), cornSpillSpeed, cornPopSpeed);
+            corn.SetCornProperty( CornPopParameters.CornPopTimeArray[i], CornPopParameters.CornBurntTimeArray[i], cornSpillSpeed, cornPopSpeed);
             // 進行速度の変更時、コーン速度変更
             cornGrowSpeed.TakeWhile(_ => !isCompleted).Subscribe(x =>
             {
diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs
new file mode 100644
index 00000000..8d80725e
--- /dev/null
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs
@@ -0,0 +1,108 @@
+public class CornPopParameters
+{
+    public static readonly float[] CornPopTimeArray = {
+        1f,
+        4f,
+        6.5f,
+        8.5f,
+        10f,
+        11f,
+        11.5f,
+        11.9f,
+        12.2f,
+        12.4f,
+        12.5f,
+        12.6f,
+        12.7f,
+        12.8f,
+        12.9f,
+        13f,
+        13.1f,
+        13.2f,
+        13.3f,
+        13.4f,
+        13.5f,
+        13.6f,
+        13.7f,
+        13.8f,
+        13.9f,
+        14f,
+        14.1f,
+        14.2f,
+        14.3f,
+        14.4f,
+        14.5f,
+        14.6f,
+        14.7f,
+        14.8f,
+        14.9f,
+        15f,
+        15.1f,
+        15.2f,
+        15.3f,
+        15.4f,
+        15.5f,
+        15.6f,
+        15.7f,
+        15.8f,
+        15.9f,
+        16f,
+        16.1f,
+        16.2f,
+        16.3f,
+        16.4f,
+    };
+
+    public static readonly float[] CornBurntTimeArray = {
+        7.6f,
+        6.085f,
+        4.82f,
+        3.805f,
+        3.04f,
+        2.525f,
+        2.26f,
+        2.045f,
+        1.88f,
+        1.765f,
+        1.7f,
+        1.635f,
+        1.57f,
+        1.505f,
+        1.44f,
+        1.375f,
+        1.31f,
+        1.245f,
+        1.18f,
+        1.115f,
+        1.05f,
+        0.985f,
+        0.92f,
+        0.855f,
+        0.8f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+        1.5f,
+    };
+}
\ No newline at end of file
diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs.meta
new file mode 100644
index 00000000..17aa7a22
--- /dev/null
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4a39eee460c642d5a761191849b7ff22
+timeCreated: 1627272430
\ No newline at end of file