From 3a3b3c333629c10e0ff58ff1bb655a54871a767c Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 27 Jul 2021 12:26:47 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=AE=E9=A3=9B?=
 =?UTF-8?q?=E3=81=B3=E5=87=BA=E3=81=99=E7=A2=BA=E7=8E=87=E3=82=92=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4=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

---
 .../MyGame/Scenes/Cooking/Prefabs/corn.prefab | 41 ++++++++++---------
 .../MyGame/Scenes/Cooking/Scripts/Corn.cs     |  4 +-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab
index 223e70a4..d8ba372f 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab
@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1324329073609281160}
-  - component: {fileID: 5972257590091015193}
   - component: {fileID: 5499754490129207122}
+  - component: {fileID: 5972257590091015193}
   - component: {fileID: 7195010600253370228}
   - component: {fileID: 8932234855615206969}
   m_Layer: 0
@@ -36,25 +36,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!95 &5972257590091015193
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1324329073609281157}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 999ff4a5e0a8044e3ac6f17aba6db416, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &5499754490129207122
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -76,6 +57,26 @@ MonoBehaviour:
     type: 3}
   burntMaterial: {fileID: 2100000, guid: bec51957e6eb5467abd3d46dc72f642a, type: 2}
   animator: {fileID: 5972257590091015193}
+  spillProbability: 0.2
+--- !u!95 &5972257590091015193
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1324329073609281157}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 999ff4a5e0a8044e3ac6f17aba6db416, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!50 &7195010600253370228
 Rigidbody2D:
   serializedVersion: 4
diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
index ea55a2c2..62a30567 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
@@ -26,6 +26,8 @@ public class Corn : MonoBehaviour
     [SerializeField] private GameObject effectSpillPopped;
     [SerializeField] private Material burntMaterial;
     [SerializeField] private Animator animator;
+    [Space][Range(0,1)]
+    [SerializeField] private float spillProbability;
 
     private Rigidbody2D rigidbody;
     private float cornPopTime;
@@ -66,7 +68,7 @@ public class Corn : MonoBehaviour
         this.ObserveEveryValueChanged(x => x.rigidbody.velocity.magnitude)
             .Where(x => x >= cornSpillSpeed)
             .ThrottleFirstFrame(30) // 30フレーム間隔開ける
-            .Where(_ => Random.value <  .2f) // 演出を出す確率
+            .Where(_ => Random.value < spillProbability) // 演出を出す確率
             .FirstOrDefault()
             .Subscribe(_ =>
             {