yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/update_ver1.2.0' of https://bitbucket.org/usaya/popcorn into feature/update_ver1.2.0

This commit is contained in:
水谷圭吾 2022-04-15 18:31:16 +09:00
parent cad8f8bd13 b3d3f3b3c0
commit 4b608276f2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs
View File

@ -75,14 +75,14 @@ public class ThermalControl : MonoBehaviour
decreaseSpeedSlider.value = maxDecreaseSpeed; decreaseSpeedSlider.value = maxDecreaseSpeed;
yellowSizeSlider.value = yellowSize; yellowSizeSlider.value = yellowSize;
randomRangeSlider.value = randomRange; randomRangeSlider.value = randomRange;
factorSlider.OnValueChangedAsObservable().Subscribe(x => panFactor = x).AddTo(this); factorSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => panFactor = x).AddTo(this);
deadZoneSlider.OnValueChangedAsObservable().Subscribe(x => deadZone = x).AddTo(this); deadZoneSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => deadZone = x).AddTo(this);
baseSpeedSlider.OnValueChangedAsObservable().Subscribe(x => baseIncreaseSpeed = x).AddTo(this); baseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => baseIncreaseSpeed = x).AddTo(this);
coldSpeedSlider.OnValueChangedAsObservable().Subscribe(x => coldIncreaseSpeed = x).AddTo(this); coldSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => coldIncreaseSpeed = x).AddTo(this);
hotSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotIncreaseSpeed = x).AddTo(this); hotSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => hotIncreaseSpeed = x).AddTo(this);
decreaseSpeedSlider.OnValueChangedAsObservable().Subscribe(x => maxDecreaseSpeed = x).AddTo(this); decreaseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => maxDecreaseSpeed = x).AddTo(this);
yellowSizeSlider.OnValueChangedAsObservable().Subscribe(x => yellowSize = x).AddTo(this); yellowSizeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => yellowSize = x).AddTo(this);
randomRangeSlider.OnValueChangedAsObservable().Subscribe(x => randomRange = x).AddTo(this); randomRangeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => randomRange = x).AddTo(this);
#endif #endif
} }

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs
View File

@ -70,7 +70,7 @@ namespace MyGame.Scenes.Main.Scripts
{ {
if (i < productCount) if (i < productCount)
{ {
popcorns[i].SetView(discardList[i]); popcorns[i].SetView(discardList[i], true);
popcorns[i].SetActive(true); popcorns[i].SetActive(true);
} }
else else