From b2704f7191f2be30fff6d6e2dd61d9b95cbd2bed Mon Sep 17 00:00:00 2001 From: Adam Graham Date: Sat, 29 May 2021 17:14:31 -0500 Subject: [PATCH] Rename physics materials --- Materials/2D/Bouncy.physicsMaterial2D | 11 +++++++++++ ...sMaterial2D.meta => Bouncy.physicsMaterial2D.meta} | 0 Materials/2D/BouncyBox.physicsMaterial2D | 10 ---------- ...riction.physicMaterial => Slippery.physicMaterial} | 10 ++++------ ...ysicMaterial.meta => Slippery.physicMaterial.meta} | 0 ...xFriction.physicMaterial => Sticky.physicMaterial} | 10 ++++------ ...physicMaterial.meta => Sticky.physicMaterial.meta} | 0 7 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 Materials/2D/Bouncy.physicsMaterial2D rename Materials/2D/{BouncyBox.physicsMaterial2D.meta => Bouncy.physicsMaterial2D.meta} (100%) delete mode 100644 Materials/2D/BouncyBox.physicsMaterial2D rename Materials/{ZeroFriction.physicMaterial => Slippery.physicMaterial} (53%) rename Materials/{ZeroFriction.physicMaterial.meta => Slippery.physicMaterial.meta} (100%) rename Materials/{MaxFriction.physicMaterial => Sticky.physicMaterial} (53%) rename Materials/{MaxFriction.physicMaterial.meta => Sticky.physicMaterial.meta} (100%) diff --git a/Materials/2D/Bouncy.physicsMaterial2D b/Materials/2D/Bouncy.physicsMaterial2D new file mode 100644 index 0000000..523a4e2 --- /dev/null +++ b/Materials/2D/Bouncy.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: Bouncy + friction: 0.3 + bounciness: 1 diff --git a/Materials/2D/BouncyBox.physicsMaterial2D.meta b/Materials/2D/Bouncy.physicsMaterial2D.meta similarity index 100% rename from Materials/2D/BouncyBox.physicsMaterial2D.meta rename to Materials/2D/Bouncy.physicsMaterial2D.meta diff --git a/Materials/2D/BouncyBox.physicsMaterial2D b/Materials/2D/BouncyBox.physicsMaterial2D deleted file mode 100644 index ba9552e..0000000 --- a/Materials/2D/BouncyBox.physicsMaterial2D +++ /dev/null @@ -1,10 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!62 &6200000 -PhysicsMaterial2D: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: BouncyBox - friction: .400000006 - bounciness: .400000006 diff --git a/Materials/ZeroFriction.physicMaterial b/Materials/Slippery.physicMaterial similarity index 53% rename from Materials/ZeroFriction.physicMaterial rename to Materials/Slippery.physicMaterial index 4a45cf3..49ad480 100644 --- a/Materials/ZeroFriction.physicMaterial +++ b/Materials/Slippery.physicMaterial @@ -3,14 +3,12 @@ --- !u!134 &13400000 PhysicMaterial: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ZeroFriction + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Slippery dynamicFriction: 0 staticFriction: 0 bounciness: 0 frictionCombine: 2 bounceCombine: 0 - frictionDirection2: {x: 0, y: 0, z: 0} - dynamicFriction2: 0 - staticFriction2: 0 diff --git a/Materials/ZeroFriction.physicMaterial.meta b/Materials/Slippery.physicMaterial.meta similarity index 100% rename from Materials/ZeroFriction.physicMaterial.meta rename to Materials/Slippery.physicMaterial.meta diff --git a/Materials/MaxFriction.physicMaterial b/Materials/Sticky.physicMaterial similarity index 53% rename from Materials/MaxFriction.physicMaterial rename to Materials/Sticky.physicMaterial index ed55da9..b6fa8fb 100644 --- a/Materials/MaxFriction.physicMaterial +++ b/Materials/Sticky.physicMaterial @@ -3,14 +3,12 @@ --- !u!134 &13400000 PhysicMaterial: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: MaxFriction + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sticky dynamicFriction: 1 staticFriction: 1 bounciness: 0 frictionCombine: 3 bounceCombine: 0 - frictionDirection2: {x: 0, y: 0, z: 0} - dynamicFriction2: 0 - staticFriction2: 0 diff --git a/Materials/MaxFriction.physicMaterial.meta b/Materials/Sticky.physicMaterial.meta similarity index 100% rename from Materials/MaxFriction.physicMaterial.meta rename to Materials/Sticky.physicMaterial.meta