diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 9d24a6cf..ac9758f7 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -8884,7 +8884,7 @@ MonoBehaviour: panFactor: 0.002 deadZone: 0.009 baseIncreaseSpeed: 0.18 - coldIncreaseSpeed: 0.18 + coldIncreaseSpeed: 0.5 hotIncreaseSpeed: 0.18 maxDecreaseSpeed: 0.5 coldValue: 0.35 @@ -8922,8 +8922,8 @@ MonoBehaviour: baseCornPopTime: 12.5 cornBurntDuration: 1.5 cornBurntRandom: 5 - cornSpillSpeed: 70 - cornPopSpeed: 20 + cornSpillSpeed: 160 + cornPopSpeed: 30 cornCountSlider: {fileID: 657773260} faildCountSlider: {fileID: 657773259} coldGrowSpeedSlider: {fileID: 1661453984} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index 7a2f069e..223e70a4 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab @@ -89,7 +89,7 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 3.5 + m_LinearDrag: 3.75 m_AngularDrag: 2 m_GravityScale: 0 m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs index 8d80725e..ad242cb0 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs @@ -54,55 +54,55 @@ public class CornPopParameters }; public static readonly float[] CornBurntTimeArray = { - 7.6f, - 6.085f, - 4.82f, - 3.805f, - 3.04f, - 2.525f, - 2.26f, - 2.045f, - 1.88f, - 1.765f, - 1.7f, - 1.635f, - 1.57f, - 1.505f, - 1.44f, - 1.375f, - 1.31f, - 1.245f, - 1.18f, - 1.115f, - 1.05f, - 0.985f, - 0.92f, - 0.855f, - 0.8f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, - 1.5f, + 10f, + 8f, + 5.9f, + 4.3f, + 3.2f, + 2.6f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, + 2.5f, }; } \ No newline at end of file