Skip to content

Commit

Permalink
fix: special physical material for stage 3 metal box
Browse files Browse the repository at this point in the history
  • Loading branch information
@gjwj5505
gjwj5505 committed Dec 21, 2024
1 parent a79f11c commit 503d862
Show file tree
Hide file tree
Showing 4 changed files with 268 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Assets/SWPPT3/PhysicMaterials/BoxMaterial.physicMaterial
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ PhysicMaterial:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BoxMaterial
dynamicFriction: 0.1
staticFriction: 0.1
dynamicFriction: 0.2
staticFriction: 0.2
bounciness: 0
frictionCombine: 0
bounceCombine: 0
14 changes: 14 additions & 0 deletions Assets/SWPPT3/PhysicMaterials/BoxOnHeadMaterial.physicMaterial
View file
Original file line number Diff line number Diff line change
@@ -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: BoxOnHeadMaterial
dynamicFriction: 0.7
staticFriction: 0.7
bounciness: 0
frictionCombine: 3
bounceCombine: 0
8 changes: 8 additions & 0 deletions Assets/SWPPT3/PhysicMaterials/BoxOnHeadMaterial.physicMaterial.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

249 changes: 244 additions & 5 deletions Assets/SWPPT3/Scenes/Stage 3.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@ PrefabInstance:
- target: {fileID: 2240430976677147252, guid: eda2e419eac0c964d8545aa2aa2b475f,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
value: 0.745
objectReference: {fileID: 0}
- target: {fileID: 2240430976677147252, guid: eda2e419eac0c964d8545aa2aa2b475f,
type: 3}
Expand Down Expand Up @@ -4686,7 +4686,7 @@ PrefabInstance:
- target: {fileID: 510248444000824863, guid: e92d8be4e8f2c4913ac06c3958cd55d1,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.5
value: -1.755
objectReference: {fileID: 0}
- target: {fileID: 510248444000824863, guid: e92d8be4e8f2c4913ac06c3958cd55d1,
type: 3}
Expand Down Expand Up @@ -5036,6 +5036,81 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 739060413}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &742959748
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2059964588}
m_Modifications:
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_RootOrder
value: 15
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalPosition.x
value: 8
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalPosition.y
value: -2.81
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 210442451396578135, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
propertyPath: m_Name
value: Dungeon_Wall_Var2 (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e, type: 3}
--- !u!4 &742959749 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 210442451396089719, guid: 36ceb54da2a4a4b17b9bd8dea8029f9e,
type: 3}
m_PrefabInstance: {fileID: 742959748}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &744575347
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5431,7 +5506,7 @@ PrefabInstance:
- target: {fileID: 8241524119736188774, guid: 945a80cc886054d8fa4b6917d82ba80b,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
value: 0.756
objectReference: {fileID: 0}
- target: {fileID: 8241524119736188774, guid: 945a80cc886054d8fa4b6917d82ba80b,
type: 3}
Expand Down Expand Up @@ -8434,6 +8509,17 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 175925707}
m_Modifications:
- target: {fileID: -5826295901742507444, guid: d9494647e2c7a41b5bd2dc70a3cfc905,
type: 3}
propertyPath: m_Mass
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 7478655169163834185, guid: d9494647e2c7a41b5bd2dc70a3cfc905,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 8f33db298ce0a774b87a7f5267a7b7ca,
type: 2}
- target: {fileID: 8571126456223397790, guid: d9494647e2c7a41b5bd2dc70a3cfc905,
type: 3}
propertyPath: m_RootOrder
Expand Down Expand Up @@ -8839,7 +8925,7 @@ PrefabInstance:
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
value: 2.269
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
Expand Down Expand Up @@ -8894,6 +8980,81 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1332795746}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1348657354
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2059964588}
m_Modifications:
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalPosition.x
value: 8
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.92
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 936655011711489263, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_Name
value: Dungeon_Wall_Var1 (2)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 626cb2a6ce24344af92fe9a3d4dd15fa, type: 3}
--- !u!4 &1348657355 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
m_PrefabInstance: {fileID: 1348657354}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1361677298
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -9972,7 +10133,7 @@ PrefabInstance:
- target: {fileID: 8241524119736188774, guid: 945a80cc886054d8fa4b6917d82ba80b,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.322
value: 0.07500002
objectReference: {fileID: 0}
- target: {fileID: 8241524119736188774, guid: 945a80cc886054d8fa4b6917d82ba80b,
type: 3}
Expand Down Expand Up @@ -10788,6 +10949,81 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1653263872}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1660770774
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2059964588}
m_Modifications:
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_RootOrder
value: 16
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalPosition.x
value: 8
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalPosition.y
value: -2.97
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 936655011711489263, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
propertyPath: m_Name
value: Dungeon_Wall_Var1 (3)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 626cb2a6ce24344af92fe9a3d4dd15fa, type: 3}
--- !u!4 &1660770775 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 936655011711060175, guid: 626cb2a6ce24344af92fe9a3d4dd15fa,
type: 3}
m_PrefabInstance: {fileID: 1660770774}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1669015363
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -12958,6 +13194,9 @@ Transform:
- {fileID: 893997640}
- {fileID: 677472608}
- {fileID: 1153233854}
- {fileID: 1348657355}
- {fileID: 742959749}
- {fileID: 1660770775}
m_Father: {fileID: 142836622}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down

0 comments on commit 503d862

Please sign in to comment.