Add 0Friction and 100Friction materials with scene adjustments

- Introduce `0Friction` and `100Friction` physics materials for improved control over object interactions.
- Update `SampleScene` with modified Rigidbody and physics properties, including mass, damping, and material assignments.
- Replace outdated mesh references and add new `CapsuleCollider` for the `Pump` object.
- Adjust object layers, transforms, and configurable joint parameters for enhanced physics behavior.
This commit is contained in:
2025-10-19 00:46:06 +02:00
parent db68e40251
commit 7979b5d66d
8 changed files with 326 additions and 243 deletions

View File

@@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!134 &13400000
PhysicsMaterial:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: 0Friction
serializedVersion: 2
m_DynamicFriction: 0
m_StaticFriction: 0
m_Bounciness: 0
m_FrictionCombine: 0
m_BounceCombine: 0

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b6f35084eb7ecff4c894342a0fe3b318
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 13400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -6,7 +6,7 @@ PhysicsMaterial:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: ZeroFriction m_Name: 100Friction
serializedVersion: 2 serializedVersion: 2
m_DynamicFriction: 1 m_DynamicFriction: 1
m_StaticFriction: 1 m_StaticFriction: 1

View File

@@ -135,6 +135,7 @@ GameObject:
- component: {fileID: 109005184} - component: {fileID: 109005184}
- component: {fileID: 109005186} - component: {fileID: 109005186}
- component: {fileID: 109005185} - component: {fileID: 109005185}
- component: {fileID: 109005192}
m_Layer: 0 m_Layer: 0
m_Name: Pump m_Name: Pump
m_TagString: Untagged m_TagString: Untagged
@@ -150,9 +151,9 @@ Rigidbody:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109005183} m_GameObject: {fileID: 109005183}
serializedVersion: 5 serializedVersion: 5
m_Mass: 5 m_Mass: 3
m_LinearDamping: 0 m_LinearDamping: 0
m_AngularDamping: 45 m_AngularDamping: 40
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -188,7 +189,7 @@ CapsuleCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109005183} m_GameObject: {fileID: 109005183}
m_Material: {fileID: 13400000, guid: e992aae4b1ad1f6448b54c4b9f54fd26, type: 2} m_Material: {fileID: 13400000, guid: b6f35084eb7ecff4c894342a0fe3b318, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@@ -211,7 +212,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109005183} m_GameObject: {fileID: 109005183}
m_Mesh: {fileID: 462051029} m_Mesh: {fileID: 1683927177}
--- !u!23 &109005188 --- !u!23 &109005188
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -495,7 +496,7 @@ MonoBehaviour:
m_AreaError: 15 m_AreaError: 15
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 462051029} m_Mesh: {fileID: 1683927177}
m_VersionIndex: 14098 m_VersionIndex: 14098
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
@@ -516,6 +517,29 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 761760618} m_Father: {fileID: 761760618}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &109005192
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109005183}
m_Material: {fileID: 13400000, guid: e992aae4b1ad1f6448b54c4b9f54fd26, type: 2}
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
m_Radius: 0.03
m_Height: 0
m_Direction: 1
m_Center: {x: 0, y: -0.26, z: 0}
--- !u!1 &125187157 --- !u!1 &125187157
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -565,7 +589,7 @@ CapsuleCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 125187157} m_GameObject: {fileID: 125187157}
m_Material: {fileID: 0} m_Material: {fileID: 13400000, guid: b6f35084eb7ecff4c894342a0fe3b318, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@@ -668,8 +692,8 @@ ConfigurableJoint:
useAcceleration: 0 useAcceleration: 0
m_YDrive: m_YDrive:
serializedVersion: 4 serializedVersion: 4
positionSpring: 1000 positionSpring: 2000
positionDamper: 5 positionDamper: 0
maximumForce: 3.4028233e+38 maximumForce: 3.4028233e+38
useAcceleration: 1 useAcceleration: 1
m_ZDrive: m_ZDrive:
@@ -718,9 +742,9 @@ Rigidbody:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 125187157} m_GameObject: {fileID: 125187157}
serializedVersion: 5 serializedVersion: 5
m_Mass: 5 m_Mass: 7
m_LinearDamping: 0 m_LinearDamping: 0
m_AngularDamping: 45 m_AngularDamping: 40
m_CenterOfMass: {x: 0, y: -0.03, z: 0} m_CenterOfMass: {x: 0, y: -0.03, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -730,7 +754,7 @@ Rigidbody:
m_ExcludeLayers: m_ExcludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
m_ImplicitCom: 1 m_ImplicitCom: 0
m_ImplicitTensor: 1 m_ImplicitTensor: 1
m_UseGravity: 1 m_UseGravity: 1
m_IsKinematic: 0 m_IsKinematic: 0
@@ -1046,16 +1070,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f29f8671b3f4470296145841943e38a8, type: 3} m_Script: {fileID: 11500000, guid: f29f8671b3f4470296145841943e38a8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: Assembly-CSharp::TestScript2 m_EditorClassIdentifier: Assembly-CSharp::TestScript2
torqueForce: 7 torqueForce: 10
lerpSpeed: 7 lerpSpeed: 7
jumpDownForce: 2 jumpDownForce: 3.5
jumpUpForce: 3.5 jumpUpForce: 3.75
softPositionSpring: 200 softPositionSpring: 200
forceMode: 2 forceMode: 2
pump: {fileID: 109005184} pump: {fileID: 109005184}
debugUi: {fileID: 0} debugUi: {fileID: 375111999}
timeScale: 1 timeScale: 1
lerp: 1 lerp: 1
layerMask:
serializedVersion: 2
m_Bits: 8
--- !u!1 &127015120 --- !u!1 &127015120
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1964,7 +1991,7 @@ GameObject:
- component: {fileID: 457588463} - component: {fileID: 457588463}
- component: {fileID: 457588462} - component: {fileID: 457588462}
- component: {fileID: 457588461} - component: {fileID: 457588461}
m_Layer: 0 m_Layer: 3
m_Name: Plane m_Name: Plane
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@@ -2064,184 +2091,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!43 &462051029
Mesh:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh-17466(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
serializedVersion: 12
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 36
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 24
localAABB:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0.025000006, y: 0.27861288, z: 0.025}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_BonesAABB: []
m_VariableBoneCountWeights:
m_Data:
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexFormat: 0
m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600
m_VertexData:
serializedVersion: 3
m_VertexCount: 24
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 24
format: 0
dimension: 4
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 40
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
m_DataSize: 1152
_typelessdata: d0ccccbc59a68ebecdcccc3c00000000000000000000803f000080bf0000000000000000000080bfd0cc4c3d4fb3e23ed0cccc3c59a68ebecdcccc3c00000000000000000000803f000080bf0000000000000000000080bf000000004fb3e23ed0ccccbc59a68e3ecdcccc3c00000000000000000000803f000080bf0000000000000000000080bfd0cc4c3d0000803fd0cccc3c59a68e3ecdcccc3c00000000000000000000803f000080bf0000000000000000000080bf000000000000803fd0cccc3c59a68ebecdcccc3c0000803f000000000000000000000000000000000000803f000080bfcdcc4c3d4fb3e23ed0cccc3c59a68ebecdccccbc0000803f000000000000000000000000000000000000803f000080bf000000004fb3e23ed0cccc3c59a68e3ecdcccc3c0000803f000000000000000000000000000000000000803f000080bfcdcc4c3d0000803fd0cccc3c59a68e3ecdccccbc0000803f000000000000000000000000000000000000803f000080bf000000000000803fd0cccc3c59a68ebecdccccbc0000000000000000000080bf0000803f0000000000000000000080bfd0cc4c3d4fb3e23ed0ccccbc59a68ebecdccccbc0000000000000000000080bf0000803f0000000000000000000080bf000000004fb3e23ed0cccc3c59a68e3ecdccccbc0000000000000000000080bf0000803f0000000000000000000080bfd0cc4c3d0000803fd0ccccbc59a68e3ecdccccbc0000000000000000000080bf0000803f0000000000000000000080bf000000000000803fd0ccccbc59a68ebecdccccbc000080bf00000000000000000000000000000000000080bf000080bfcdcc4c3d4fb3e23ed0ccccbc59a68ebecdcccc3c000080bf00000000000000000000000000000000000080bf000080bf000000004fb3e23ed0ccccbc59a68e3ecdccccbc000080bf00000000000000000000000000000000000080bf000080bfcdcc4c3d0000803fd0ccccbc59a68e3ecdcccc3c000080bf00000000000000000000000000000000000080bf000080bf000000000000803fd0ccccbc59a68e3ecdcccc3c000000000000803f000000000000803f0000000000000000000080bf000000000000803fd0cccc3c59a68e3ecdcccc3c000000000000803f000000000000803f0000000000000000000080bfd0cc4c3d0000803fd0ccccbc59a68e3ecdccccbc000000000000803f000000000000803f0000000000000000000080bf000000003433733fd0cccc3c59a68e3ecdccccbc000000000000803f000000000000803f0000000000000000000080bfd0cc4c3d3433733fd0ccccbc59a68ebecdccccbc00000000000080bf00000000000080bf0000000000000000000080bfd0cc4c3d3433733fd0cccc3c59a68ebecdccccbc00000000000080bf00000000000080bf0000000000000000000080bf000000003433733fd0ccccbc59a68ebecdcccc3c00000000000080bf00000000000080bf0000000000000000000080bfd0cc4c3d0000803fd0cccc3c59a68ebecdcccc3c00000000000080bf00000000000080bf0000000000000000000080bf000000000000803f
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_UV:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Normals:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Tangents:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Weights:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_NormalSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_TangentSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_FloatColors:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_BoneIndices:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_Triangles:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0.025000006, y: 0.27861288, z: 0.025}
m_MeshUsageFlags: 0
m_CookingOptions: 30
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
'm_MeshMetrics[0]': 1.000001
'm_MeshMetrics[1]': 1
m_MeshOptimizationFlags: 1
m_StreamData:
serializedVersion: 2
offset: 0
size: 0
path:
m_MeshLodInfo:
serializedVersion: 2
m_LodSelectionCurve:
serializedVersion: 1
m_LodSlope: 0
m_LodBias: 0
m_NumLevels: 1
m_SubMeshes:
- serializedVersion: 2
m_Levels:
- serializedVersion: 1
m_IndexStart: 0
m_IndexCount: 0
--- !u!1 &640614937 --- !u!1 &640614937
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2653,7 +2502,7 @@ GameObject:
- component: {fileID: 655886441} - component: {fileID: 655886441}
- component: {fileID: 655886440} - component: {fileID: 655886440}
- component: {fileID: 655886439} - component: {fileID: 655886439}
m_Layer: 0 m_Layer: 3
m_Name: Cube (2) m_Name: Cube (2)
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@@ -3452,7 +3301,7 @@ GameObject:
- component: {fileID: 1036828958} - component: {fileID: 1036828958}
- component: {fileID: 1036828963} - component: {fileID: 1036828963}
- component: {fileID: 1036828962} - component: {fileID: 1036828962}
m_Layer: 0 m_Layer: 3
m_Name: Cube (1) m_Name: Cube (1)
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@@ -3629,7 +3478,7 @@ GameObject:
- component: {fileID: 1068904559} - component: {fileID: 1068904559}
- component: {fileID: 1068904558} - component: {fileID: 1068904558}
- component: {fileID: 1068904557} - component: {fileID: 1068904557}
m_Layer: 0 m_Layer: 3
m_Name: Cube (4) m_Name: Cube (4)
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@@ -3643,7 +3492,7 @@ BoxCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1068904556} m_GameObject: {fileID: 1068904556}
m_Material: {fileID: 0} m_Material: {fileID: 13400000, guid: e992aae4b1ad1f6448b54c4b9f54fd26, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@@ -3721,13 +3570,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1068904556} m_GameObject: {fileID: 1068904556}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.28292742, w: 0.9591414} m_LocalRotation: {x: 0, y: 0, z: 0.499622, w: 0.8662436}
m_LocalPosition: {x: -6.324, y: 3.691, z: 0} m_LocalPosition: {x: -7.54, y: 1.59, z: 0}
m_LocalScale: {x: 1, y: 10.9, z: 1} m_LocalScale: {x: 1, y: 10.9, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 32.87} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 59.95}
--- !u!1 &1144690461 --- !u!1 &1144690461
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3977,7 +3826,7 @@ GameObject:
- component: {fileID: 1363790844} - component: {fileID: 1363790844}
- component: {fileID: 1363790843} - component: {fileID: 1363790843}
- component: {fileID: 1363790842} - component: {fileID: 1363790842}
m_Layer: 0 m_Layer: 3
m_Name: Cube (3) m_Name: Cube (3)
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@@ -4088,7 +3937,7 @@ GameObject:
- component: {fileID: 1474109342} - component: {fileID: 1474109342}
- component: {fileID: 1474109341} - component: {fileID: 1474109341}
- component: {fileID: 1474109340} - component: {fileID: 1474109340}
m_Layer: 0 m_Layer: 3
m_Name: Cube m_Name: Cube
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@@ -4187,6 +4036,184 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!43 &1683927177
Mesh:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh-17466(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
serializedVersion: 12
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 36
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 24
localAABB:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0.025000006, y: 0.27861288, z: 0.025}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_BonesAABB: []
m_VariableBoneCountWeights:
m_Data:
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexFormat: 0
m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600
m_VertexData:
serializedVersion: 3
m_VertexCount: 24
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 24
format: 0
dimension: 4
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 40
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
m_DataSize: 1152
_typelessdata: d0ccccbc59a68ebecdcccc3c00000000000000000000803f000080bf0000000000000000000080bfd0cc4c3d4fb3e23ed0cccc3c59a68ebecdcccc3c00000000000000000000803f000080bf0000000000000000000080bf000000004fb3e23ed0ccccbc59a68e3ecdcccc3c00000000000000000000803f000080bf0000000000000000000080bfd0cc4c3d0000803fd0cccc3c59a68e3ecdcccc3c00000000000000000000803f000080bf0000000000000000000080bf000000000000803fd0cccc3c59a68ebecdcccc3c0000803f000000000000000000000000000000000000803f000080bfcdcc4c3d4fb3e23ed0cccc3c59a68ebecdccccbc0000803f000000000000000000000000000000000000803f000080bf000000004fb3e23ed0cccc3c59a68e3ecdcccc3c0000803f000000000000000000000000000000000000803f000080bfcdcc4c3d0000803fd0cccc3c59a68e3ecdccccbc0000803f000000000000000000000000000000000000803f000080bf000000000000803fd0cccc3c59a68ebecdccccbc0000000000000000000080bf0000803f0000000000000000000080bfd0cc4c3d4fb3e23ed0ccccbc59a68ebecdccccbc0000000000000000000080bf0000803f0000000000000000000080bf000000004fb3e23ed0cccc3c59a68e3ecdccccbc0000000000000000000080bf0000803f0000000000000000000080bfd0cc4c3d0000803fd0ccccbc59a68e3ecdccccbc0000000000000000000080bf0000803f0000000000000000000080bf000000000000803fd0ccccbc59a68ebecdccccbc000080bf00000000000000000000000000000000000080bf000080bfcdcc4c3d4fb3e23ed0ccccbc59a68ebecdcccc3c000080bf00000000000000000000000000000000000080bf000080bf000000004fb3e23ed0ccccbc59a68e3ecdccccbc000080bf00000000000000000000000000000000000080bf000080bfcdcc4c3d0000803fd0ccccbc59a68e3ecdcccc3c000080bf00000000000000000000000000000000000080bf000080bf000000000000803fd0ccccbc59a68e3ecdcccc3c000000000000803f000000000000803f0000000000000000000080bf000000000000803fd0cccc3c59a68e3ecdcccc3c000000000000803f000000000000803f0000000000000000000080bfd0cc4c3d0000803fd0ccccbc59a68e3ecdccccbc000000000000803f000000000000803f0000000000000000000080bf000000003433733fd0cccc3c59a68e3ecdccccbc000000000000803f000000000000803f0000000000000000000080bfd0cc4c3d3433733fd0ccccbc59a68ebecdccccbc00000000000080bf00000000000080bf0000000000000000000080bfd0cc4c3d3433733fd0cccc3c59a68ebecdccccbc00000000000080bf00000000000080bf0000000000000000000080bf000000003433733fd0ccccbc59a68ebecdcccc3c00000000000080bf00000000000080bf0000000000000000000080bfd0cc4c3d0000803fd0cccc3c59a68ebecdcccc3c00000000000080bf00000000000080bf0000000000000000000080bf000000000000803f
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_UV:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Normals:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Tangents:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Weights:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_NormalSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_TangentSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_FloatColors:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_BoneIndices:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_Triangles:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0.025000006, y: 0.27861288, z: 0.025}
m_MeshUsageFlags: 0
m_CookingOptions: 30
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
'm_MeshMetrics[0]': 1.000001
'm_MeshMetrics[1]': 1
m_MeshOptimizationFlags: 1
m_StreamData:
serializedVersion: 2
offset: 0
size: 0
path:
m_MeshLodInfo:
serializedVersion: 2
m_LodSelectionCurve:
serializedVersion: 1
m_LodSlope: 0
m_LodBias: 0
m_NumLevels: 1
m_SubMeshes:
- serializedVersion: 2
m_Levels:
- serializedVersion: 1
m_IndexStart: 0
m_IndexCount: 0
--- !u!1 &2008019735 --- !u!1 &2008019735
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -13,6 +13,7 @@ public class TestScript2 : MonoBehaviour
private ConfigurableJoint _configurableJoint; private ConfigurableJoint _configurableJoint;
private float _smoothX; private float _smoothX;
private float _initDamping;
// max is 0.63 // max is 0.63
// min is 0.15 // min is 0.15
@@ -25,6 +26,7 @@ public class TestScript2 : MonoBehaviour
private bool _grounded = false; private bool _grounded = false;
private bool _jumpQueued = false; private bool _jumpQueued = false;
private bool _jumped = false;
private bool _upJumpQueued = false; private bool _upJumpQueued = false;
private bool _canJump = false; private bool _canJump = false;
private bool _jumpInputBuffer = false; private bool _jumpInputBuffer = false;
@@ -61,7 +63,9 @@ public class TestScript2 : MonoBehaviour
[SerializeField] [SerializeField]
private bool lerp = true; private bool lerp = true;
private float _startAngularDamp; [SerializeField]
private LayerMask layerMask;
private void Awake() private void Awake()
{ {
@@ -70,6 +74,8 @@ public class TestScript2 : MonoBehaviour
_jointDrive = _configurableJoint.yDrive; _jointDrive = _configurableJoint.yDrive;
_initDamping = _rigidbody.angularDamping;
_softJointDrive = new JointDrive { _softJointDrive = new JointDrive {
positionSpring = softPositionSpring, positionSpring = softPositionSpring,
maximumForce = _jointDrive.maximumForce, maximumForce = _jointDrive.maximumForce,
@@ -90,7 +96,7 @@ public class TestScript2 : MonoBehaviour
_initDifference = _maxDifference; _initDifference = _maxDifference;
debugUi?.UpdateText($"Difference: {_maxDifference}"); debugUi?.UpdateText($"Difference: {_maxDifference}");
_startAngularDamp = _rigidbody.angularDamping; _initDamping = _rigidbody.angularDamping;
Time.timeScale = timeScale; Time.timeScale = timeScale;
} }
@@ -117,6 +123,7 @@ public class TestScript2 : MonoBehaviour
_previousDifference = null; _previousDifference = null;
_jumpQueued = false; _jumpQueued = false;
_canJump = false; _canJump = false;
_jumped = true;
pump.AddForce(transform.up * (jumpUpForce * forceMultiplier), ForceMode.Impulse); pump.AddForce(transform.up * (jumpUpForce * forceMultiplier), ForceMode.Impulse);
_configurableJoint.yDrive = _jointDrive; _configurableJoint.yDrive = _jointDrive;
@@ -132,13 +139,13 @@ public class TestScript2 : MonoBehaviour
_smoothX = 0; _smoothX = 0;
} }
if (_jumpAction.WasPressedThisFrame() && !_jumpInputBuffer) { debugUi?.UpdateGrounded(_grounded ? "Grounded" : "Not Grounded");
_jumpInputBuffer = true;
StartCoroutine(JumpInputBuffer()); if ((_jumped && !_grounded) || _jumpAction.WasReleasedThisFrame()) {
_jumped = false;
} }
if (_jumpInputBuffer && _grounded) { if (_jumpAction.IsPressed() && _grounded && !_jumped) {
_jumpInputBuffer = false;
_jumpQueued = true; _jumpQueued = true;
} }
@@ -172,17 +179,17 @@ public class TestScript2 : MonoBehaviour
if (_jumpQueued) { if (_jumpQueued) {
_rigidbody.AddForce(-transform.up * jumpDownForce, ForceMode.Impulse); _rigidbody.AddForce(-transform.up * jumpDownForce, ForceMode.Impulse);
}
if (_canJump && _grounded) { if (_canJump) {
Jump(); Jump();
}
} }
var origin = pump.position; var origin = pump.position;
var dir = -pump.transform.up; // world down var dir = -pump.transform.up; // world down
const float distance = .40f; const float distance = .35f;
if (Physics.Raycast(origin, dir, out var hit, distance)) { if (Physics.Raycast(origin, dir, out var hit, distance, layerMask.value)) {
Debug.DrawRay(origin, dir * hit.distance, Color.yellow); Debug.DrawRay(origin, dir * hit.distance, Color.yellow);
_grounded = true; _grounded = true;
} else { } else {

View File

@@ -56,6 +56,11 @@
"key": "experimental.enabled", "key": "experimental.enabled",
"value": "{\"m_Value\":false}" "value": "{\"m_Value\":false}"
}, },
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "ShapeComponent.SettingsEnabled",
"value": "{\"m_Value\":false}"
},
{ {
"type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.userMaterial", "key": "mesh.userMaterial",
@@ -85,6 +90,51 @@
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "s_SelectMode", "key": "s_SelectMode",
"value": "{\"m_Value\":4}" "value": "{\"m_Value\":4}"
},
{
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "ShapeBuilder.ActiveShapeIndex",
"value": "{\"m_Value\":6}"
},
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastSize.Cone",
"value": "{\"m_Value\":{\"x\":-0.35350561141967776,\"y\":1.7182711362838746,\"z\":-0.34178638458251955}}"
},
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastSize.Cube",
"value": "{\"m_Value\":{\"x\":0.3081369400024414,\"y\":2.369152069091797,\"z\":-0.3265070915222168}}"
},
{
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastRotation.Cone",
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
},
{
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastRotation.Cube",
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
},
{
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.PivotLocation.Cone",
"value": "{\"m_Value\":0}"
},
{
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.PivotLocation.Cube",
"value": "{\"m_Value\":0}"
},
{
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.Cone",
"value": "{}"
},
{
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.Cube",
"value": "{}"
} }
] ]
} }

View File

@@ -2,13 +2,13 @@
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!78 &1 --- !u!78 &1
TagManager: TagManager:
serializedVersion: 2 serializedVersion: 3
tags: [] tags: []
layers: layers:
- Default - Default
- TransparentFX - TransparentFX
- Ignore Raycast - Ignore Raycast
- - Ground
- Water - Water
- UI - UI
- -
@@ -50,27 +50,3 @@ TagManager:
- Light Layer 5 - Light Layer 5
- Light Layer 6 - Light Layer 6
- Light Layer 7 - Light Layer 7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-