From 653b939659ea55379404850cb8d2ef930b69d0d1 Mon Sep 17 00:00:00 2001 From: brausjonas Date: Sun, 22 Jan 2023 23:11:27 +0100 Subject: [PATCH] =?UTF-8?q?W=C3=BCrfel=20H=C3=BCpf=20H=C3=BCpf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/New Physic Material.physicMaterial | 14 +++++ .../New Physic Material.physicMaterial.meta | 8 +++ FlufflParty/Assets/Scenes/Test.unity | 51 ++++++++++++++++--- .../UserSettings/EditorUserSettings.asset | 4 +- 4 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 FlufflParty/Assets/Scenes/New Physic Material.physicMaterial create mode 100644 FlufflParty/Assets/Scenes/New Physic Material.physicMaterial.meta diff --git a/FlufflParty/Assets/Scenes/New Physic Material.physicMaterial b/FlufflParty/Assets/Scenes/New Physic Material.physicMaterial new file mode 100644 index 0000000..e11ce79 --- /dev/null +++ b/FlufflParty/Assets/Scenes/New Physic Material.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Physic Material + dynamicFriction: 0.6 + staticFriction: 0.6 + bounciness: 1 + frictionCombine: 0 + bounceCombine: 0 diff --git a/FlufflParty/Assets/Scenes/New Physic Material.physicMaterial.meta b/FlufflParty/Assets/Scenes/New Physic Material.physicMaterial.meta new file mode 100644 index 0000000..1770754 --- /dev/null +++ b/FlufflParty/Assets/Scenes/New Physic Material.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4172e33bb0046c24c801bda990004ddc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 064b368..a4be6cc 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -622,7 +622,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1607968977} m_LocalRotation: {x: 0.21244515, y: -0, z: -0, w: 0.97717303} - m_LocalPosition: {x: 84.7, y: 8.58, z: 82.76} + m_LocalPosition: {x: 84.7, y: 8.58, z: 97.09} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -972,6 +972,10 @@ PrefabInstance: propertyPath: m_Name value: Dice objectReference: {fileID: 0} + - target: {fileID: 315064472590105111, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_RootOrder value: 11 @@ -982,19 +986,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_LocalPosition.y - value: 40.19 + value: 43.775 objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_LocalPosition.z - value: 8.28 + value: 8.279999 objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.9947148 objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.10267709 objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_LocalRotation.y @@ -1006,7 +1010,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -11.787 objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -1018,6 +1022,41 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} +--- !u!1 &621000483461340797 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 315064472590105111, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + m_PrefabInstance: {fileID: 621000483461340796} + m_PrefabAsset: {fileID: 0} +--- !u!64 &621000483461340802 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621000483461340797} + m_Material: {fileID: 13400000, guid: 4172e33bb0046c24c801bda990004ddc, type: 2} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -5495902117074765545, guid: 9a90bcb2caab02e48a78ba8ecc95b0b4, type: 3} +--- !u!54 &621000483461340803 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621000483461340797} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &647957210169731913 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index 6ef7e5e..95192e0 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -6,10 +6,10 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 5604555501510a0955590d74437008441216412e7578276829704a6bb0b66c3a flags: 0 RecentlyUsedSceneGuid-1: - value: 5604555501510a0955590d74437008441216412e7578276829704a6bb0b66c3a + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 vcSharedLogLevel: value: 0d5e400f0650