diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index d2edada5..e4696a6e 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -13220,6 +13220,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1453251556405238011, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: thrust + value: 0.07 + objectReference: {fileID: 0} + - target: {fileID: 1453251556405238011, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: deadZone + value: 9 + objectReference: {fileID: 0} - target: {fileID: 1453251556405238011, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: controller diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/PanEdge.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/PanEdge.physicsMaterial2D index 532f9b9d..495a45e5 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/PanEdge.physicsMaterial2D +++ b/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/PanEdge.physicsMaterial2D @@ -7,5 +7,5 @@ PhysicsMaterial2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PanEdge - friction: 0 - bounciness: 0.64 + friction: 0.01 + bounciness: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/corn.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/corn.physicsMaterial2D index fed6e227..7a05566b 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/corn.physicsMaterial2D +++ b/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/corn.physicsMaterial2D @@ -7,5 +7,5 @@ PhysicsMaterial2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: corn - friction: 0.6 - bounciness: 0.2 + friction: 0.01 + bounciness: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index d65d2e1f..39e3abd8 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: 1 + m_LinearDrag: 4 m_AngularDrag: 4 m_GravityScale: 0 m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2}