Skip to content

Commit b2704f7

Browse files
committed
Rename physics materials
1 parent 05f5d67 commit b2704f7

File tree

7 files changed

+19
-22
lines changed

7 files changed

+19
-22
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!62 &6200000
4+
PhysicsMaterial2D:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Bouncy
10+
friction: 0.3
11+
bounciness: 1

β€ŽMaterials/2D/BouncyBox.physicsMaterial2Dβ€Ž

Lines changed: 0 additions & 10 deletions
This file was deleted.

β€ŽMaterials/ZeroFriction.physicMaterialβ€Ž renamed to β€ŽMaterials/Slippery.physicMaterialβ€Ž

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
--- !u!134 &13400000
44
PhysicMaterial:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
8-
m_Name: ZeroFriction
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Slippery
910
dynamicFriction: 0
1011
staticFriction: 0
1112
bounciness: 0
1213
frictionCombine: 2
1314
bounceCombine: 0
14-
frictionDirection2: {x: 0, y: 0, z: 0}
15-
dynamicFriction2: 0
16-
staticFriction2: 0

β€ŽMaterials/MaxFriction.physicMaterialβ€Ž renamed to β€ŽMaterials/Sticky.physicMaterialβ€Ž

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
--- !u!134 &13400000
44
PhysicMaterial:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
8-
m_Name: MaxFriction
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Sticky
910
dynamicFriction: 1
1011
staticFriction: 1
1112
bounciness: 0
1213
frictionCombine: 3
1314
bounceCombine: 0
14-
frictionDirection2: {x: 0, y: 0, z: 0}
15-
dynamicFriction2: 0
16-
staticFriction2: 0

0 commit comments

Comments
Β (0)