diff --git a/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials.meta b/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials.meta new file mode 100644 index 00000000..c3f5334a --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0b34fe8dd3fa4f148b243b64d2cadcb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials/Harvested.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials/Harvested.physicsMaterial2D new file mode 100644 index 00000000..df82ba8b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials/Harvested.physicsMaterial2D @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Harvested + friction: 0.13 + bounciness: 0.15 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials/Harvested.physicsMaterial2D.meta b/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials/Harvested.physicsMaterial2D.meta new file mode 100644 index 00000000..6859a3b8 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials/Harvested.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f8e4d9f4f89d438f95450ebd031d48b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/HarvestedCorn.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/HarvestedCorn.prefab index aa92c3ca..40988337 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/HarvestedCorn.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/HarvestedCorn.prefab @@ -46,10 +46,10 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 3.5 - m_AngularDrag: 2 + m_LinearDrag: 0 + m_AngularDrag: 1 m_GravityScale: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 1f8e4d9f4f89d438f95450ebd031d48b, type: 2} m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 @@ -69,7 +69,7 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.2 + m_Radius: 0.17 --- !u!1 &2355518643518159810 GameObject: m_ObjectHideFlags: 0 @@ -139,7 +139,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 31 + m_SortingOrder: 21 m_Sprite: {fileID: 21300000, guid: 97ac0328246620745b8881e07f709ce7, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0