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 } 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