diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 8e334df5..0f4eb685 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -1376,6 +1376,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 1927981503880492078, guid: b0a57f0d9e5524e579cad0309e9d44d1, + type: 3} + propertyPath: m_Name + value: FailedCount + objectReference: {fileID: 0} - target: {fileID: 1943039892745546559, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchorMax.y @@ -9359,8 +9364,8 @@ MonoBehaviour: cornPopSpeed: 30 cornCountSlider: {fileID: 657773260} faildCountSlider: {fileID: 657773259} - growSpeedSlider: {fileID: 657773258} - hotGrowSpeedSlider: {fileID: 657773257} + hotGrowSpeedSlider: {fileID: 657773258} + popTimeSlider: {fileID: 657773257} burntDurationSlider: {fileID: 657773256} spilledSpeedSlider: {fileID: 657773255} popSpeedSlider: {fileID: 657773247} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs index 930deb95..e8ff36f5 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs @@ -38,8 +38,8 @@ public class CornManager : MonoBehaviour #if DEVELOPMENT_BUILD || UNITY_EDITOR [SerializeField] private Slider cornCountSlider; [SerializeField] private Slider faildCountSlider; - [SerializeField] private Slider growSpeedSlider; [SerializeField] private Slider hotGrowSpeedSlider; + [SerializeField] private Slider popTimeSlider; [SerializeField] private Slider burntDurationSlider; [SerializeField] private Slider spilledSpeedSlider; [SerializeField] private Slider popSpeedSlider; @@ -60,16 +60,16 @@ public class CornManager : MonoBehaviour cornCountSlider.value = cornSpawnCount; faildCountSlider.wholeNumbers = true; faildCountSlider.value = maxFailedCornCount; - growSpeedSlider.value = baseGrowSpeed; hotGrowSpeedSlider.value = hotGrowSpeed; + popTimeSlider.value = baseCornPopTime; burntDurationSlider.value = cornBurntDuration; spilledSpeedSlider.value = cornSpillSpeed; popSpeedSlider.value = cornPopSpeed; cornCountSlider.OnValueChangedAsObservable().Subscribe(x => cornSpawnCount = (int)x).AddTo(this); faildCountSlider.OnValueChangedAsObservable().Subscribe(x => maxFailedCornCount = (int)x).AddTo(this); - growSpeedSlider.OnValueChangedAsObservable().Subscribe(x => baseGrowSpeed = x).AddTo(this); hotGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotGrowSpeed = x).AddTo(this); + popTimeSlider.OnValueChangedAsObservable().Subscribe(x => baseCornPopTime = x).AddTo(this); burntDurationSlider.OnValueChangedAsObservable().Subscribe(x => cornBurntDuration = x).AddTo(this); spilledSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornSpillSpeed = x).AddTo(this); popSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornPopSpeed = x).AddTo(this);