From d9841281f69482d827c47f3462a8c4bcad78a559 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 15 Apr 2022 18:26:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=A4=E3=83=91?= =?UTF-8?q?=E3=83=B3=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=81=8C?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E3=81=AB=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/Scripts/ThermalControl.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index 9b870269..10a6ca43 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -75,14 +75,14 @@ public class ThermalControl : MonoBehaviour decreaseSpeedSlider.value = maxDecreaseSpeed; yellowSizeSlider.value = yellowSize; randomRangeSlider.value = randomRange; - factorSlider.OnValueChangedAsObservable().Subscribe(x => panFactor = x).AddTo(this); - deadZoneSlider.OnValueChangedAsObservable().Subscribe(x => deadZone = x).AddTo(this); - baseSpeedSlider.OnValueChangedAsObservable().Subscribe(x => baseIncreaseSpeed = x).AddTo(this); - coldSpeedSlider.OnValueChangedAsObservable().Subscribe(x => coldIncreaseSpeed = x).AddTo(this); - hotSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotIncreaseSpeed = x).AddTo(this); - decreaseSpeedSlider.OnValueChangedAsObservable().Subscribe(x => maxDecreaseSpeed = x).AddTo(this); - yellowSizeSlider.OnValueChangedAsObservable().Subscribe(x => yellowSize = x).AddTo(this); - randomRangeSlider.OnValueChangedAsObservable().Subscribe(x => randomRange = x).AddTo(this); + factorSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => panFactor = x).AddTo(this); + deadZoneSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => deadZone = x).AddTo(this); + baseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => baseIncreaseSpeed = x).AddTo(this); + coldSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => coldIncreaseSpeed = x).AddTo(this); + hotSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => hotIncreaseSpeed = x).AddTo(this); + decreaseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => maxDecreaseSpeed = x).AddTo(this); + yellowSizeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => yellowSize = x).AddTo(this); + randomRangeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => randomRange = x).AddTo(this); #endif } From b3d3f3b3c0276ae9a0c6345a7b1f4439d267660c Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 15 Apr 2022 18:28:21 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= =?UTF-8?q?=E5=BF=98=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs index ffedb0e2..efc10340 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs @@ -70,7 +70,7 @@ namespace MyGame.Scenes.Main.Scripts { if (i < productCount) { - popcorns[i].SetView(discardList[i]); + popcorns[i].SetView(discardList[i], true); popcorns[i].SetActive(true); } else