From 0518db51411f879738dce1b55febebda8473fdb6 Mon Sep 17 00:00:00 2001 From: milan Date: Fri, 9 Dec 2022 13:08:00 +0100 Subject: [PATCH] fix balls getting stuck in dispenser --- .../Assets/Animations/Dispenser Close.anim | 9 ++- .../Assets/Animations/Dispenser Open.anim | 9 ++- .../Assets/Prefabs/Dispenser/Dispenser.prefab | 65 +++++++++++++++++-- 3 files changed, 71 insertions(+), 12 deletions(-) diff --git a/Assets/Desert/Assets/Animations/Dispenser Close.anim b/Assets/Desert/Assets/Animations/Dispenser Close.anim index ccc2a6a..821bfd5 100644 --- a/Assets/Desert/Assets/Animations/Dispenser Close.anim +++ b/Assets/Desert/Assets/Animations/Dispenser Close.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -58, y: 0, z: 0} + value: {x: -40, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -58,6 +58,7 @@ AnimationClip: customType: 4 isPPtrCurve: 0 isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -80,12 +81,13 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: -58 + value: -40 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -108,6 +110,7 @@ AnimationClip: path: Dispenser/Hatch classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Desert/Assets/Animations/Dispenser Open.anim b/Assets/Desert/Assets/Animations/Dispenser Open.anim index 2d0ff85..a181a6f 100644 --- a/Assets/Desert/Assets/Animations/Dispenser Open.anim +++ b/Assets/Desert/Assets/Animations/Dispenser Open.anim @@ -28,7 +28,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: -58, y: 0, z: 0} + value: {x: -40, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -58,6 +58,7 @@ AnimationClip: customType: 4 isPPtrCurve: 0 isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -80,7 +81,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -94,7 +96,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -58 + value: -40 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -108,6 +110,7 @@ AnimationClip: path: Dispenser/Hatch classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.prefab b/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.prefab index 72a0bba..fd44b90 100644 --- a/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.prefab +++ b/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.prefab @@ -127,10 +127,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 686062779876312068} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -144,9 +155,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 686062779876312068} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.22215185, y: 0.37926802, z: 0.010000001} m_Center: {x: 0, y: -0.18963401, z: 0.005} --- !u!1 &1017456495745787952 @@ -190,9 +209,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1017456495745787952} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.7 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &8160265624484496619 @@ -215,6 +242,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -327,9 +355,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1241098193884352436} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.1606827, y: 0.066970736, z: 0.005} m_Center: {x: -7.5359674e-17, y: 0.0015146658, z: -0.0000000056995737} --- !u!1 &1435191073881973253 @@ -457,9 +493,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3060764595889915767} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.100000024 m_Center: {x: -0.000000029802322, y: 0.00000003725291, z: 0} --- !u!114 &3576260418602418605 @@ -494,6 +538,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -814,9 +859,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8012130425410617855} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5774401316759283508, guid: bb684bc47f5683348ba50e093338f484, type: 3}