From be1c168238cea7b5947e17c09de8156f5954da57 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 27 Jul 2021 12:56:33 +0900 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E9=9D=A2KO=E6=BC=94=E5=87=BA=E3=82=92?= =?UTF-8?q?=E5=87=BA=E3=81=99=E7=A2=BA=E7=8E=87=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/Cooking.unity | 2 ++ .../Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index ac9758f7..d603a79b 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -8924,6 +8924,8 @@ MonoBehaviour: cornBurntRandom: 5 cornSpillSpeed: 160 cornPopSpeed: 30 + screenKoProbability: 0.055 + maxScreenKoCount: 2 cornCountSlider: {fileID: 657773260} faildCountSlider: {fileID: 657773259} coldGrowSpeedSlider: {fileID: 1661453984} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs index a11432d0..ccba4c90 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs @@ -28,6 +28,9 @@ public class CornManager : MonoBehaviour [SerializeField] private float cornBurntRandom = 1f; [SerializeField] private float cornSpillSpeed = 50f; [SerializeField] private float cornPopSpeed = 20f; + [Space] + [SerializeField, Range(0,1)] private float screenKoProbability; + [SerializeField] private int maxScreenKoCount; public IReadOnlyReactiveProperty Result => result; private readonly ReactiveProperty result = new ReactiveProperty(); @@ -42,6 +45,7 @@ public class CornManager : MonoBehaviour private readonly CompositeDisposable compositeDisposable = new CompositeDisposable(); #if DEVELOPMENT_BUILD || UNITY_EDITOR + [Space] [SerializeField] private Slider cornCountSlider; [SerializeField] private Slider faildCountSlider; [SerializeField] private Slider coldGrowSpeedSlider; @@ -67,10 +71,11 @@ public class CornManager : MonoBehaviour // 5フレームごとに2回など演出の回数を制御 cornSpilledSubject .Where(x => x.cond != CornCondition.Seed) // Seedは演出なし + .Where(_ => Random.value < screenKoProbability) // 演出を出す確率 .BatchFrame(5, FrameCountType.EndOfFrame) // 指定フレーム分まとめる .Subscribe(x => { - foreach (var item in x.RandomChoose(2)) + foreach (var item in x.RandomChoose(maxScreenKoCount)) { SpawnSpilledAnimation(item.cond, item.pos); }