diff --git a/Assets/Art/Materials/Cars/Car_01/Accessories_01.mat b/Assets/Art/Materials/Cars/Car_01/Accessories_01.mat index b53f57cce..759cca194 100644 --- a/Assets/Art/Materials/Cars/Car_01/Accessories_01.mat +++ b/Assets/Art/Materials/Cars/Car_01/Accessories_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_01/Bumper_01.mat b/Assets/Art/Materials/Cars/Car_01/Bumper_01.mat index 44770bd41..37b06f5b3 100644 --- a/Assets/Art/Materials/Cars/Car_01/Bumper_01.mat +++ b/Assets/Art/Materials/Cars/Car_01/Bumper_01.mat @@ -21,7 +21,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -122,6 +123,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4886000610741023900 MonoBehaviour: m_ObjectHideFlags: 11 @@ -134,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color1.mat b/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color1.mat index e21d192d5..fe58ae578 100644 --- a/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color1.mat +++ b/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color1.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -177,6 +178,7 @@ Material: - _Layer2_Color: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2275509538683177170 MonoBehaviour: m_ObjectHideFlags: 11 @@ -189,4 +191,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color2.mat b/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color2.mat index d52457e64..968a580fe 100644 --- a/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color2.mat +++ b/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color2.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -137,6 +138,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2275509538683177170 MonoBehaviour: m_ObjectHideFlags: 11 @@ -149,4 +151,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color3.mat b/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color3.mat index d561d7082..137b4e051 100644 --- a/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color3.mat +++ b/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color3.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -137,6 +138,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2275509538683177170 MonoBehaviour: m_ObjectHideFlags: 11 @@ -149,4 +151,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color4.mat b/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color4.mat index 75e091ff6..b725a3f96 100644 --- a/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color4.mat +++ b/Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color4.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -137,6 +138,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2275509538683177170 MonoBehaviour: m_ObjectHideFlags: 11 @@ -149,4 +151,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_01/Floor.mat b/Assets/Art/Materials/Cars/Car_01/Floor.mat index 6f26c705f..8d3eee5e1 100644 --- a/Assets/Art/Materials/Cars/Car_01/Floor.mat +++ b/Assets/Art/Materials/Cars/Car_01/Floor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,3 +134,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_01/Headlights_01.mat b/Assets/Art/Materials/Cars/Car_01/Headlights_01.mat index 2ab660f69..1ee213286 100644 --- a/Assets/Art/Materials/Cars/Car_01/Headlights_01.mat +++ b/Assets/Art/Materials/Cars/Car_01/Headlights_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -29,13 +29,14 @@ Material: - _METALLICSPECGLOSSMAP - _OCCLUSIONMAP m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -98,6 +99,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -129,6 +131,7 @@ Material: - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} @@ -136,3 +139,4 @@ Material: - _EmissionColor: {r: 13.88679, g: 9.428301, b: 2.9082284, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_01/Rims_01.mat b/Assets/Art/Materials/Cars/Car_01/Rims_01.mat index dbd132bd8..4cdc22cfd 100644 --- a/Assets/Art/Materials/Cars/Car_01/Rims_01.mat +++ b/Assets/Art/Materials/Cars/Car_01/Rims_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_01/TailLights_01.mat b/Assets/Art/Materials/Cars/Car_01/TailLights_01.mat index 03bdc9d32..3c0c52164 100644 --- a/Assets/Art/Materials/Cars/Car_01/TailLights_01.mat +++ b/Assets/Art/Materials/Cars/Car_01/TailLights_01.mat @@ -19,7 +19,7 @@ Material: - _OCCLUSIONMAP - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -28,6 +28,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -90,6 +91,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -121,6 +123,7 @@ Material: - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -128,6 +131,7 @@ Material: - _EmissionColor: {r: 5.000013, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6367158704785786816 MonoBehaviour: m_ObjectHideFlags: 11 @@ -140,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_01/Wheels_01.mat b/Assets/Art/Materials/Cars/Car_01/Wheels_01.mat index 35776b7f4..031c901dd 100644 --- a/Assets/Art/Materials/Cars/Car_01/Wheels_01.mat +++ b/Assets/Art/Materials/Cars/Car_01/Wheels_01.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2174287776107529503 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_01/Windows_01.mat b/Assets/Art/Materials/Cars/Car_01/Windows_01.mat index f648b19cd..36d9eb552 100644 --- a/Assets/Art/Materials/Cars/Car_01/Windows_01.mat +++ b/Assets/Art/Materials/Cars/Car_01/Windows_01.mat @@ -21,7 +21,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -122,6 +123,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7543345902601309084 MonoBehaviour: m_ObjectHideFlags: 11 @@ -134,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_02/Car_02_LowPolyWheels.mat b/Assets/Art/Materials/Cars/Car_02/Car_02_LowPolyWheels.mat index 7e0a62757..612248082 100644 --- a/Assets/Art/Materials/Cars/Car_02/Car_02_LowPolyWheels.mat +++ b/Assets/Art/Materials/Cars/Car_02/Car_02_LowPolyWheels.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_02/Car_02_windows.mat b/Assets/Art/Materials/Cars/Car_02/Car_02_windows.mat index 4ee8ecdbf..1d2f206b7 100644 --- a/Assets/Art/Materials/Cars/Car_02/Car_02_windows.mat +++ b/Assets/Art/Materials/Cars/Car_02/Car_02_windows.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color1.mat b/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color1.mat index 054343c56..5f6049ac7 100644 --- a/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color1.mat +++ b/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color1.mat @@ -13,13 +13,15 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -145,6 +147,7 @@ Material: - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2620025741498108085 MonoBehaviour: m_ObjectHideFlags: 11 @@ -157,4 +160,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color2.mat b/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color2.mat index 1776120b5..189e09a9d 100644 --- a/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color2.mat +++ b/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color2.mat @@ -13,13 +13,15 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -145,6 +147,7 @@ Material: - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2620025741498108085 MonoBehaviour: m_ObjectHideFlags: 11 @@ -157,4 +160,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color3.mat b/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color3.mat index fd8024070..3ca65526f 100644 --- a/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color3.mat +++ b/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color3.mat @@ -13,13 +13,15 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -145,6 +147,7 @@ Material: - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2620025741498108085 MonoBehaviour: m_ObjectHideFlags: 11 @@ -157,4 +160,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color4.mat b/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color4.mat index 0e8ae20e5..d98dea446 100644 --- a/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color4.mat +++ b/Assets/Art/Materials/Cars/Car_02/Colors/Car_02_Color4.mat @@ -13,13 +13,15 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -145,6 +147,7 @@ Material: - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2620025741498108085 MonoBehaviour: m_ObjectHideFlags: 11 @@ -157,4 +160,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_02/Floor.mat b/Assets/Art/Materials/Cars/Car_02/Floor.mat index 361866a02..cfee21a8e 100644 --- a/Assets/Art/Materials/Cars/Car_02/Floor.mat +++ b/Assets/Art/Materials/Cars/Car_02/Floor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,3 +134,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Accessories.mat b/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Accessories.mat index d95863415..5c5483d80 100644 --- a/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Accessories.mat +++ b/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Accessories.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -30,13 +30,14 @@ Material: - _NORMALMAP - _OCCLUSIONMAP m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -99,6 +100,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -130,6 +132,7 @@ Material: - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} @@ -137,3 +140,4 @@ Material: - _EmissionColor: {r: 13.88679, g: 9.428301, b: 2.9082284, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Rims.mat b/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Rims.mat index 361440c96..b4270ccff 100644 --- a/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Rims.mat +++ b/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Rims.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2222270219462603941 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Wheels.mat b/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Wheels.mat index 708ff1983..f7bf35e1e 100644 --- a/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Wheels.mat +++ b/Assets/Art/Materials/Cars/Car_03/Car_03_Ford_Wheels.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -135,3 +136,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color1.mat b/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color1.mat index 76bc04575..562508799 100644 --- a/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color1.mat +++ b/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: _Layer1Color m_SavedProperties: serializedVersion: 3 @@ -188,3 +189,4 @@ Material: - _Layer2_Color: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color2.mat b/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color2.mat index 28a2a9e75..24b2b7ae4 100644 --- a/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color2.mat +++ b/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: _Layer1Color m_SavedProperties: serializedVersion: 3 @@ -188,3 +189,4 @@ Material: - _Layer2_Color: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color3.mat b/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color3.mat index dfa49f991..a8a1e1b73 100644 --- a/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color3.mat +++ b/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: _Layer1Color m_SavedProperties: serializedVersion: 3 @@ -188,3 +189,4 @@ Material: - _Layer2_Color: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color4.mat b/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color4.mat index c99ec4bd4..5c751b47c 100644 --- a/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color4.mat +++ b/Assets/Art/Materials/Cars/Car_03/Colors/Car_03_Color4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: _Layer1Color m_SavedProperties: serializedVersion: 3 @@ -188,3 +189,4 @@ Material: - _Layer2_Color: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_04/Car_04_Glasses.mat b/Assets/Art/Materials/Cars/Car_04/Car_04_Glasses.mat index 8bca44ae7..0d063cc80 100644 --- a/Assets/Art/Materials/Cars/Car_04/Car_04_Glasses.mat +++ b/Assets/Art/Materials/Cars/Car_04/Car_04_Glasses.mat @@ -17,13 +17,14 @@ Material: - _NORMALMAP - _OCCLUSIONMAP m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -86,6 +87,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -117,6 +119,7 @@ Material: - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} @@ -124,6 +127,7 @@ Material: - _EmissionColor: {r: 13.88679, g: 9.428301, b: 2.9082284, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &514951892556679256 MonoBehaviour: m_ObjectHideFlags: 11 @@ -136,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_04/Car_04_Wheels.mat b/Assets/Art/Materials/Cars/Car_04/Car_04_Wheels.mat index 0340cae94..f2182f0c5 100644 --- a/Assets/Art/Materials/Cars/Car_04/Car_04_Wheels.mat +++ b/Assets/Art/Materials/Cars/Car_04/Car_04_Wheels.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6809762776513881406 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color1.mat b/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color1.mat index 27a5ee1fd..a0c80e095 100644 --- a/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color1.mat +++ b/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -158,3 +159,4 @@ Material: - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color2.mat b/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color2.mat index 264f6ed8b..db19d1bfe 100644 --- a/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color2.mat +++ b/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -158,3 +159,4 @@ Material: - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color3.mat b/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color3.mat index f8c2126fb..2fcf46568 100644 --- a/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color3.mat +++ b/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -158,3 +159,4 @@ Material: - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color4.mat b/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color4.mat index aae95e1f9..502a5743a 100644 --- a/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color4.mat +++ b/Assets/Art/Materials/Cars/Car_04/Colors/Car_04_Color4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -158,3 +159,4 @@ Material: - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Cars/Car_04/Floor.mat b/Assets/Art/Materials/Cars/Car_04/Floor.mat index 720e6d9f5..ade1b39bb 100644 --- a/Assets/Art/Materials/Cars/Car_04/Floor.mat +++ b/Assets/Art/Materials/Cars/Car_04/Floor.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -120,6 +121,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7741867541296472886 MonoBehaviour: m_ObjectHideFlags: 11 @@ -132,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Checkpoint.mat b/Assets/Art/Materials/Checkpoint.mat index 35149bdb5..cc8b36e4c 100644 --- a/Assets/Art/Materials/Checkpoint.mat +++ b/Assets/Art/Materials/Checkpoint.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -54,5 +55,6 @@ Material: - _QueueControl: 0 - _QueueOffset: 0 m_Colors: - - _Color: {r: 0.21380165, g: 0.113978855, b: 0.3207547, a: 1} + - _Color: {r: 0.20155449, g: 0.3200159, b: 0.4056604, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Colors/Black.mat b/Assets/Art/Materials/Colors/Black.mat index e98e51407..dd1abddc6 100644 --- a/Assets/Art/Materials/Colors/Black.mat +++ b/Assets/Art/Materials/Colors/Black.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -118,6 +119,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8278614522304171064 MonoBehaviour: m_ObjectHideFlags: 11 @@ -130,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Colors/Lime.mat b/Assets/Art/Materials/Colors/Lime.mat index 282158d20..39ec6f3e6 100644 --- a/Assets/Art/Materials/Colors/Lime.mat +++ b/Assets/Art/Materials/Colors/Lime.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -118,6 +119,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8278614522304171064 MonoBehaviour: m_ObjectHideFlags: 11 @@ -130,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Particles/SnowParticle.mat b/Assets/Art/Materials/Particles/SnowParticle.mat index b8968c914..bed2eddb3 100644 --- a/Assets/Art/Materials/Particles/SnowParticle.mat +++ b/Assets/Art/Materials/Particles/SnowParticle.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -153,3 +153,4 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Airplane/Body_plane.mat b/Assets/Art/Materials/Props/Airplane/Body_plane.mat index 6e432208e..5994df756 100644 --- a/Assets/Art/Materials/Props/Airplane/Body_plane.mat +++ b/Assets/Art/Materials/Props/Airplane/Body_plane.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Airplane/Body_plane_Snow.mat b/Assets/Art/Materials/Props/Airplane/Body_plane_Snow.mat index 6524b31a6..e2d2c9a07 100644 --- a/Assets/Art/Materials/Props/Airplane/Body_plane_Snow.mat +++ b/Assets/Art/Materials/Props/Airplane/Body_plane_Snow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Airplane/Head_plane.mat b/Assets/Art/Materials/Props/Airplane/Head_plane.mat index a6d05bb50..0d686af45 100644 --- a/Assets/Art/Materials/Props/Airplane/Head_plane.mat +++ b/Assets/Art/Materials/Props/Airplane/Head_plane.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8515050610920531077 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Airplane/Head_planeSnow.mat b/Assets/Art/Materials/Props/Airplane/Head_planeSnow.mat index d9a406f18..585b7bc74 100644 --- a/Assets/Art/Materials/Props/Airplane/Head_planeSnow.mat +++ b/Assets/Art/Materials/Props/Airplane/Head_planeSnow.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8515050610920531077 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Airplane/Turbine_wings.mat b/Assets/Art/Materials/Props/Airplane/Turbine_wings.mat index 639a809c7..8269ff4a3 100644 --- a/Assets/Art/Materials/Props/Airplane/Turbine_wings.mat +++ b/Assets/Art/Materials/Props/Airplane/Turbine_wings.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Airplane/Turbine_wingsSnow.mat b/Assets/Art/Materials/Props/Airplane/Turbine_wingsSnow.mat index 78673a494..a549bebdf 100644 --- a/Assets/Art/Materials/Props/Airplane/Turbine_wingsSnow.mat +++ b/Assets/Art/Materials/Props/Airplane/Turbine_wingsSnow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Antennas/Antenna_01.mat b/Assets/Art/Materials/Props/Antennas/Antenna_01.mat index 9b5bca997..8b7705077 100644 --- a/Assets/Art/Materials/Props/Antennas/Antenna_01.mat +++ b/Assets/Art/Materials/Props/Antennas/Antenna_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Antennas/Antenna_01Snow.mat b/Assets/Art/Materials/Props/Antennas/Antenna_01Snow.mat index f02e627ef..5a374b143 100644 --- a/Assets/Art/Materials/Props/Antennas/Antenna_01Snow.mat +++ b/Assets/Art/Materials/Props/Antennas/Antenna_01Snow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Antennas/Antenna_02.mat b/Assets/Art/Materials/Props/Antennas/Antenna_02.mat index 8cabf9a16..05716c06c 100644 --- a/Assets/Art/Materials/Props/Antennas/Antenna_02.mat +++ b/Assets/Art/Materials/Props/Antennas/Antenna_02.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Antennas/Antenna_02Snow.mat b/Assets/Art/Materials/Props/Antennas/Antenna_02Snow.mat index d129e00c1..8d3eade7b 100644 --- a/Assets/Art/Materials/Props/Antennas/Antenna_02Snow.mat +++ b/Assets/Art/Materials/Props/Antennas/Antenna_02Snow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Antennas/Antenna_Small.mat b/Assets/Art/Materials/Props/Antennas/Antenna_Small.mat index 8a9fd0c09..f628721be 100644 --- a/Assets/Art/Materials/Props/Antennas/Antenna_Small.mat +++ b/Assets/Art/Materials/Props/Antennas/Antenna_Small.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5583709055576463022 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Antennas/Antenna_SmallSnow.mat b/Assets/Art/Materials/Props/Antennas/Antenna_SmallSnow.mat index 7f7e983e9..70477db01 100644 --- a/Assets/Art/Materials/Props/Antennas/Antenna_SmallSnow.mat +++ b/Assets/Art/Materials/Props/Antennas/Antenna_SmallSnow.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5583709055576463022 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Antennas/Body_Antenna.mat b/Assets/Art/Materials/Props/Antennas/Body_Antenna.mat index 42c41482e..6b0a00c5d 100644 --- a/Assets/Art/Materials/Props/Antennas/Body_Antenna.mat +++ b/Assets/Art/Materials/Props/Antennas/Body_Antenna.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &31629700770260443 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Antennas/Body_AntennaSnow.mat b/Assets/Art/Materials/Props/Antennas/Body_AntennaSnow.mat index 2c1131abf..2a691fc0f 100644 --- a/Assets/Art/Materials/Props/Antennas/Body_AntennaSnow.mat +++ b/Assets/Art/Materials/Props/Antennas/Body_AntennaSnow.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &31629700770260443 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Billboards/billboard02.mat b/Assets/Art/Materials/Props/Billboards/billboard02.mat index 589a56b44..5e4afdb42 100644 --- a/Assets/Art/Materials/Props/Billboards/billboard02.mat +++ b/Assets/Art/Materials/Props/Billboards/billboard02.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Billboards/billboard02Snow.mat b/Assets/Art/Materials/Props/Billboards/billboard02Snow.mat index 208205b0d..909896160 100644 --- a/Assets/Art/Materials/Props/Billboards/billboard02Snow.mat +++ b/Assets/Art/Materials/Props/Billboards/billboard02Snow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Billboards/billboard1.mat b/Assets/Art/Materials/Props/Billboards/billboard1.mat index 141aa58f4..e8fb7999d 100644 --- a/Assets/Art/Materials/Props/Billboards/billboard1.mat +++ b/Assets/Art/Materials/Props/Billboards/billboard1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Billboards/billboard1Snow.mat b/Assets/Art/Materials/Props/Billboards/billboard1Snow.mat index 6e0fc853e..26b823ec3 100644 --- a/Assets/Art/Materials/Props/Billboards/billboard1Snow.mat +++ b/Assets/Art/Materials/Props/Billboards/billboard1Snow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Bridge/Barrier.mat b/Assets/Art/Materials/Props/Bridge/Barrier.mat index 5740e8ac9..c82f0ef43 100644 --- a/Assets/Art/Materials/Props/Bridge/Barrier.mat +++ b/Assets/Art/Materials/Props/Bridge/Barrier.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Bridge/Barrier_Graffiti.mat b/Assets/Art/Materials/Props/Bridge/Barrier_Graffiti.mat index 45d6b6a06..4508e209a 100644 --- a/Assets/Art/Materials/Props/Bridge/Barrier_Graffiti.mat +++ b/Assets/Art/Materials/Props/Bridge/Barrier_Graffiti.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Bridge/Bridge_1.mat b/Assets/Art/Materials/Props/Bridge/Bridge_1.mat index d1270c02b..e0f5f085d 100644 --- a/Assets/Art/Materials/Props/Bridge/Bridge_1.mat +++ b/Assets/Art/Materials/Props/Bridge/Bridge_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Bridge/Bridge_2.mat b/Assets/Art/Materials/Props/Bridge/Bridge_2.mat index ca940d6f0..c3244a1b8 100644 --- a/Assets/Art/Materials/Props/Bridge/Bridge_2.mat +++ b/Assets/Art/Materials/Props/Bridge/Bridge_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Bridge/Broken_Bridge_2.mat b/Assets/Art/Materials/Props/Bridge/Broken_Bridge_2.mat index 25d017538..b1dff6ea8 100644 --- a/Assets/Art/Materials/Props/Bridge/Broken_Bridge_2.mat +++ b/Assets/Art/Materials/Props/Bridge/Broken_Bridge_2.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7280934505180588883 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Bridge/Broken_Bridge_3.mat b/Assets/Art/Materials/Props/Bridge/Broken_Bridge_3.mat index d8a174aae..d8b936326 100644 --- a/Assets/Art/Materials/Props/Bridge/Broken_Bridge_3.mat +++ b/Assets/Art/Materials/Props/Bridge/Broken_Bridge_3.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -153,6 +154,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2937173894081496504 MonoBehaviour: m_ObjectHideFlags: 11 @@ -165,4 +167,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Bridge/Broken_Bridge_Curve.mat b/Assets/Art/Materials/Props/Bridge/Broken_Bridge_Curve.mat index 0c8952719..56331a8ba 100644 --- a/Assets/Art/Materials/Props/Bridge/Broken_Bridge_Curve.mat +++ b/Assets/Art/Materials/Props/Bridge/Broken_Bridge_Curve.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Bridge/Pillar.mat b/Assets/Art/Materials/Props/Bridge/Pillar.mat index 5962fa0c6..545494eff 100644 --- a/Assets/Art/Materials/Props/Bridge/Pillar.mat +++ b/Assets/Art/Materials/Props/Bridge/Pillar.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Bridge/Pillar_Base.mat b/Assets/Art/Materials/Props/Bridge/Pillar_Base.mat index ada880a7b..f9f91c31d 100644 --- a/Assets/Art/Materials/Props/Bridge/Pillar_Base.mat +++ b/Assets/Art/Materials/Props/Bridge/Pillar_Base.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Bridge/Pillar_Graffiti.mat b/Assets/Art/Materials/Props/Bridge/Pillar_Graffiti.mat index b022409d9..83af4a8fa 100644 --- a/Assets/Art/Materials/Props/Bridge/Pillar_Graffiti.mat +++ b/Assets/Art/Materials/Props/Bridge/Pillar_Graffiti.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Containers/LargeContainer 1.mat b/Assets/Art/Materials/Props/Containers/LargeContainer 1.mat index 065990829..9837c128b 100644 --- a/Assets/Art/Materials/Props/Containers/LargeContainer 1.mat +++ b/Assets/Art/Materials/Props/Containers/LargeContainer 1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Containers/LargeContainerBlue.mat b/Assets/Art/Materials/Props/Containers/LargeContainerBlue.mat index f00cbab8f..7d5fbddea 100644 --- a/Assets/Art/Materials/Props/Containers/LargeContainerBlue.mat +++ b/Assets/Art/Materials/Props/Containers/LargeContainerBlue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Containers/LargeContainerBlueSnow.mat b/Assets/Art/Materials/Props/Containers/LargeContainerBlueSnow.mat index d145e68c4..28b3e50ea 100644 --- a/Assets/Art/Materials/Props/Containers/LargeContainerBlueSnow.mat +++ b/Assets/Art/Materials/Props/Containers/LargeContainerBlueSnow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Containers/LargeContainerGreenSnow.mat b/Assets/Art/Materials/Props/Containers/LargeContainerGreenSnow.mat index eb47818f8..fb75c6a7d 100644 --- a/Assets/Art/Materials/Props/Containers/LargeContainerGreenSnow.mat +++ b/Assets/Art/Materials/Props/Containers/LargeContainerGreenSnow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Containers/SmallContainerRed.mat b/Assets/Art/Materials/Props/Containers/SmallContainerRed.mat index 4d7a4776b..460060336 100644 --- a/Assets/Art/Materials/Props/Containers/SmallContainerRed.mat +++ b/Assets/Art/Materials/Props/Containers/SmallContainerRed.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2389601773467490399 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Containers/SmallContainerRedSnow.mat b/Assets/Art/Materials/Props/Containers/SmallContainerRedSnow.mat index c787f6dbf..b34d4ed78 100644 --- a/Assets/Art/Materials/Props/Containers/SmallContainerRedSnow.mat +++ b/Assets/Art/Materials/Props/Containers/SmallContainerRedSnow.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2389601773467490399 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Containers/SmallContainerYellow.mat b/Assets/Art/Materials/Props/Containers/SmallContainerYellow.mat index 8f709fb33..731744ecd 100644 --- a/Assets/Art/Materials/Props/Containers/SmallContainerYellow.mat +++ b/Assets/Art/Materials/Props/Containers/SmallContainerYellow.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2389601773467490399 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Containers/SmallContainerYellowSnow.mat b/Assets/Art/Materials/Props/Containers/SmallContainerYellowSnow.mat index c404bad73..b01a9ef25 100644 --- a/Assets/Art/Materials/Props/Containers/SmallContainerYellowSnow.mat +++ b/Assets/Art/Materials/Props/Containers/SmallContainerYellowSnow.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2389601773467490399 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Damage Buffer_01.mat b/Assets/Art/Materials/Props/Damage Buffer_01.mat index 41267947a..2501d7bbe 100644 --- a/Assets/Art/Materials/Props/Damage Buffer_01.mat +++ b/Assets/Art/Materials/Props/Damage Buffer_01.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4921305892375327329 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Damage_Buffer_02.mat b/Assets/Art/Materials/Props/Damage_Buffer_02.mat index 381fbe36d..dc2ed7354 100644 --- a/Assets/Art/Materials/Props/Damage_Buffer_02.mat +++ b/Assets/Art/Materials/Props/Damage_Buffer_02.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3509252172370315494 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Damage_Buffer_03.mat b/Assets/Art/Materials/Props/Damage_Buffer_03.mat index f1270805a..be9f095fd 100644 --- a/Assets/Art/Materials/Props/Damage_Buffer_03.mat +++ b/Assets/Art/Materials/Props/Damage_Buffer_03.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -30,13 +30,14 @@ Material: - _NORMALMAP - _OCCLUSIONMAP m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -99,6 +100,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -130,6 +132,7 @@ Material: - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} @@ -137,3 +140,4 @@ Material: - _EmissionColor: {r: 13.88679, g: 9.428301, b: 2.9082284, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Engine_01.mat b/Assets/Art/Materials/Props/Engine_01.mat index 1ec96dd47..964994fa4 100644 --- a/Assets/Art/Materials/Props/Engine_01.mat +++ b/Assets/Art/Materials/Props/Engine_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Engine_02.mat b/Assets/Art/Materials/Props/Engine_02.mat index 1cf83f5fe..ffc1eeaef 100644 --- a/Assets/Art/Materials/Props/Engine_02.mat +++ b/Assets/Art/Materials/Props/Engine_02.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Engine_03.mat b/Assets/Art/Materials/Props/Engine_03.mat index 7f0fd7aff..3998715fe 100644 --- a/Assets/Art/Materials/Props/Engine_03.mat +++ b/Assets/Art/Materials/Props/Engine_03.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Exhaust_01.mat b/Assets/Art/Materials/Props/Exhaust_01.mat index ff7f08395..019d129b9 100644 --- a/Assets/Art/Materials/Props/Exhaust_01.mat +++ b/Assets/Art/Materials/Props/Exhaust_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Exhaust_02.mat b/Assets/Art/Materials/Props/Exhaust_02.mat index c26db5d84..704e06afc 100644 --- a/Assets/Art/Materials/Props/Exhaust_02.mat +++ b/Assets/Art/Materials/Props/Exhaust_02.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8123808050770466866 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Exhaust_03.mat b/Assets/Art/Materials/Props/Exhaust_03.mat index ab9ce4f3b..7c924fbd2 100644 --- a/Assets/Art/Materials/Props/Exhaust_03.mat +++ b/Assets/Art/Materials/Props/Exhaust_03.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4544690278579462709 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Extinguisher.mat b/Assets/Art/Materials/Props/Extinguisher.mat index 5f88a8819..803afb5c3 100644 --- a/Assets/Art/Materials/Props/Extinguisher.mat +++ b/Assets/Art/Materials/Props/Extinguisher.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1832492443441176937 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/GasStation/GasTank.mat b/Assets/Art/Materials/Props/GasStation/GasTank.mat index 18202b64b..e2fccc729 100644 --- a/Assets/Art/Materials/Props/GasStation/GasTank.mat +++ b/Assets/Art/Materials/Props/GasStation/GasTank.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/GasStation/GasTankSnow.mat b/Assets/Art/Materials/Props/GasStation/GasTankSnow.mat index 38073fadf..f318e259f 100644 --- a/Assets/Art/Materials/Props/GasStation/GasTankSnow.mat +++ b/Assets/Art/Materials/Props/GasStation/GasTankSnow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/GasStation/Gas_Station.mat b/Assets/Art/Materials/Props/GasStation/Gas_Station.mat index 0e610a98f..0985bb399 100644 --- a/Assets/Art/Materials/Props/GasStation/Gas_Station.mat +++ b/Assets/Art/Materials/Props/GasStation/Gas_Station.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1009190297432837690 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/GasStation/Gas_StationSnow.mat b/Assets/Art/Materials/Props/GasStation/Gas_StationSnow.mat index 3101384e7..d69837805 100644 --- a/Assets/Art/Materials/Props/GasStation/Gas_StationSnow.mat +++ b/Assets/Art/Materials/Props/GasStation/Gas_StationSnow.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1009190297432837690 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/GasStation/Gas_Station_Building.mat b/Assets/Art/Materials/Props/GasStation/Gas_Station_Building.mat index 7a26c5cfa..7d6675046 100644 --- a/Assets/Art/Materials/Props/GasStation/Gas_Station_Building.mat +++ b/Assets/Art/Materials/Props/GasStation/Gas_Station_Building.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/GasStation/Gas_Station_BuildingSnow.mat b/Assets/Art/Materials/Props/GasStation/Gas_Station_BuildingSnow.mat index 18d3c2c63..8edacc924 100644 --- a/Assets/Art/Materials/Props/GasStation/Gas_Station_BuildingSnow.mat +++ b/Assets/Art/Materials/Props/GasStation/Gas_Station_BuildingSnow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Gasoline_Tank_01.mat b/Assets/Art/Materials/Props/Gasoline_Tank_01.mat index f82a6deeb..bdf8b16bf 100644 --- a/Assets/Art/Materials/Props/Gasoline_Tank_01.mat +++ b/Assets/Art/Materials/Props/Gasoline_Tank_01.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7853448828650614650 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Gasoline_Tank_Blue_02.mat b/Assets/Art/Materials/Props/Gasoline_Tank_Blue_02.mat index 3eb2ecbfe..829d88270 100644 --- a/Assets/Art/Materials/Props/Gasoline_Tank_Blue_02.mat +++ b/Assets/Art/Materials/Props/Gasoline_Tank_Blue_02.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2890131023915429366 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Gasoline_Tank_Red_02.mat b/Assets/Art/Materials/Props/Gasoline_Tank_Red_02.mat index b92e4e759..e7fa27c57 100644 --- a/Assets/Art/Materials/Props/Gasoline_Tank_Red_02.mat +++ b/Assets/Art/Materials/Props/Gasoline_Tank_Red_02.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -39,6 +40,7 @@ Material: m_Floats: [] m_Colors: [] m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2890131023915429366 MonoBehaviour: m_ObjectHideFlags: 11 @@ -51,4 +53,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/GrId_LateralWindow_02.mat b/Assets/Art/Materials/Props/GrId_LateralWindow_02.mat index 0df777cb1..4fae56ed3 100644 --- a/Assets/Art/Materials/Props/GrId_LateralWindow_02.mat +++ b/Assets/Art/Materials/Props/GrId_LateralWindow_02.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Grid_LateralWindow_01.mat b/Assets/Art/Materials/Props/Grid_LateralWindow_01.mat index 5168d7879..3c4e8f00e 100644 --- a/Assets/Art/Materials/Props/Grid_LateralWindow_01.mat +++ b/Assets/Art/Materials/Props/Grid_LateralWindow_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Grid_Protector_Backwindow.mat b/Assets/Art/Materials/Props/Grid_Protector_Backwindow.mat index 5b464e41e..ae0bf8e1c 100644 --- a/Assets/Art/Materials/Props/Grid_Protector_Backwindow.mat +++ b/Assets/Art/Materials/Props/Grid_Protector_Backwindow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Grid_Windshield.mat b/Assets/Art/Materials/Props/Grid_Windshield.mat index 1900f8092..e9d9f3c14 100644 --- a/Assets/Art/Materials/Props/Grid_Windshield.mat +++ b/Assets/Art/Materials/Props/Grid_Windshield.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3938767395642008333 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Other/Broken_Metal_Structure.mat b/Assets/Art/Materials/Props/Other/Broken_Metal_Structure.mat index 0284ec8ca..b1e1a5b08 100644 --- a/Assets/Art/Materials/Props/Other/Broken_Metal_Structure.mat +++ b/Assets/Art/Materials/Props/Other/Broken_Metal_Structure.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Other/Cones.mat b/Assets/Art/Materials/Props/Other/Cones.mat index 5c63e8d6c..139f9f20c 100644 --- a/Assets/Art/Materials/Props/Other/Cones.mat +++ b/Assets/Art/Materials/Props/Other/Cones.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5209537676731982165 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Other/Lights.mat b/Assets/Art/Materials/Props/Other/Lights.mat index cc611c0a0..3aa652409 100644 --- a/Assets/Art/Materials/Props/Other/Lights.mat +++ b/Assets/Art/Materials/Props/Other/Lights.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5828161950852586293 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Other/Plates.mat b/Assets/Art/Materials/Props/Other/Plates.mat index 2bcb2d497..087d2e7b1 100644 --- a/Assets/Art/Materials/Props/Other/Plates.mat +++ b/Assets/Art/Materials/Props/Other/Plates.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8824101734177339552 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Other/PlatesSnow.mat b/Assets/Art/Materials/Props/Other/PlatesSnow.mat index ff0a11eee..5cf070edc 100644 --- a/Assets/Art/Materials/Props/Other/PlatesSnow.mat +++ b/Assets/Art/Materials/Props/Other/PlatesSnow.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8824101734177339552 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Other/SideRoad.mat b/Assets/Art/Materials/Props/Other/SideRoad.mat index 2d5e1447d..8df514259 100644 --- a/Assets/Art/Materials/Props/Other/SideRoad.mat +++ b/Assets/Art/Materials/Props/Other/SideRoad.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3629720480417079543 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Other/Signs.mat b/Assets/Art/Materials/Props/Other/Signs.mat index 0022c1428..8c7e17c85 100644 --- a/Assets/Art/Materials/Props/Other/Signs.mat +++ b/Assets/Art/Materials/Props/Other/Signs.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8834704514647164412 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Pipes/Snow_Pipes.mat b/Assets/Art/Materials/Props/Pipes/Snow_Pipes.mat index 98a4cfd25..f807f5a42 100644 --- a/Assets/Art/Materials/Props/Pipes/Snow_Pipes.mat +++ b/Assets/Art/Materials/Props/Pipes/Snow_Pipes.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Pipes/Snow_Refinery.mat b/Assets/Art/Materials/Props/Pipes/Snow_Refinery.mat index 38801b9fb..03132e712 100644 --- a/Assets/Art/Materials/Props/Pipes/Snow_Refinery.mat +++ b/Assets/Art/Materials/Props/Pipes/Snow_Refinery.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3421128102373239837 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Pipes/pipes.mat b/Assets/Art/Materials/Props/Pipes/pipes.mat index 3930a6bc7..e485902ab 100644 --- a/Assets/Art/Materials/Props/Pipes/pipes.mat +++ b/Assets/Art/Materials/Props/Pipes/pipes.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Pipes/refinery.mat b/Assets/Art/Materials/Props/Pipes/refinery.mat index cf1e21892..297ef8b9f 100644 --- a/Assets/Art/Materials/Props/Pipes/refinery.mat +++ b/Assets/Art/Materials/Props/Pipes/refinery.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3421128102373239837 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Plates.mat b/Assets/Art/Materials/Props/Plates.mat index c6ff36359..d598e8b49 100644 --- a/Assets/Art/Materials/Props/Plates.mat +++ b/Assets/Art/Materials/Props/Plates.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8229935971695684145 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Plates_Protector_Door.mat b/Assets/Art/Materials/Props/Plates_Protector_Door.mat index e1a98136b..bd30433b3 100644 --- a/Assets/Art/Materials/Props/Plates_Protector_Door.mat +++ b/Assets/Art/Materials/Props/Plates_Protector_Door.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5590169433470452794 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Plates_Protector_Windshield.mat b/Assets/Art/Materials/Props/Plates_Protector_Windshield.mat index 8624028f5..82be247a2 100644 --- a/Assets/Art/Materials/Props/Plates_Protector_Windshield.mat +++ b/Assets/Art/Materials/Props/Plates_Protector_Windshield.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Rear Armor_01.mat b/Assets/Art/Materials/Props/Rear Armor_01.mat index da89c03c7..bfd39a34a 100644 --- a/Assets/Art/Materials/Props/Rear Armor_01.mat +++ b/Assets/Art/Materials/Props/Rear Armor_01.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5373694236551649409 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Rims_MetalBarProtector.mat b/Assets/Art/Materials/Props/Rims_MetalBarProtector.mat index baa7c3382..d61bec064 100644 --- a/Assets/Art/Materials/Props/Rims_MetalBarProtector.mat +++ b/Assets/Art/Materials/Props/Rims_MetalBarProtector.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Rims_Spikes.mat b/Assets/Art/Materials/Props/Rims_Spikes.mat index 351716f24..0d5356108 100644 --- a/Assets/Art/Materials/Props/Rims_Spikes.mat +++ b/Assets/Art/Materials/Props/Rims_Spikes.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7503000958389968787 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Rocks/Rocks1.mat b/Assets/Art/Materials/Props/Rocks/Rocks1.mat index e4dd649c5..921144433 100644 --- a/Assets/Art/Materials/Props/Rocks/Rocks1.mat +++ b/Assets/Art/Materials/Props/Rocks/Rocks1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Rocks/Rocks1Snow.mat b/Assets/Art/Materials/Props/Rocks/Rocks1Snow.mat index 86c853c9d..f05e6f459 100644 --- a/Assets/Art/Materials/Props/Rocks/Rocks1Snow.mat +++ b/Assets/Art/Materials/Props/Rocks/Rocks1Snow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Rocks/Rocks2.mat b/Assets/Art/Materials/Props/Rocks/Rocks2.mat index 429008836..7ca57172d 100644 --- a/Assets/Art/Materials/Props/Rocks/Rocks2.mat +++ b/Assets/Art/Materials/Props/Rocks/Rocks2.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7760790404307295101 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Rocks/Rocks2Snow.mat b/Assets/Art/Materials/Props/Rocks/Rocks2Snow.mat index 77dec0c9b..278995828 100644 --- a/Assets/Art/Materials/Props/Rocks/Rocks2Snow.mat +++ b/Assets/Art/Materials/Props/Rocks/Rocks2Snow.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7760790404307295101 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Small_Building/Small_Building.mat b/Assets/Art/Materials/Props/Small_Building/Small_Building.mat index c6b694e4f..72c216d29 100644 --- a/Assets/Art/Materials/Props/Small_Building/Small_Building.mat +++ b/Assets/Art/Materials/Props/Small_Building/Small_Building.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1061357136210380047 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Small_Building/Small_BuildingSnow.mat b/Assets/Art/Materials/Props/Small_Building/Small_BuildingSnow.mat index d5b2b210f..21ba8b72d 100644 --- a/Assets/Art/Materials/Props/Small_Building/Small_BuildingSnow.mat +++ b/Assets/Art/Materials/Props/Small_Building/Small_BuildingSnow.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1061357136210380047 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Star-Finish Line/StarLine2.mat b/Assets/Art/Materials/Props/Star-Finish Line/StarLine2.mat index 86faa2a2e..571bcb5fc 100644 --- a/Assets/Art/Materials/Props/Star-Finish Line/StarLine2.mat +++ b/Assets/Art/Materials/Props/Star-Finish Line/StarLine2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Star-Finish Line/StarLineSnow2.mat b/Assets/Art/Materials/Props/Star-Finish Line/StarLineSnow2.mat index 84863a09e..85e345a2e 100644 --- a/Assets/Art/Materials/Props/Star-Finish Line/StarLineSnow2.mat +++ b/Assets/Art/Materials/Props/Star-Finish Line/StarLineSnow2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Star-Finish Line/StartLine3.mat b/Assets/Art/Materials/Props/Star-Finish Line/StartLine3.mat index 497ca8cc1..e6b5ab44b 100644 --- a/Assets/Art/Materials/Props/Star-Finish Line/StartLine3.mat +++ b/Assets/Art/Materials/Props/Star-Finish Line/StartLine3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Star-Finish Line/StartLineSnow_03.mat b/Assets/Art/Materials/Props/Star-Finish Line/StartLineSnow_03.mat index 1c5f132ac..ddf1272d6 100644 --- a/Assets/Art/Materials/Props/Star-Finish Line/StartLineSnow_03.mat +++ b/Assets/Art/Materials/Props/Star-Finish Line/StartLineSnow_03.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Star-Finish Line/StartLine_01.mat b/Assets/Art/Materials/Props/Star-Finish Line/StartLine_01.mat index 94d89670a..d369316fe 100644 --- a/Assets/Art/Materials/Props/Star-Finish Line/StartLine_01.mat +++ b/Assets/Art/Materials/Props/Star-Finish Line/StartLine_01.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &9097811381639926390 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Star-Finish Line/StartLine_Snow_01.mat b/Assets/Art/Materials/Props/Star-Finish Line/StartLine_Snow_01.mat index 91a24dbb8..072ee1623 100644 --- a/Assets/Art/Materials/Props/Star-Finish Line/StartLine_Snow_01.mat +++ b/Assets/Art/Materials/Props/Star-Finish Line/StartLine_Snow_01.mat @@ -8,21 +8,22 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: StartLine_Snow_01 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 8d7cef03d4c6b794892061857e85fec6, + type: 3} m_Parent: {fileID: 2100000, guid: 7c6595cb6d670354a9c397af18c5fece, type: 2} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: - _METALLICSPECGLOSSMAP - _NORMALMAP - _OCCLUSIONMAP - m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -51,6 +52,7 @@ Material: m_Floats: [] m_Colors: [] m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &9097811381639926390 MonoBehaviour: m_ObjectHideFlags: 11 @@ -63,4 +65,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Trash/Trash.mat b/Assets/Art/Materials/Props/Trash/Trash.mat index 98506e2dc..2504cd94a 100644 --- a/Assets/Art/Materials/Props/Trash/Trash.mat +++ b/Assets/Art/Materials/Props/Trash/Trash.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Trash/TrashGraffitti.mat b/Assets/Art/Materials/Props/Trash/TrashGraffitti.mat index 95083d1ab..8bf1ea005 100644 --- a/Assets/Art/Materials/Props/Trash/TrashGraffitti.mat +++ b/Assets/Art/Materials/Props/Trash/TrashGraffitti.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Trash/TrashSnow.mat b/Assets/Art/Materials/Props/Trash/TrashSnow.mat index 3f3c5254d..bafa74ac1 100644 --- a/Assets/Art/Materials/Props/Trash/TrashSnow.mat +++ b/Assets/Art/Materials/Props/Trash/TrashSnow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Water_Tank/Water_Tank.mat b/Assets/Art/Materials/Props/Water_Tank/Water_Tank.mat index 4cfe823e6..e160ad682 100644 --- a/Assets/Art/Materials/Props/Water_Tank/Water_Tank.mat +++ b/Assets/Art/Materials/Props/Water_Tank/Water_Tank.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Water_Tank/Water_TankSnow.mat b/Assets/Art/Materials/Props/Water_Tank/Water_TankSnow.mat index 7a1bd4760..2117028c9 100644 --- a/Assets/Art/Materials/Props/Water_Tank/Water_TankSnow.mat +++ b/Assets/Art/Materials/Props/Water_Tank/Water_TankSnow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/Windmill/windmill.mat b/Assets/Art/Materials/Props/Windmill/windmill.mat index 71f164293..860c048f6 100644 --- a/Assets/Art/Materials/Props/Windmill/windmill.mat +++ b/Assets/Art/Materials/Props/Windmill/windmill.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6870364108999320020 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/Windmill/windmillSnow.mat b/Assets/Art/Materials/Props/Windmill/windmillSnow.mat index 9f8447413..9d7ffc14d 100644 --- a/Assets/Art/Materials/Props/Windmill/windmillSnow.mat +++ b/Assets/Art/Materials/Props/Windmill/windmillSnow.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6870364108999320020 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/WoodenBoards/Wooden_Boards.mat b/Assets/Art/Materials/Props/WoodenBoards/Wooden_Boards.mat index 4a1b43886..68e684925 100644 --- a/Assets/Art/Materials/Props/WoodenBoards/Wooden_Boards.mat +++ b/Assets/Art/Materials/Props/WoodenBoards/Wooden_Boards.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8719177293677575976 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/WoodenBoards/Wooden_BoardsSnow.mat b/Assets/Art/Materials/Props/WoodenBoards/Wooden_BoardsSnow.mat index 90e78a9fa..1f96d1bdb 100644 --- a/Assets/Art/Materials/Props/WoodenBoards/Wooden_BoardsSnow.mat +++ b/Assets/Art/Materials/Props/WoodenBoards/Wooden_BoardsSnow.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8719177293677575976 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Props/WoodenBox/WoodenBox.mat b/Assets/Art/Materials/Props/WoodenBox/WoodenBox.mat index 2f345aac0..c9ea32f69 100644 --- a/Assets/Art/Materials/Props/WoodenBox/WoodenBox.mat +++ b/Assets/Art/Materials/Props/WoodenBox/WoodenBox.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Props/WoodenBox/WoodenBoxSnow.mat b/Assets/Art/Materials/Props/WoodenBox/WoodenBoxSnow.mat index 876c9d015..8721398ad 100644 --- a/Assets/Art/Materials/Props/WoodenBox/WoodenBoxSnow.mat +++ b/Assets/Art/Materials/Props/WoodenBox/WoodenBoxSnow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Terrain/Lake.mat b/Assets/Art/Materials/Terrain/Lake.mat index 533d77683..bdb080d0c 100644 --- a/Assets/Art/Materials/Terrain/Lake.mat +++ b/Assets/Art/Materials/Terrain/Lake.mat @@ -23,7 +23,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: _BaseColor _BaseMap m_SavedProperties: serializedVersion: 3 @@ -122,6 +123,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2121801241765561445 MonoBehaviour: m_ObjectHideFlags: 11 @@ -134,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Terrain/Snow.mat b/Assets/Art/Materials/Terrain/Snow.mat index c797a1515..fc4dadc83 100644 --- a/Assets/Art/Materials/Terrain/Snow.mat +++ b/Assets/Art/Materials/Terrain/Snow.mat @@ -21,7 +21,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -120,6 +121,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4761953499142219196 MonoBehaviour: m_ObjectHideFlags: 11 @@ -132,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Materials/Track/Decals.mat b/Assets/Art/Materials/Track/Decals.mat index dc8cdd4c5..c5b28d702 100644 --- a/Assets/Art/Materials/Track/Decals.mat +++ b/Assets/Art/Materials/Track/Decals.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -38,6 +38,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -146,3 +147,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Materials/Track/TrackParts.mat b/Assets/Art/Materials/Track/TrackParts.mat index c6b046c42..2f1896db9 100644 --- a/Assets/Art/Materials/Track/TrackParts.mat +++ b/Assets/Art/Materials/Track/TrackParts.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -134,3 +135,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Models/Props/Other/Signs/Informative/InfoSigns1Damaged.mat b/Assets/Art/Models/Props/Other/Signs/Informative/InfoSigns1Damaged.mat index 014342898..a3f1ca228 100644 --- a/Assets/Art/Models/Props/Other/Signs/Informative/InfoSigns1Damaged.mat +++ b/Assets/Art/Models/Props/Other/Signs/Informative/InfoSigns1Damaged.mat @@ -22,7 +22,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -123,6 +124,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2948779521633744891 MonoBehaviour: m_ObjectHideFlags: 11 @@ -135,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Models/Props/Other/Signs/Informative/InfoSigns2Damaged.mat b/Assets/Art/Models/Props/Other/Signs/Informative/InfoSigns2Damaged.mat index 59769c4ae..9c2d6477c 100644 --- a/Assets/Art/Models/Props/Other/Signs/Informative/InfoSigns2Damaged.mat +++ b/Assets/Art/Models/Props/Other/Signs/Informative/InfoSigns2Damaged.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1150034731588338216 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Models/Props/Other/Traffic lights/TrafficLight.mat b/Assets/Art/Models/Props/Other/Traffic lights/TrafficLight.mat index 053b4eded..35a8208c3 100644 --- a/Assets/Art/Models/Props/Other/Traffic lights/TrafficLight.mat +++ b/Assets/Art/Models/Props/Other/Traffic lights/TrafficLight.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,6 +134,7 @@ Material: - _Snow_Direction: {r: 0, g: 1, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2531940908315749606 MonoBehaviour: m_ObjectHideFlags: 11 @@ -145,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 10 diff --git a/Assets/Art/Models/TrackParts/TrackParts_LOD.fbx b/Assets/Art/Models/TrackParts/TrackParts_LOD.fbx new file mode 100644 index 000000000..20e2875e0 --- /dev/null +++ b/Assets/Art/Models/TrackParts/TrackParts_LOD.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9ea82a145510037aa04b2c09eafcafbe53b1d0bd4a21cf754df5da480f6e80c +size 107996 diff --git a/Assets/Art/Models/TrackParts/TrackParts_LOD.fbx.meta b/Assets/Art/Models/TrackParts/TrackParts_LOD.fbx.meta new file mode 100644 index 000000000..07a764793 --- /dev/null +++ b/Assets/Art/Models/TrackParts/TrackParts_LOD.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 7ab4fcdb929679c4d83fb6dec58a3a4b +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 0 + importLights: 0 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 1 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/TrackParts/Track_Slopes.fbx.meta b/Assets/Art/Models/TrackParts/Track_Slopes.fbx.meta index ae723b580..1002f19b5 100644 --- a/Assets/Art/Models/TrackParts/Track_Slopes.fbx.meta +++ b/Assets/Art/Models/TrackParts/Track_Slopes.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 238a8735dcfec094b96ef84fa28db7cb ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +16,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -40,8 +38,9 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 + importPhysicalCameras: 1 + importVisibility: 0 + importBlendShapes: 0 importCameras: 0 importLights: 0 nodeNameCollisionStrategy: 1 @@ -57,6 +56,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 diff --git a/Assets/Art/Models/TrackParts/Track_Slopes_LOD.fbx b/Assets/Art/Models/TrackParts/Track_Slopes_LOD.fbx new file mode 100644 index 000000000..019169924 --- /dev/null +++ b/Assets/Art/Models/TrackParts/Track_Slopes_LOD.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e77a4a773fa817b3c46dcb71f28215e3e036424bc3749427dac09d29bd0c9cb +size 69788 diff --git a/Assets/Art/Models/TrackParts/Track_Slopes_LOD.fbx.meta b/Assets/Art/Models/TrackParts/Track_Slopes_LOD.fbx.meta new file mode 100644 index 000000000..99921333c --- /dev/null +++ b/Assets/Art/Models/TrackParts/Track_Slopes_LOD.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 28661dc173048db4f9068a2cd05ed03f +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.01 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 1 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/UI/ecs-racing-logo.png.meta b/Assets/Art/Textures/UI/ecs-racing-logo.png.meta index 9c630806a..9a59695db 100644 --- a/Assets/Art/Textures/UI/ecs-racing-logo.png.meta +++ b/Assets/Art/Textures/UI/ecs-racing-logo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 291950e14ae83b742a46ff1f04fcb799 +guid: b2df950cf7440634d845a66674069569 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/ExternalSamples/TerrainSampleAssets/Materials/GrassDryStatic.asset b/Assets/ExternalSamples/TerrainSampleAssets/Materials/GrassDryStatic.asset deleted file mode 100644 index ef03f4b18..000000000 --- a/Assets/ExternalSamples/TerrainSampleAssets/Materials/GrassDryStatic.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7350d8b3922bb1ecd98835e4ebe1e6c9c2ac467857fd6be444fa9321b9ac4fa -size 8875 diff --git a/Assets/Fonts/Rajdhani/Rajdhani-Medium SDF.asset b/Assets/Fonts/Rajdhani/Rajdhani-Medium SDF.asset index d97ec5cb9..6801d99cd 100644 --- a/Assets/Fonts/Rajdhani/Rajdhani-Medium SDF.asset +++ b/Assets/Fonts/Rajdhani/Rajdhani-Medium SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8c936597d7a9112567e0b510186379e7636d65940a231f4ae47bc521c81c080 -size 2128160 +oid sha256:55477d266cfdb8b8e3cb9d983c34fb62718ad09ba5536ecbceac900a8afcdfff +size 2129809 diff --git a/Assets/PhysicsMaterials/Floor.asset b/Assets/PhysicsMaterials/Floor.asset index faedd3c2d..4a5c0a889 100644 --- a/Assets/PhysicsMaterials/Floor.asset +++ b/Assets/PhysicsMaterials/Floor.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ff31f409af3d5c2bf277865689a2d1eb17c20b1de1b7cc237e1c7aaa29aacac -size 2467 +oid sha256:d665d39371e9d37b7ac48479bf2477a24d40a4ba8e94e4caea35c1b38c81f5d7 +size 2579 diff --git a/Assets/Playables/CoundownScene.playable b/Assets/Playables/CoundownScene.playable index 89dca6521..4b2cb5778 100644 --- a/Assets/Playables/CoundownScene.playable +++ b/Assets/Playables/CoundownScene.playable @@ -237,7 +237,25 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: [] + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -405,25 +423,7 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -450,25 +450,7 @@ MonoBehaviour: m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -505,6 +487,7 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: CM vcam1 + m_DisplayName: CM_MainCamera m_Markers: m_Objects: [] + TrackPriority: 0 diff --git a/Assets/Prefabs/Cars/CarBase_1.prefab b/Assets/Prefabs/Cars/CarBase_1.prefab deleted file mode 100644 index c44529b85..000000000 --- a/Assets/Prefabs/Cars/CarBase_1.prefab +++ /dev/null @@ -1,746 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &222660266737149873 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8240163966121952017} - - component: {fileID: 34553003942924680} - m_Layer: 0 - m_Name: WheelBR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8240163966121952017 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222660266737149873} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2, y: 0.5, z: -1.84} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &34553003942924680 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222660266737149873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 222660266737149873} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &1391378915075535014 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6726914242566986915} - - component: {fileID: 6444420306762963586} - m_Layer: 0 - m_Name: WheelBL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6726914242566986915 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391378915075535014} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2, y: 0.5, z: -1.84} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6444420306762963586 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391378915075535014} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 1391378915075535014} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &2363726595345242444 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1627766528057584479} - m_Layer: 0 - m_Name: WheelFLMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1627766528057584479 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363726595345242444} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.308521, y: -0.26992196, z: 2.9010015} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2363726596771786674 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1627766526632222113} - m_Layer: 0 - m_Name: WheelBLMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1627766526632222113 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363726596771786674} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.339956, y: -0.2699225, z: -1.8270664} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4648823635157535447 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2279013555023543711} - - component: {fileID: 1857340151946211444} - m_Layer: 0 - m_Name: WheelFL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2279013555023543711 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4648823635157535447} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2, y: 0.5, z: 2.88} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1857340151946211444 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4648823635157535447} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 4648823635157535447} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &5912880066726424877 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4930087389821328995} - - component: {fileID: 1803396975998271085} - m_Layer: 0 - m_Name: WheelFR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4930087389821328995 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5912880066726424877} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2, y: 0.5, z: 2.88} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1803396975998271085 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5912880066726424877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 5912880066726424877} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &6345796830501359008 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7947610071234756531} - m_Layer: 0 - m_Name: WheelBRMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7947610071234756531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6345796830501359008} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2922832, y: -0.26995546, z: -1.8445666} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6345796831964473184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7947610069764167027} - m_Layer: 0 - m_Name: WheelFRMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7947610069764167027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6345796831964473184} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.3237169, y: -0.26995534, z: 2.8835003} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7372339671828996058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5770401983294205385} - - component: {fileID: 1465156100529536466} - m_Layer: 0 - m_Name: CarBody - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5770401983294205385 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372339671828996058} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.31, z: 0.23} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1465156100529536466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372339671828996058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_PrimitiveCenter: - x: 0.00000011920929 - y: 0 - z: 0 - m_PrimitiveSize: - x: 3.152853 - y: 1.3854043 - z: 7.835808 - m_PrimitiveOrientation: - Value: - x: -0 - y: 0 - z: 0 - RotationOrder: 4 - m_Capsule: - Height: 7.835808 - Radius: 1.5764265 - Axis: 2 - m_Cylinder: - Height: 7.835808 - Radius: 1.5764265 - Axis: 2 - m_CylinderSideCount: 20 - m_SphereRadius: 3.917904 - m_MinimumSkinnedVertexWeight: 0.1 - m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.079692736 - m_BevelRadius: 1 - m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} - m_ForceUnique: 0 - m_Material: - m_SupportsTemplate: 1 - m_Template: {fileID: 0} - m_CollisionResponse: - m_Override: 0 - m_Value: 0 - m_Friction: - m_Override: 0 - m_Value: - Value: 0.5 - CombineMode: 0 - m_Restitution: - m_Override: 0 - m_Value: - Value: 0 - CombineMode: 2 - m_BelongsToCategories: - m_Override: 0 - m_Value: - Category00: 0 - Category01: 0 - Category02: 0 - Category03: 0 - Category04: 1 - Category05: 0 - Category06: 0 - Category07: 0 - Category08: 0 - Category09: 0 - Category10: 0 - Category11: 0 - Category12: 0 - Category13: 0 - Category14: 0 - Category15: 0 - Category16: 0 - Category17: 0 - Category18: 0 - Category19: 0 - Category20: 0 - Category21: 0 - Category22: 0 - Category23: 0 - Category24: 0 - Category25: 0 - Category26: 0 - Category27: 0 - Category28: 0 - Category29: 0 - Category30: 0 - Category31: 0 - m_CollidesWithCategories: - m_Override: 0 - m_Value: - Category00: 1 - Category01: 1 - Category02: 1 - Category03: 1 - Category04: 1 - Category05: 1 - Category06: 1 - Category07: 1 - Category08: 1 - Category09: 1 - Category10: 1 - Category11: 1 - Category12: 1 - Category13: 1 - Category14: 1 - Category15: 1 - Category16: 1 - Category17: 1 - Category18: 1 - Category19: 1 - Category20: 1 - Category21: 1 - Category22: 1 - Category23: 1 - Category24: 1 - Category25: 1 - Category26: 1 - Category27: 1 - Category28: 1 - Category29: 1 - Category30: 1 - Category31: 1 - m_CustomMaterialTags: - m_Override: 0 - m_Value: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_SerializedVersion: 1 - m_SerializedVersion: 1 ---- !u!1 &8256455754772310685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8256455754772310686} - - component: {fileID: 6954385003114378794} - - component: {fileID: 5983780889095923815} - - component: {fileID: 2213239345029922602} - - component: {fileID: 251369667244419628} - - component: {fileID: 4371741540628030455} - - component: {fileID: 5563628192999116283} - m_Layer: 0 - m_Name: CarBase_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8256455754772310686 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5770401983294205385} - - {fileID: 4930087389821328995} - - {fileID: 2279013555023543711} - - {fileID: 8240163966121952017} - - {fileID: 6726914242566986915} - - {fileID: 7947610069764167027} - - {fileID: 1627766528057584479} - - {fileID: 7947610071234756531} - - {fileID: 1627766526632222113} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6954385003114378794 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ccea9ea98e38942e0b0938c27ed1903e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_Smoothing: 2 - m_Mass: 1670 - m_LinearDamping: 0.1 - m_AngularDamping: 0.05 - m_InitialLinearVelocity: - x: 0 - y: 0 - z: 0 - m_InitialAngularVelocity: - x: 0 - y: 0 - z: 0 - m_GravityFactor: 1 - m_OverrideDefaultMassDistribution: 1 - m_CenterOfMass: - x: 0 - y: -0.15 - z: 0.085 - m_Orientation: - Value: - x: 0 - y: 0 - z: 0 - RotationOrder: 4 - m_InertiaTensor: - x: 1 - y: 1 - z: 1 - m_WorldIndex: 0 - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5983780889095923815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 547b466801d44ac88c5c05602012313e, type: 3} - m_Name: - m_EditorClassIdentifier: - RestLength: 0.8 - SpringStiffness: 350 - DamperStiffness: 70 - TurnRadius: 11.3 - SteeringForce: 0.8 - SteeringTime: 5 - AntiRollStiffness: 50 - DownForce: 1000 - DriveTorque: 50 - MaxDriveTorque: 80 - DriveTorqueCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: -0.0020103455 - value: 0.5117912 - inSlope: 2.0395489 - outSlope: 2.0395489 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.23736061 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.7486987 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -3.9792871 - outSlope: -3.9792871 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - BodyCollisionMask: 7 - WheelsRadius: 0.6 - WheelsCollisionMask: 7 - Wheels: - - WheelSpring: {fileID: 5912880066726424877} - WheelMesh: {fileID: 6345796831964473184} - Placement: 0 - IsSteering: 1 - GripFactor: 0.8 - - WheelSpring: {fileID: 4648823635157535447} - WheelMesh: {fileID: 2363726595345242444} - Placement: 1 - IsSteering: 1 - GripFactor: 0.8 - - WheelSpring: {fileID: 222660266737149873} - WheelMesh: {fileID: 6345796830501359008} - Placement: 2 - IsSteering: 0 - GripFactor: 0.9 - - WheelSpring: {fileID: 1391378915075535014} - WheelMesh: {fileID: 2363726596771786674} - Placement: 3 - IsSteering: 0 - GripFactor: 0.9 - MinAudioVolume: 0.4 - MaxAudioVolume: 1 ---- !u!114 &2213239345029922602 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5dc2559610af4aceb2b2e4773fca5e02, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &251369667244419628 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e1f90ceec3a048eb949ce28fc78407c5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4371741540628030455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5563628192999116283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} - m_Name: - m_EditorClassIdentifier: - DefaultGhostMode: 2 - SupportedGhostModes: 3 - OptimizationMode: 0 - Importance: 1 - prefabId: 659c673f821729b4c8ff56074147b95c - HasOwner: 1 - SupportAutoCommandTarget: 1 - TrackInterpolationDelay: 1 - GhostGroup: 0 - UsePreSerialization: 0 diff --git a/Assets/Prefabs/Cars/CarBase_2.prefab b/Assets/Prefabs/Cars/CarBase_2.prefab deleted file mode 100644 index 5e1c17a7b..000000000 --- a/Assets/Prefabs/Cars/CarBase_2.prefab +++ /dev/null @@ -1,746 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &222660266737149873 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8240163966121952017} - - component: {fileID: 4734599473917365599} - m_Layer: 0 - m_Name: WheelBR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8240163966121952017 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222660266737149873} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2, y: 0.5, z: -1.52} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4734599473917365599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222660266737149873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 222660266737149873} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &1391378915075535014 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6726914242566986915} - - component: {fileID: 8935098675552489972} - m_Layer: 0 - m_Name: WheelBL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6726914242566986915 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391378915075535014} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2, y: 0.5, z: -1.52} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8935098675552489972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391378915075535014} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 1391378915075535014} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &2363726595345242444 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1627766528057584479} - m_Layer: 0 - m_Name: WheelFLMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1627766528057584479 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363726595345242444} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.3593155, y: -0.12354773, z: 2.906599} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2363726596771786674 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1627766526632222113} - m_Layer: 0 - m_Name: WheelBLMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1627766526632222113 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363726596771786674} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.3593147, y: -0.12354797, z: -1.5701973} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4648823635157535447 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2279013555023543711} - - component: {fileID: 5517965862449606767} - m_Layer: 0 - m_Name: WheelFL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2279013555023543711 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4648823635157535447} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2, y: 0.5, z: 2.89} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5517965862449606767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4648823635157535447} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 4648823635157535447} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &5912880066726424877 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4930087389821328995} - - component: {fileID: 1279817196095679088} - m_Layer: 0 - m_Name: WheelFR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4930087389821328995 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5912880066726424877} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2, y: 0.5, z: 2.89} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1279817196095679088 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5912880066726424877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 5912880066726424877} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &6345796830501359008 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7947610071234756531} - m_Layer: 0 - m_Name: WheelBRMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7947610071234756531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6345796830501359008} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.3593161, y: -0.12354767, z: -1.5701969} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6345796831964473184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7947610069764167027} - m_Layer: 0 - m_Name: WheelFRMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7947610069764167027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6345796831964473184} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.3593153, y: -0.123547435, z: 2.906599} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7372339671828996058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5770401983294205385} - - component: {fileID: 1465156100529536466} - m_Layer: 0 - m_Name: CarBody - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5770401983294205385 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372339671828996058} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.43, z: 0.67} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1465156100529536466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372339671828996058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_PrimitiveCenter: - x: 0.00000011920929 - y: 0 - z: 0 - m_PrimitiveSize: - x: 3.152853 - y: 1.3854043 - z: 7.835808 - m_PrimitiveOrientation: - Value: - x: -0 - y: 0 - z: 0 - RotationOrder: 4 - m_Capsule: - Height: 7.835808 - Radius: 1.5764265 - Axis: 2 - m_Cylinder: - Height: 7.835808 - Radius: 1.5764265 - Axis: 2 - m_CylinderSideCount: 20 - m_SphereRadius: 3.917904 - m_MinimumSkinnedVertexWeight: 0.1 - m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.079692736 - m_BevelRadius: 1.66 - m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} - m_ForceUnique: 0 - m_Material: - m_SupportsTemplate: 1 - m_Template: {fileID: 0} - m_CollisionResponse: - m_Override: 0 - m_Value: 0 - m_Friction: - m_Override: 0 - m_Value: - Value: 0.5 - CombineMode: 0 - m_Restitution: - m_Override: 0 - m_Value: - Value: 0 - CombineMode: 2 - m_BelongsToCategories: - m_Override: 0 - m_Value: - Category00: 0 - Category01: 0 - Category02: 0 - Category03: 0 - Category04: 1 - Category05: 0 - Category06: 0 - Category07: 0 - Category08: 0 - Category09: 0 - Category10: 0 - Category11: 0 - Category12: 0 - Category13: 0 - Category14: 0 - Category15: 0 - Category16: 0 - Category17: 0 - Category18: 0 - Category19: 0 - Category20: 0 - Category21: 0 - Category22: 0 - Category23: 0 - Category24: 0 - Category25: 0 - Category26: 0 - Category27: 0 - Category28: 0 - Category29: 0 - Category30: 0 - Category31: 0 - m_CollidesWithCategories: - m_Override: 0 - m_Value: - Category00: 1 - Category01: 1 - Category02: 1 - Category03: 1 - Category04: 1 - Category05: 1 - Category06: 1 - Category07: 1 - Category08: 1 - Category09: 1 - Category10: 1 - Category11: 1 - Category12: 1 - Category13: 1 - Category14: 1 - Category15: 1 - Category16: 1 - Category17: 1 - Category18: 1 - Category19: 1 - Category20: 1 - Category21: 1 - Category22: 1 - Category23: 1 - Category24: 1 - Category25: 1 - Category26: 1 - Category27: 1 - Category28: 1 - Category29: 1 - Category30: 1 - Category31: 1 - m_CustomMaterialTags: - m_Override: 0 - m_Value: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_SerializedVersion: 1 - m_SerializedVersion: 1 ---- !u!1 &8256455754772310685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8256455754772310686} - - component: {fileID: 6954385003114378794} - - component: {fileID: 5983780889095923815} - - component: {fileID: 2213239345029922602} - - component: {fileID: 4371741540628030455} - - component: {fileID: 251369667244419628} - - component: {fileID: 5563628192999116283} - m_Layer: 0 - m_Name: CarBase_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8256455754772310686 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5770401983294205385} - - {fileID: 4930087389821328995} - - {fileID: 2279013555023543711} - - {fileID: 8240163966121952017} - - {fileID: 6726914242566986915} - - {fileID: 1627766528057584479} - - {fileID: 7947610069764167027} - - {fileID: 1627766526632222113} - - {fileID: 7947610071234756531} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6954385003114378794 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ccea9ea98e38942e0b0938c27ed1903e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_Smoothing: 2 - m_Mass: 1670 - m_LinearDamping: 0.1 - m_AngularDamping: 0.05 - m_InitialLinearVelocity: - x: 0 - y: 0 - z: 0 - m_InitialAngularVelocity: - x: 0 - y: 0 - z: 0 - m_GravityFactor: 1 - m_OverrideDefaultMassDistribution: 1 - m_CenterOfMass: - x: 0 - y: -0.15 - z: 0.085 - m_Orientation: - Value: - x: 0 - y: 0 - z: 0 - RotationOrder: 4 - m_InertiaTensor: - x: 1 - y: 1 - z: 1 - m_WorldIndex: 0 - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5983780889095923815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 547b466801d44ac88c5c05602012313e, type: 3} - m_Name: - m_EditorClassIdentifier: - RestLength: 0.8 - SpringStiffness: 350 - DamperStiffness: 70 - TurnRadius: 11.3 - SteeringForce: 0.8 - SteeringTime: 5 - AntiRollStiffness: 50 - DownForce: 1000 - DriveTorque: 50 - MaxDriveTorque: 80 - DriveTorqueCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: -0.0020103455 - value: 0.5117912 - inSlope: 2.0395489 - outSlope: 2.0395489 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.23736061 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.7486987 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -3.9792871 - outSlope: -3.9792871 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - BodyCollisionMask: 7 - WheelsRadius: 0.6 - WheelsCollisionMask: 7 - Wheels: - - WheelSpring: {fileID: 5912880066726424877} - WheelMesh: {fileID: 6345796831964473184} - Placement: 0 - IsSteering: 1 - GripFactor: 0.8 - - WheelSpring: {fileID: 4648823635157535447} - WheelMesh: {fileID: 2363726595345242444} - Placement: 1 - IsSteering: 1 - GripFactor: 0.8 - - WheelSpring: {fileID: 222660266737149873} - WheelMesh: {fileID: 6345796830501359008} - Placement: 2 - IsSteering: 0 - GripFactor: 0.9 - - WheelSpring: {fileID: 1391378915075535014} - WheelMesh: {fileID: 2363726596771786674} - Placement: 3 - IsSteering: 0 - GripFactor: 0.9 - MinAudioVolume: 0.4 - MaxAudioVolume: 1 ---- !u!114 &2213239345029922602 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5dc2559610af4aceb2b2e4773fca5e02, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4371741540628030455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &251369667244419628 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e1f90ceec3a048eb949ce28fc78407c5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5563628192999116283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} - m_Name: - m_EditorClassIdentifier: - DefaultGhostMode: 2 - SupportedGhostModes: 3 - OptimizationMode: 0 - Importance: 1 - prefabId: a527f25ca0a498743804f7b7f3b19b25 - HasOwner: 1 - SupportAutoCommandTarget: 1 - TrackInterpolationDelay: 1 - GhostGroup: 0 - UsePreSerialization: 0 diff --git a/Assets/Prefabs/Cars/CarBase_3.prefab b/Assets/Prefabs/Cars/CarBase_3.prefab deleted file mode 100644 index eb73d99cc..000000000 --- a/Assets/Prefabs/Cars/CarBase_3.prefab +++ /dev/null @@ -1,746 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &222660266737149873 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8240163966121952017} - - component: {fileID: 3568139545912959445} - m_Layer: 0 - m_Name: WheelBR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8240163966121952017 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222660266737149873} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.3, y: 0.37, z: -2.9} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3568139545912959445 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222660266737149873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 222660266737149873} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &1391378915075535014 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6726914242566986915} - - component: {fileID: 7522981698500617005} - m_Layer: 0 - m_Name: WheelBL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6726914242566986915 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391378915075535014} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.3, y: 0.37, z: -2.9} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7522981698500617005 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391378915075535014} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 1391378915075535014} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &2363726595345242444 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1627766528057584479} - m_Layer: 0 - m_Name: WheelFLMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1627766528057584479 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363726595345242444} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.4195514, y: -0.13824391, z: 2.9563327} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2363726596771786674 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1627766526632222113} - m_Layer: 0 - m_Name: WheelBLMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1627766526632222113 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363726596771786674} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.4195514, y: -0.11983842, z: -3.26} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4648823635157535447 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2279013555023543711} - - component: {fileID: 3871083902084981296} - m_Layer: 0 - m_Name: WheelFL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2279013555023543711 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4648823635157535447} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.3, y: 0.37, z: 2.9} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3871083902084981296 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4648823635157535447} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 4648823635157535447} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &5912880066726424877 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4930087389821328995} - - component: {fileID: 1975575228687105178} - m_Layer: 0 - m_Name: WheelFR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4930087389821328995 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5912880066726424877} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.3, y: 0.37, z: 2.9} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1975575228687105178 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5912880066726424877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 5912880066726424877} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &6345796830501359008 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7947610071234756531} - m_Layer: 0 - m_Name: WheelBRMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7947610071234756531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6345796830501359008} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.524812, y: -0.11983842, z: -3.26} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6345796831964473184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7947610069764167027} - m_Layer: 0 - m_Name: WheelFRMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7947610069764167027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6345796831964473184} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.524812, y: -0.1417498, z: 2.9484444} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7372339671828996058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5770401983294205385} - - component: {fileID: 1465156100529536466} - m_Layer: 0 - m_Name: CarBody - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5770401983294205385 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372339671828996058} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.21565282, z: 0.009450823} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1465156100529536466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372339671828996058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_PrimitiveCenter: - x: 0.00000011920929 - y: 0 - z: 0 - m_PrimitiveSize: - x: 3.152853 - y: 1.3854043 - z: 7.835808 - m_PrimitiveOrientation: - Value: - x: -0 - y: 0 - z: 0 - RotationOrder: 4 - m_Capsule: - Height: 7.835808 - Radius: 1.5764265 - Axis: 2 - m_Cylinder: - Height: 7.835808 - Radius: 1.5764265 - Axis: 2 - m_CylinderSideCount: 20 - m_SphereRadius: 3.917904 - m_MinimumSkinnedVertexWeight: 0.1 - m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.079692736 - m_BevelRadius: 1 - m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} - m_ForceUnique: 0 - m_Material: - m_SupportsTemplate: 1 - m_Template: {fileID: 0} - m_CollisionResponse: - m_Override: 0 - m_Value: 0 - m_Friction: - m_Override: 0 - m_Value: - Value: 0.5 - CombineMode: 0 - m_Restitution: - m_Override: 0 - m_Value: - Value: 0 - CombineMode: 2 - m_BelongsToCategories: - m_Override: 0 - m_Value: - Category00: 0 - Category01: 0 - Category02: 0 - Category03: 0 - Category04: 1 - Category05: 0 - Category06: 0 - Category07: 0 - Category08: 0 - Category09: 0 - Category10: 0 - Category11: 0 - Category12: 0 - Category13: 0 - Category14: 0 - Category15: 0 - Category16: 0 - Category17: 0 - Category18: 0 - Category19: 0 - Category20: 0 - Category21: 0 - Category22: 0 - Category23: 0 - Category24: 0 - Category25: 0 - Category26: 0 - Category27: 0 - Category28: 0 - Category29: 0 - Category30: 0 - Category31: 0 - m_CollidesWithCategories: - m_Override: 0 - m_Value: - Category00: 1 - Category01: 1 - Category02: 1 - Category03: 1 - Category04: 1 - Category05: 1 - Category06: 1 - Category07: 1 - Category08: 1 - Category09: 1 - Category10: 1 - Category11: 1 - Category12: 1 - Category13: 1 - Category14: 1 - Category15: 1 - Category16: 1 - Category17: 1 - Category18: 1 - Category19: 1 - Category20: 1 - Category21: 1 - Category22: 1 - Category23: 1 - Category24: 1 - Category25: 1 - Category26: 1 - Category27: 1 - Category28: 1 - Category29: 1 - Category30: 1 - Category31: 1 - m_CustomMaterialTags: - m_Override: 0 - m_Value: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_SerializedVersion: 1 - m_SerializedVersion: 1 ---- !u!1 &8256455754772310685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8256455754772310686} - - component: {fileID: 6954385003114378794} - - component: {fileID: 5983780889095923815} - - component: {fileID: 2213239345029922602} - - component: {fileID: 4371741540628030455} - - component: {fileID: 251369667244419628} - - component: {fileID: 5563628192999116283} - m_Layer: 0 - m_Name: CarBase_3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8256455754772310686 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5770401983294205385} - - {fileID: 4930087389821328995} - - {fileID: 2279013555023543711} - - {fileID: 8240163966121952017} - - {fileID: 6726914242566986915} - - {fileID: 1627766528057584479} - - {fileID: 7947610069764167027} - - {fileID: 1627766526632222113} - - {fileID: 7947610071234756531} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6954385003114378794 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ccea9ea98e38942e0b0938c27ed1903e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_Smoothing: 2 - m_Mass: 2470 - m_LinearDamping: 0.1 - m_AngularDamping: 0.05 - m_InitialLinearVelocity: - x: 0 - y: 0 - z: 0 - m_InitialAngularVelocity: - x: 0 - y: 0 - z: 0 - m_GravityFactor: 1 - m_OverrideDefaultMassDistribution: 1 - m_CenterOfMass: - x: 0 - y: -0.15 - z: 0.085 - m_Orientation: - Value: - x: 0 - y: 0 - z: 0 - RotationOrder: 4 - m_InertiaTensor: - x: 1 - y: 1 - z: 1 - m_WorldIndex: 0 - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5983780889095923815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 547b466801d44ac88c5c05602012313e, type: 3} - m_Name: - m_EditorClassIdentifier: - RestLength: 0.65 - SpringStiffness: 550 - DamperStiffness: 50 - TurnRadius: 11.3 - SteeringForce: 0.8 - SteeringTime: 5 - AntiRollStiffness: 50 - DownForce: 1000 - DriveTorque: 50 - MaxDriveTorque: 80 - DriveTorqueCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: -0.0020103455 - value: 0.5117912 - inSlope: 2.0395489 - outSlope: 2.0395489 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.23736061 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.7486987 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -3.9792871 - outSlope: -3.9792871 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - BodyCollisionMask: 7 - WheelsRadius: 0.6 - WheelsCollisionMask: 7 - Wheels: - - WheelSpring: {fileID: 5912880066726424877} - WheelMesh: {fileID: 6345796831964473184} - Placement: 0 - IsSteering: 1 - GripFactor: 0.8 - - WheelSpring: {fileID: 4648823635157535447} - WheelMesh: {fileID: 2363726595345242444} - Placement: 1 - IsSteering: 1 - GripFactor: 0.8 - - WheelSpring: {fileID: 222660266737149873} - WheelMesh: {fileID: 6345796830501359008} - Placement: 2 - IsSteering: 0 - GripFactor: 0.9 - - WheelSpring: {fileID: 1391378915075535014} - WheelMesh: {fileID: 2363726596771786674} - Placement: 3 - IsSteering: 0 - GripFactor: 0.9 - MinAudioVolume: 0.4 - MaxAudioVolume: 1 ---- !u!114 &2213239345029922602 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5dc2559610af4aceb2b2e4773fca5e02, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4371741540628030455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &251369667244419628 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e1f90ceec3a048eb949ce28fc78407c5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5563628192999116283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} - m_Name: - m_EditorClassIdentifier: - DefaultGhostMode: 2 - SupportedGhostModes: 3 - OptimizationMode: 0 - Importance: 1 - prefabId: 6d083a803d63a64489cbfb2f44cb4155 - HasOwner: 1 - SupportAutoCommandTarget: 1 - TrackInterpolationDelay: 1 - GhostGroup: 0 - UsePreSerialization: 0 diff --git a/Assets/Prefabs/Cars/CarBase_4.prefab b/Assets/Prefabs/Cars/CarBase_4.prefab deleted file mode 100644 index 9945ac2ef..000000000 --- a/Assets/Prefabs/Cars/CarBase_4.prefab +++ /dev/null @@ -1,746 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &222660266737149873 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8240163966121952017} - - component: {fileID: 380615049634108586} - m_Layer: 0 - m_Name: WheelBR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8240163966121952017 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222660266737149873} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2, y: 0.55, z: -1.579} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &380615049634108586 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222660266737149873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 222660266737149873} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &1391378915075535014 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6726914242566986915} - - component: {fileID: 7954369159795878080} - m_Layer: 0 - m_Name: WheelBL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6726914242566986915 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391378915075535014} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2, y: 0.55, z: -1.579} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7954369159795878080 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391378915075535014} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 1391378915075535014} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &2363726595345242444 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1627766528057584479} - m_Layer: 0 - m_Name: WheelFLMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1627766528057584479 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363726595345242444} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.237991, y: -0.15366906, z: 2.5758169} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2363726596771786674 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1627766526632222113} - m_Layer: 0 - m_Name: WheelBLMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1627766526632222113 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363726596771786674} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.237991, y: -0.15366906, z: -1.5677507} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4648823635157535447 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2279013555023543711} - - component: {fileID: 3163193493954092821} - m_Layer: 0 - m_Name: WheelFL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2279013555023543711 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4648823635157535447} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2, y: 0.55, z: 2.6} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3163193493954092821 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4648823635157535447} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 4648823635157535447} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &5912880066726424877 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4930087389821328995} - - component: {fileID: 4880027921448765514} - m_Layer: 0 - m_Name: WheelFR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4930087389821328995 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5912880066726424877} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2, y: 0.55, z: 2.6} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4880027921448765514 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5912880066726424877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} - m_Name: - m_EditorClassIdentifier: - ComponentOverrides: - - FullTypeName: Unity.Transforms.LocalTransform - GameObject: {fileID: 5912880066726424877} - PrefabType: -1 - SendTypeOptimization: -1 - VariantHash: 6907887384974514810 ---- !u!1 &6345796830501359008 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7947610071234756531} - m_Layer: 0 - m_Name: WheelBRMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7947610071234756531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6345796830501359008} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2379918, y: -0.15366906, z: -1.5677507} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6345796831964473184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7947610069764167027} - m_Layer: 0 - m_Name: WheelFRMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7947610069764167027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6345796831964473184} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2379918, y: -0.15366906, z: 2.5758169} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7372339671828996058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5770401983294205385} - - component: {fileID: 1465156100529536466} - m_Layer: 0 - m_Name: CarBody - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5770401983294205385 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372339671828996058} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.301, z: 0.48} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8256455754772310686} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1465156100529536466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372339671828996058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_PrimitiveCenter: - x: 0.00000011920929 - y: 0 - z: 0 - m_PrimitiveSize: - x: 3.152853 - y: 1.3854043 - z: 6.829214 - m_PrimitiveOrientation: - Value: - x: -0 - y: 0 - z: 0 - RotationOrder: 4 - m_Capsule: - Height: 6.829214 - Radius: 1.5764265 - Axis: 2 - m_Cylinder: - Height: 6.829214 - Radius: 1.5764265 - Axis: 2 - m_CylinderSideCount: 20 - m_SphereRadius: 3.414607 - m_MinimumSkinnedVertexWeight: 0.1 - m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.079692736 - m_BevelRadius: 1 - m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} - m_ForceUnique: 0 - m_Material: - m_SupportsTemplate: 1 - m_Template: {fileID: 0} - m_CollisionResponse: - m_Override: 0 - m_Value: 0 - m_Friction: - m_Override: 0 - m_Value: - Value: 0.5 - CombineMode: 0 - m_Restitution: - m_Override: 0 - m_Value: - Value: 0 - CombineMode: 2 - m_BelongsToCategories: - m_Override: 0 - m_Value: - Category00: 0 - Category01: 0 - Category02: 0 - Category03: 0 - Category04: 1 - Category05: 0 - Category06: 0 - Category07: 0 - Category08: 0 - Category09: 0 - Category10: 0 - Category11: 0 - Category12: 0 - Category13: 0 - Category14: 0 - Category15: 0 - Category16: 0 - Category17: 0 - Category18: 0 - Category19: 0 - Category20: 0 - Category21: 0 - Category22: 0 - Category23: 0 - Category24: 0 - Category25: 0 - Category26: 0 - Category27: 0 - Category28: 0 - Category29: 0 - Category30: 0 - Category31: 0 - m_CollidesWithCategories: - m_Override: 0 - m_Value: - Category00: 1 - Category01: 1 - Category02: 1 - Category03: 1 - Category04: 1 - Category05: 1 - Category06: 1 - Category07: 1 - Category08: 1 - Category09: 1 - Category10: 1 - Category11: 1 - Category12: 1 - Category13: 1 - Category14: 1 - Category15: 1 - Category16: 1 - Category17: 1 - Category18: 1 - Category19: 1 - Category20: 1 - Category21: 1 - Category22: 1 - Category23: 1 - Category24: 1 - Category25: 1 - Category26: 1 - Category27: 1 - Category28: 1 - Category29: 1 - Category30: 1 - Category31: 1 - m_CustomMaterialTags: - m_Override: 0 - m_Value: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_SerializedVersion: 1 - m_SerializedVersion: 1 ---- !u!1 &8256455754772310685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8256455754772310686} - - component: {fileID: 6954385003114378794} - - component: {fileID: 5983780889095923815} - - component: {fileID: 2213239345029922602} - - component: {fileID: 4371741540628030455} - - component: {fileID: 251369667244419628} - - component: {fileID: 5563628192999116283} - m_Layer: 0 - m_Name: CarBase_4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8256455754772310686 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5770401983294205385} - - {fileID: 4930087389821328995} - - {fileID: 2279013555023543711} - - {fileID: 8240163966121952017} - - {fileID: 6726914242566986915} - - {fileID: 1627766528057584479} - - {fileID: 7947610069764167027} - - {fileID: 1627766526632222113} - - {fileID: 7947610071234756531} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6954385003114378794 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ccea9ea98e38942e0b0938c27ed1903e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_Smoothing: 2 - m_Mass: 1670 - m_LinearDamping: 0.1 - m_AngularDamping: 0.05 - m_InitialLinearVelocity: - x: 0 - y: 0 - z: 0 - m_InitialAngularVelocity: - x: 0 - y: 0 - z: 0 - m_GravityFactor: 1 - m_OverrideDefaultMassDistribution: 1 - m_CenterOfMass: - x: 0 - y: -0.15 - z: 0.085 - m_Orientation: - Value: - x: 0 - y: 0 - z: 0 - RotationOrder: 4 - m_InertiaTensor: - x: 1 - y: 1 - z: 1 - m_WorldIndex: 0 - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5983780889095923815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 547b466801d44ac88c5c05602012313e, type: 3} - m_Name: - m_EditorClassIdentifier: - RestLength: 0.8 - SpringStiffness: 350 - DamperStiffness: 70 - TurnRadius: 11.3 - SteeringForce: 0.8 - SteeringTime: 5 - AntiRollStiffness: 50 - DownForce: 1000 - DriveTorque: 50 - MaxDriveTorque: 80 - DriveTorqueCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: -0.0020103455 - value: 0.5117912 - inSlope: 2.0395489 - outSlope: 2.0395489 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.23736061 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.7486987 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -3.9792871 - outSlope: -3.9792871 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - BodyCollisionMask: 7 - WheelsRadius: 0.6 - WheelsCollisionMask: 7 - Wheels: - - WheelSpring: {fileID: 5912880066726424877} - WheelMesh: {fileID: 6345796831964473184} - Placement: 0 - IsSteering: 1 - GripFactor: 0.8 - - WheelSpring: {fileID: 4648823635157535447} - WheelMesh: {fileID: 2363726595345242444} - Placement: 1 - IsSteering: 1 - GripFactor: 0.8 - - WheelSpring: {fileID: 222660266737149873} - WheelMesh: {fileID: 6345796830501359008} - Placement: 2 - IsSteering: 0 - GripFactor: 0.9 - - WheelSpring: {fileID: 1391378915075535014} - WheelMesh: {fileID: 2363726596771786674} - Placement: 3 - IsSteering: 0 - GripFactor: 0.9 - MinAudioVolume: 0.4 - MaxAudioVolume: 1 ---- !u!114 &2213239345029922602 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5dc2559610af4aceb2b2e4773fca5e02, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4371741540628030455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &251369667244419628 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e1f90ceec3a048eb949ce28fc78407c5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5563628192999116283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8256455754772310685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} - m_Name: - m_EditorClassIdentifier: - DefaultGhostMode: 2 - SupportedGhostModes: 3 - OptimizationMode: 0 - Importance: 1 - prefabId: 3cb91d93cb2a78944acdb4267c978aaf - HasOwner: 1 - SupportAutoCommandTarget: 1 - TrackInterpolationDelay: 1 - GhostGroup: 0 - UsePreSerialization: 0 diff --git a/Assets/Prefabs/Cars/CarBase_5v1.prefab b/Assets/Prefabs/Cars/CarBase_5v1.prefab new file mode 100644 index 000000000..7dcfbba59 --- /dev/null +++ b/Assets/Prefabs/Cars/CarBase_5v1.prefab @@ -0,0 +1,1157 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &726215287658417562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3906325865463031399} + - component: {fileID: 4116799409628688291} + - component: {fileID: 5814570046546538441} + m_Layer: 0 + m_Name: Wheel_FR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3906325865463031399 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726215287658417562} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4116799409628688291 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726215287658417562} + m_Mesh: {fileID: -8086809397760034199, guid: a893cc5797dea184c9499aaa456d0d47, type: 3} +--- !u!23 &5814570046546538441 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726215287658417562} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9f654f78cd0d61a4e906ee9ae7c64ed5, type: 2} + - {fileID: 2100000, guid: 67b89b1e5d3d4eb4b985c5cb77680b62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1110764049248788986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7159165096883365333} + - component: {fileID: 6268752058287574940} + - component: {fileID: 29560384143654088} + m_Layer: 6 + m_Name: WheelFL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7159165096883365333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.26, y: -0.27, z: 2.88} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7526277025284346281} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6268752058287574940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1397676075479576648} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &29560384143654088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &1397676075479576648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7526277025284346281} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7526277025284346281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397676075479576648} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1906798881329454554} + m_Father: {fileID: 7159165096883365333} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1942601235650518722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1094679832575602324} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1094679832575602324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942601235650518722} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6926226062882011358} + m_Father: {fileID: 5247612288358509383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2182852637566001242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5247612288358509383} + - component: {fileID: 8682689606743262420} + - component: {fileID: 1472148342509242727} + m_Layer: 6 + m_Name: WheelRL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5247612288358509383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.26, y: -0.26999998, z: -1.84} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1094679832575602324} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8682689606743262420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1942601235650518722} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1472148342509242727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &2471502677899540838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3785063640350620915} + - component: {fileID: 6991348853993897010} + - component: {fileID: 1149245080732129436} + m_Layer: 6 + m_Name: WheelFR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3785063640350620915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.35, y: -0.26999998, z: 2.88} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1569748257410277726} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6991348853993897010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 2509405639672360047} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1149245080732129436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &2509405639672360047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1569748257410277726} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1569748257410277726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509405639672360047} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3906325865463031399} + m_Father: {fileID: 3785063640350620915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3104139954041663668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6926226062882011358} + - component: {fileID: 6614440586461243638} + - component: {fileID: 3482540653705101849} + m_Layer: 0 + m_Name: Wheel_RL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6926226062882011358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3104139954041663668} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1094679832575602324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6614440586461243638 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3104139954041663668} + m_Mesh: {fileID: -7426482797540670978, guid: a893cc5797dea184c9499aaa456d0d47, type: 3} +--- !u!23 &3482540653705101849 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3104139954041663668} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9f654f78cd0d61a4e906ee9ae7c64ed5, type: 2} + - {fileID: 2100000, guid: 67b89b1e5d3d4eb4b985c5cb77680b62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3464341608507538475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3772017102064417494} + - component: {fileID: 1261179451854289208} + - component: {fileID: 8812684640841227688} + m_Layer: 0 + m_Name: Wheel_RR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3772017102064417494 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3464341608507538475} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6647212568088156140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1261179451854289208 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3464341608507538475} + m_Mesh: {fileID: -2356839498367080463, guid: a893cc5797dea184c9499aaa456d0d47, type: 3} +--- !u!23 &8812684640841227688 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3464341608507538475} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9f654f78cd0d61a4e906ee9ae7c64ed5, type: 2} + - {fileID: 2100000, guid: 67b89b1e5d3d4eb4b985c5cb77680b62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3836177050164664280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4974391872023938678} + - component: {fileID: 741135404844445951} + - component: {fileID: 4294593319731521929} + m_Layer: 6 + m_Name: WheelRR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4974391872023938678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.35, y: -0.26999998, z: -1.84} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6647212568088156140} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &741135404844445951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 6415012679083194667} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &4294593319731521929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &3847458398163321791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1906798881329454554} + - component: {fileID: 5291704784449493087} + - component: {fileID: 6196202196082736569} + m_Layer: 0 + m_Name: Wheel_FL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1906798881329454554 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3847458398163321791} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5291704784449493087 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3847458398163321791} + m_Mesh: {fileID: 4757561864315882115, guid: a893cc5797dea184c9499aaa456d0d47, type: 3} +--- !u!23 &6196202196082736569 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3847458398163321791} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9f654f78cd0d61a4e906ee9ae7c64ed5, type: 2} + - {fileID: 2100000, guid: 67b89b1e5d3d4eb4b985c5cb77680b62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5612243847065418617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3904246284547298072} + - component: {fileID: 1620191114145386681} + - component: {fileID: 8159332629581692954} + m_Layer: 6 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3904246284547298072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1620191114145386681 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 64 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3, y: 1.3, z: 8} + m_Center: {x: 0, y: 0.4, z: 0.2} +--- !u!114 &8159332629581692954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996438ad0589e459b83acb42bc5e5b94, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Physics.Hybrid::Unity.Physics.Authoring.DetailedStaticMeshCollisionAuthoring +--- !u!1 &6415012679083194667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6647212568088156140} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6647212568088156140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415012679083194667} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3772017102064417494} + m_Father: {fileID: 4974391872023938678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8825397670790451460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241558961477521384} + - component: {fileID: 2619383203107180763} + - component: {fileID: 4200214256790136178} + - component: {fileID: 1463088054671943377} + - component: {fileID: 7516724550494346556} + - component: {fileID: -2269123043924288995} + - component: {fileID: -3607853263336098241} + - component: {fileID: 8992125931898149654} + m_Layer: 6 + m_Name: CarBase_5v1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7241558961477521384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3904246284547298072} + - {fileID: 7159165096883365333} + - {fileID: 3785063640350620915} + - {fileID: 5247612288358509383} + - {fileID: 4974391872023938678} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2619383203107180763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e91f316ad288f7741be1980b360541af, type: 3} + m_Name: + m_EditorClassIdentifier: + Wheels: + - {fileID: 6268752058287574940} + - {fileID: 6991348853993897010} + - {fileID: 8682689606743262420} + - {fileID: 741135404844445951} + AxlePairedWheels: + - LeftWheel: {fileID: 1110764049248788986} + RightWheel: {fileID: 2471502677899540838} + - LeftWheel: {fileID: 2182852637566001242} + RightWheel: {fileID: 3836177050164664280} + SubstepCount: 12 + Dimensions: + x: 3 + y: 1.3 + z: 8 + DimensionsDebugCenter: + x: 0 + y: 0.4 + z: 0.2 + UseContactFiltering: 1 + ContactSurfaceNormalAngleThreshold: 10 + HardTerrainFeatureAngleThreshold: 60 +--- !u!54 &4200214256790136178 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 5 + m_Mass: 1200 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: -0.5, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1463088054671943377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6a4e498afac0eb429588ead7b2f8c9e, type: 3} + m_Name: + m_EditorClassIdentifier: + EngineMaxRPM: 10000 + EngineIdleRPM: 700 + EngineAngularVelocityCalculation: 1 + EngineMaxTorque: 300 + EngineTorqueCurve: + AnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + SamplesCount: 12 + EngineBrakingIntensity: 0.25 + EngineAngularInertia: 0.5 + EngineStartOnAwake: 1 + EngineStartOnThrottle: 1 + TransmissionIsAutomatic: 1 + TransmissionForwardGearRatios: + - 8 + - 5.5 + - 4 + - 3 + - 2.2 + - 1.7 + TransmissionReverseGearRatios: + - -7 + TransmissionFinalGearRatio: 3 + TransmissionShiftUpRPM: 6000 + TransmissionShiftDownRPM: 2000 + SwapThrottleAndBrakeInReverse: 1 + SteerSpeed: 5 + SteeringSensitivityLowSpeed: 1 + SteeringSensitivityHighSpeed: 0.2 + SteeringSensitivitySpeedReference: 100 + MaxBrakeTorque: 40000 + WheelAngularVelocityLimit: 0 + AeroDragCoefficient: 0 + AeroDragOffset: + x: 0 + y: 0 + z: 0 + AeroDownforceCoefficient: 0 + AeroDownforceOffset: + x: 0 + y: 0 + z: 0 +--- !u!114 &7516724550494346556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e65554d43563b8419cb2aa89aaecfc6, type: 3} + m_Name: + m_EditorClassIdentifier: + MinAudioVolume: 0.4 + MaxAudioVolume: 1 +--- !u!114 &-2269123043924288995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-3607853263336098241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultGhostMode: 2 + SupportedGhostModes: 3 + OptimizationMode: 0 + Importance: 1 + MaxSendRate: 0 + prefabId: 04b1049bd33744a29a37d87c601c3c7c + HasOwner: 1 + SupportAutoCommandTarget: 1 + TrackInterpolationDelay: 1 + GhostGroup: 0 + UsePreSerialization: 0 + UseSingleBaseline: 0 + RollbackPredictedSpawnedGhostState: 0 + RollbackPredictionOnStructuralChanges: 1 +--- !u!114 &8992125931898149654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} + m_Name: + m_EditorClassIdentifier: + ComponentOverrides: [] diff --git a/Assets/Prefabs/Cars/CarBase_2.prefab.meta b/Assets/Prefabs/Cars/CarBase_5v1.prefab.meta similarity index 74% rename from Assets/Prefabs/Cars/CarBase_2.prefab.meta rename to Assets/Prefabs/Cars/CarBase_5v1.prefab.meta index 21794a6d3..def5d4e5c 100644 --- a/Assets/Prefabs/Cars/CarBase_2.prefab.meta +++ b/Assets/Prefabs/Cars/CarBase_5v1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a527f25ca0a498743804f7b7f3b19b25 +guid: 04b1049bd33744a29a37d87c601c3c7c PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Cars/CarBase_5v2.prefab b/Assets/Prefabs/Cars/CarBase_5v2.prefab new file mode 100644 index 000000000..5af5d9a00 --- /dev/null +++ b/Assets/Prefabs/Cars/CarBase_5v2.prefab @@ -0,0 +1,1517 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &726215287658417562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3906325865463031399} + - component: {fileID: 4116799409628688291} + - component: {fileID: 5814570046546538441} + m_Layer: 0 + m_Name: Wheel_FR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3906325865463031399 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726215287658417562} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4116799409628688291 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726215287658417562} + m_Mesh: {fileID: -8086809397760034199, guid: a893cc5797dea184c9499aaa456d0d47, type: 3} +--- !u!23 &5814570046546538441 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726215287658417562} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9f654f78cd0d61a4e906ee9ae7c64ed5, type: 2} + - {fileID: 2100000, guid: 67b89b1e5d3d4eb4b985c5cb77680b62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1110764049248788986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7159165096883365333} + - component: {fileID: 6268752058287574940} + - component: {fileID: 29560384143654088} + m_Layer: 6 + m_Name: WheelFL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7159165096883365333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.26, y: -0.27, z: 2.88} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7526277025284346281} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6268752058287574940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1397676075479576648} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &29560384143654088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &1397676075479576648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7526277025284346281} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7526277025284346281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397676075479576648} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1295421959835926122} + - {fileID: 1906798881329454554} + m_Father: {fileID: 7159165096883365333} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1942601235650518722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1094679832575602324} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1094679832575602324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942601235650518722} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1980342519435133673} + - {fileID: 6926226062882011358} + m_Father: {fileID: 5247612288358509383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2182852637566001242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5247612288358509383} + - component: {fileID: 8682689606743262420} + - component: {fileID: 1472148342509242727} + m_Layer: 6 + m_Name: WheelRL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5247612288358509383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.26, y: -0.26999998, z: -1.84} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1094679832575602324} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8682689606743262420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1942601235650518722} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1472148342509242727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &2471502677899540838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3785063640350620915} + - component: {fileID: 6991348853993897010} + - component: {fileID: 1149245080732129436} + m_Layer: 6 + m_Name: WheelFR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3785063640350620915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.35, y: -0.26999998, z: 2.88} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1569748257410277726} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6991348853993897010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 2509405639672360047} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1149245080732129436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &2509405639672360047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1569748257410277726} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1569748257410277726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509405639672360047} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4540790230810141729} + - {fileID: 3906325865463031399} + m_Father: {fileID: 3785063640350620915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3104139954041663668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6926226062882011358} + - component: {fileID: 6614440586461243638} + - component: {fileID: 3482540653705101849} + m_Layer: 0 + m_Name: Wheel_RL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6926226062882011358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3104139954041663668} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1094679832575602324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6614440586461243638 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3104139954041663668} + m_Mesh: {fileID: -7426482797540670978, guid: a893cc5797dea184c9499aaa456d0d47, type: 3} +--- !u!23 &3482540653705101849 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3104139954041663668} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9f654f78cd0d61a4e906ee9ae7c64ed5, type: 2} + - {fileID: 2100000, guid: 67b89b1e5d3d4eb4b985c5cb77680b62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3464341608507538475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3772017102064417494} + - component: {fileID: 1261179451854289208} + - component: {fileID: 8812684640841227688} + m_Layer: 0 + m_Name: Wheel_RR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3772017102064417494 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3464341608507538475} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6647212568088156140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1261179451854289208 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3464341608507538475} + m_Mesh: {fileID: -2356839498367080463, guid: a893cc5797dea184c9499aaa456d0d47, type: 3} +--- !u!23 &8812684640841227688 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3464341608507538475} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9f654f78cd0d61a4e906ee9ae7c64ed5, type: 2} + - {fileID: 2100000, guid: 67b89b1e5d3d4eb4b985c5cb77680b62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3836177050164664280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4974391872023938678} + - component: {fileID: 741135404844445951} + - component: {fileID: 4294593319731521929} + m_Layer: 6 + m_Name: WheelRR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4974391872023938678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.35, y: -0.26999998, z: -1.84} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6647212568088156140} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &741135404844445951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 6415012679083194667} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &4294593319731521929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &3847458398163321791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1906798881329454554} + - component: {fileID: 5291704784449493087} + - component: {fileID: 6196202196082736569} + m_Layer: 0 + m_Name: Wheel_FL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1906798881329454554 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3847458398163321791} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5291704784449493087 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3847458398163321791} + m_Mesh: {fileID: 4757561864315882115, guid: a893cc5797dea184c9499aaa456d0d47, type: 3} +--- !u!23 &6196202196082736569 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3847458398163321791} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9f654f78cd0d61a4e906ee9ae7c64ed5, type: 2} + - {fileID: 2100000, guid: 67b89b1e5d3d4eb4b985c5cb77680b62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5612243847065418617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3904246284547298072} + - component: {fileID: 1620191114145386681} + - component: {fileID: 1962567710166420878} + m_Layer: 6 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3904246284547298072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1620191114145386681 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 64 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 2.9, y: 1.3, z: 8} + m_Center: {x: 0, y: 0.4, z: 0.2} +--- !u!114 &1962567710166420878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996438ad0589e459b83acb42bc5e5b94, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Physics.Hybrid::Unity.Physics.Authoring.DetailedStaticMeshCollisionAuthoring +--- !u!1 &6415012679083194667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6647212568088156140} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6647212568088156140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415012679083194667} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2089261076678060785} + - {fileID: 3772017102064417494} + m_Father: {fileID: 4974391872023938678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7711619020146365403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4540790230810141729} + - component: {fileID: 6999382074965896605} + - component: {fileID: 3389902543106396683} + m_Layer: 0 + m_Name: Rims_Spikes4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4540790230810141729 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711619020146365403} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.2807169, y: 0.00004464388, z: 0.0035002232} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6999382074965896605 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711619020146365403} + m_Mesh: {fileID: 5326456303463703072, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &3389902543106396683 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711619020146365403} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8673447883684192883 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2089261076678060785} + - component: {fileID: 3787855714744748527} + - component: {fileID: 5260890137474687431} + m_Layer: 0 + m_Name: Rims_Spikes2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2089261076678060785 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8673447883684192883} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.2492832, y: 0.00004452467, z: -0.0045665503} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6647212568088156140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3787855714744748527 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8673447883684192883} + m_Mesh: {fileID: -7425919209920320647, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &5260890137474687431 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8673447883684192883} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8825397670790451460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241558961477521384} + - component: {fileID: 2619383203107180763} + - component: {fileID: 4200214256790136178} + - component: {fileID: 1463088054671943377} + - component: {fileID: 7516724550494346556} + - component: {fileID: -2269123043924288995} + - component: {fileID: -3607853263336098241} + - component: {fileID: 8992125931898149654} + m_Layer: 6 + m_Name: CarBase_5v2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7241558961477521384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3904246284547298072} + - {fileID: 7159165096883365333} + - {fileID: 3785063640350620915} + - {fileID: 5247612288358509383} + - {fileID: 4974391872023938678} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2619383203107180763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e91f316ad288f7741be1980b360541af, type: 3} + m_Name: + m_EditorClassIdentifier: + Wheels: + - {fileID: 6268752058287574940} + - {fileID: 6991348853993897010} + - {fileID: 8682689606743262420} + - {fileID: 741135404844445951} + AxlePairedWheels: + - LeftWheel: {fileID: 1110764049248788986} + RightWheel: {fileID: 2471502677899540838} + - LeftWheel: {fileID: 2182852637566001242} + RightWheel: {fileID: 3836177050164664280} + SubstepCount: 12 + Dimensions: + x: 3 + y: 1.3 + z: 8 + DimensionsDebugCenter: + x: 0 + y: 0.44 + z: 0.2 + UseContactFiltering: 1 + ContactSurfaceNormalAngleThreshold: 10 + HardTerrainFeatureAngleThreshold: 60 +--- !u!54 &4200214256790136178 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 5 + m_Mass: 1200 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: -0.5, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1463088054671943377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6a4e498afac0eb429588ead7b2f8c9e, type: 3} + m_Name: + m_EditorClassIdentifier: + EngineMaxRPM: 10000 + EngineIdleRPM: 700 + EngineAngularVelocityCalculation: 1 + EngineMaxTorque: 300 + EngineTorqueCurve: + AnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + SamplesCount: 12 + EngineBrakingIntensity: 0.25 + EngineAngularInertia: 0.5 + EngineStartOnAwake: 1 + EngineStartOnThrottle: 1 + TransmissionIsAutomatic: 1 + TransmissionForwardGearRatios: + - 8 + - 5.5 + - 4 + - 3 + - 2.2 + - 1.7 + TransmissionReverseGearRatios: + - -7 + TransmissionFinalGearRatio: 3 + TransmissionShiftUpRPM: 6000 + TransmissionShiftDownRPM: 2000 + SwapThrottleAndBrakeInReverse: 1 + SteerSpeed: 5 + SteeringSensitivityLowSpeed: 1 + SteeringSensitivityHighSpeed: 0.2 + SteeringSensitivitySpeedReference: 100 + MaxBrakeTorque: 40000 + WheelAngularVelocityLimit: 0 + AeroDragCoefficient: 0 + AeroDragOffset: + x: 0 + y: 0 + z: 0 + AeroDownforceCoefficient: 0 + AeroDownforceOffset: + x: 0 + y: 0 + z: 0 +--- !u!114 &7516724550494346556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e65554d43563b8419cb2aa89aaecfc6, type: 3} + m_Name: + m_EditorClassIdentifier: + MinAudioVolume: 0.4 + MaxAudioVolume: 1 +--- !u!114 &-2269123043924288995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-3607853263336098241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultGhostMode: 2 + SupportedGhostModes: 3 + OptimizationMode: 0 + Importance: 1 + MaxSendRate: 0 + prefabId: 25aab33864672442fb6ba2f679a69ea5 + HasOwner: 1 + SupportAutoCommandTarget: 1 + TrackInterpolationDelay: 1 + GhostGroup: 0 + UsePreSerialization: 0 + UseSingleBaseline: 0 + RollbackPredictedSpawnedGhostState: 0 + RollbackPredictionOnStructuralChanges: 1 +--- !u!114 &8992125931898149654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} + m_Name: + m_EditorClassIdentifier: + ComponentOverrides: [] +--- !u!1 &8848445703086846267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1295421959835926122} + - component: {fileID: 1432020165644762857} + - component: {fileID: 2833116063095528290} + m_Layer: 0 + m_Name: Rims_Spikes1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1295421959835926122 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848445703086846267} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.348521, y: 0.00007805228, z: 0.021001339} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1432020165644762857 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848445703086846267} + m_Mesh: {fileID: 2007926631757437021, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &2833116063095528290 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848445703086846267} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &9096728395346485464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1980342519435133673} + - component: {fileID: 8838888304610190712} + - component: {fileID: 7107046782383555603} + m_Layer: 0 + m_Name: Rims_Spikes3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1980342519435133673 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096728395346485464} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.3869561, y: 0.00007748604, z: 0.012933612} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1094679832575602324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8838888304610190712 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096728395346485464} + m_Mesh: {fileID: -6346477800343841488, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &7107046782383555603 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096728395346485464} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/Cars/CarBase_4.prefab.meta b/Assets/Prefabs/Cars/CarBase_5v2.prefab.meta similarity index 74% rename from Assets/Prefabs/Cars/CarBase_4.prefab.meta rename to Assets/Prefabs/Cars/CarBase_5v2.prefab.meta index dbc19b628..d41be3065 100644 --- a/Assets/Prefabs/Cars/CarBase_4.prefab.meta +++ b/Assets/Prefabs/Cars/CarBase_5v2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3cb91d93cb2a78944acdb4267c978aaf +guid: 25aab33864672442fb6ba2f679a69ea5 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Cars/CarBase_6v1.prefab b/Assets/Prefabs/Cars/CarBase_6v1.prefab new file mode 100644 index 000000000..0491ccd5e --- /dev/null +++ b/Assets/Prefabs/Cars/CarBase_6v1.prefab @@ -0,0 +1,1333 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1110764049248788986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7159165096883365333} + - component: {fileID: 6268752058287574940} + - component: {fileID: 29560384143654088} + m_Layer: 6 + m_Name: WheelFL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7159165096883365333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.26, y: -0.11800003, z: 2.919} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7526277025284346281} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6268752058287574940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1397676075479576648} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &29560384143654088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &1397676075479576648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7526277025284346281} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7526277025284346281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397676075479576648} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1295421959835926122} + - {fileID: 6083499936673045325} + m_Father: {fileID: 7159165096883365333} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1942601235650518722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1094679832575602324} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1094679832575602324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942601235650518722} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5540695673969735536} + m_Father: {fileID: 5247612288358509383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2182852637566001242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5247612288358509383} + - component: {fileID: 8682689606743262420} + - component: {fileID: 1472148342509242727} + m_Layer: 6 + m_Name: WheelRL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5247612288358509383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.26, y: -0.118, z: -1.563} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1094679832575602324} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8682689606743262420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1942601235650518722} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1472148342509242727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &2471502677899540838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3785063640350620915} + - component: {fileID: 6991348853993897010} + - component: {fileID: 1149245080732129436} + m_Layer: 6 + m_Name: WheelFR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3785063640350620915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.35, y: -0.118, z: 2.919} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1569748257410277726} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6991348853993897010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 2509405639672360047} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1149245080732129436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &2509405639672360047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1569748257410277726} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1569748257410277726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509405639672360047} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4540790230810141729} + - {fileID: 7518599394056225688} + m_Father: {fileID: 3785063640350620915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2635274829445771773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8661152633960831183} + - component: {fileID: 4254363105229466993} + - component: {fileID: 5487619518599885643} + m_Layer: 0 + m_Name: Wheel_RR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8661152633960831183 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635274829445771773} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6647212568088156140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4254363105229466993 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635274829445771773} + m_Mesh: {fileID: -2356839498367080463, guid: 59dc647221f4d084faead9e4de4dc52c, type: 3} +--- !u!23 &5487619518599885643 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635274829445771773} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a24f0efc01a28834e9185f5583972413, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3836177050164664280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4974391872023938678} + - component: {fileID: 741135404844445951} + - component: {fileID: 4294593319731521929} + m_Layer: 6 + m_Name: WheelRR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4974391872023938678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.35, y: -0.118, z: -1.563} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6647212568088156140} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &741135404844445951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 6415012679083194667} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &4294593319731521929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &4750641392648481865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6083499936673045325} + - component: {fileID: 4619128833222064989} + - component: {fileID: 7520850368326753189} + m_Layer: 0 + m_Name: Wheel_FL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6083499936673045325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4750641392648481865} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4619128833222064989 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4750641392648481865} + m_Mesh: {fileID: 4757561864315882115, guid: 59dc647221f4d084faead9e4de4dc52c, type: 3} +--- !u!23 &7520850368326753189 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4750641392648481865} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a24f0efc01a28834e9185f5583972413, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5612243847065418617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3904246284547298072} + - component: {fileID: 1620191114145386681} + - component: {fileID: 5849885052088632998} + m_Layer: 6 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3904246284547298072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1620191114145386681 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 64 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3, y: 1.8, z: 8} + m_Center: {x: 0, y: 0.8, z: 0.3} +--- !u!114 &5849885052088632998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996438ad0589e459b83acb42bc5e5b94, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Physics.Hybrid::Unity.Physics.Authoring.DetailedStaticMeshCollisionAuthoring +--- !u!1 &6415012679083194667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6647212568088156140} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6647212568088156140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415012679083194667} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8661152633960831183} + m_Father: {fileID: 4974391872023938678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7080989319400737165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5540695673969735536} + - component: {fileID: 5211643738000140792} + - component: {fileID: 7774803578513810770} + m_Layer: 0 + m_Name: Wheel_RL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5540695673969735536 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7080989319400737165} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1094679832575602324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5211643738000140792 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7080989319400737165} + m_Mesh: {fileID: -7426482797540670978, guid: 59dc647221f4d084faead9e4de4dc52c, type: 3} +--- !u!23 &7774803578513810770 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7080989319400737165} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a24f0efc01a28834e9185f5583972413, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7711619020146365403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4540790230810141729} + - component: {fileID: 6999382074965896605} + - component: {fileID: 3389902543106396683} + m_Layer: 0 + m_Name: Rims_Spikes4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4540790230810141729 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711619020146365403} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.2807169, y: 0.00004464388, z: 0.0035002232} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6999382074965896605 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711619020146365403} + m_Mesh: {fileID: 5326456303463703072, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &3389902543106396683 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711619020146365403} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8825397670790451460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241558961477521384} + - component: {fileID: 2619383203107180763} + - component: {fileID: 4200214256790136178} + - component: {fileID: 1463088054671943377} + - component: {fileID: 7516724550494346556} + - component: {fileID: -2269123043924288995} + - component: {fileID: -3607853263336098241} + - component: {fileID: 8992125931898149654} + m_Layer: 6 + m_Name: CarBase_6v1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7241558961477521384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3904246284547298072} + - {fileID: 7159165096883365333} + - {fileID: 3785063640350620915} + - {fileID: 5247612288358509383} + - {fileID: 4974391872023938678} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2619383203107180763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e91f316ad288f7741be1980b360541af, type: 3} + m_Name: + m_EditorClassIdentifier: + Wheels: + - {fileID: 6268752058287574940} + - {fileID: 6991348853993897010} + - {fileID: 8682689606743262420} + - {fileID: 741135404844445951} + AxlePairedWheels: + - LeftWheel: {fileID: 1110764049248788986} + RightWheel: {fileID: 2471502677899540838} + - LeftWheel: {fileID: 2182852637566001242} + RightWheel: {fileID: 3836177050164664280} + SubstepCount: 12 + Dimensions: + x: 3 + y: 1.8 + z: 8 + DimensionsDebugCenter: + x: 0 + y: 0.8 + z: 0.3 + UseContactFiltering: 1 + ContactSurfaceNormalAngleThreshold: 10 + HardTerrainFeatureAngleThreshold: 60 +--- !u!54 &4200214256790136178 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 5 + m_Mass: 1200 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: -0.5, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1463088054671943377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6a4e498afac0eb429588ead7b2f8c9e, type: 3} + m_Name: + m_EditorClassIdentifier: + EngineMaxRPM: 10000 + EngineIdleRPM: 700 + EngineAngularVelocityCalculation: 1 + EngineMaxTorque: 300 + EngineTorqueCurve: + AnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + SamplesCount: 12 + EngineBrakingIntensity: 0.25 + EngineAngularInertia: 0.5 + EngineStartOnAwake: 1 + EngineStartOnThrottle: 1 + TransmissionIsAutomatic: 1 + TransmissionForwardGearRatios: + - 8 + - 5.5 + - 4 + - 3 + - 2.2 + - 1.7 + TransmissionReverseGearRatios: + - -7 + TransmissionFinalGearRatio: 3 + TransmissionShiftUpRPM: 6000 + TransmissionShiftDownRPM: 2000 + SwapThrottleAndBrakeInReverse: 1 + SteerSpeed: 5 + SteeringSensitivityLowSpeed: 1 + SteeringSensitivityHighSpeed: 0.2 + SteeringSensitivitySpeedReference: 100 + MaxBrakeTorque: 40000 + WheelAngularVelocityLimit: 0 + AeroDragCoefficient: 0 + AeroDragOffset: + x: 0 + y: 0 + z: 0 + AeroDownforceCoefficient: 0 + AeroDownforceOffset: + x: 0 + y: 0 + z: 0 +--- !u!114 &7516724550494346556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e65554d43563b8419cb2aa89aaecfc6, type: 3} + m_Name: + m_EditorClassIdentifier: + MinAudioVolume: 0.4 + MaxAudioVolume: 1 +--- !u!114 &-2269123043924288995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-3607853263336098241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultGhostMode: 2 + SupportedGhostModes: 3 + OptimizationMode: 0 + Importance: 1 + MaxSendRate: 0 + prefabId: 59472719e207a4712b0da85692d0c4c0 + HasOwner: 1 + SupportAutoCommandTarget: 1 + TrackInterpolationDelay: 1 + GhostGroup: 0 + UsePreSerialization: 0 + UseSingleBaseline: 0 + RollbackPredictedSpawnedGhostState: 0 + RollbackPredictionOnStructuralChanges: 1 +--- !u!114 &8992125931898149654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} + m_Name: + m_EditorClassIdentifier: + ComponentOverrides: [] +--- !u!1 &8848445703086846267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1295421959835926122} + - component: {fileID: 1432020165644762857} + - component: {fileID: 2833116063095528290} + m_Layer: 0 + m_Name: Rims_Spikes1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1295421959835926122 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848445703086846267} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.348521, y: 0.00007805228, z: 0.021001339} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1432020165644762857 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848445703086846267} + m_Mesh: {fileID: 2007926631757437021, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &2833116063095528290 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848445703086846267} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &9175300412304599053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7518599394056225688} + - component: {fileID: 2128918625604442825} + - component: {fileID: 3543010387405235218} + m_Layer: 0 + m_Name: Wheel_FR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7518599394056225688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9175300412304599053} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2128918625604442825 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9175300412304599053} + m_Mesh: {fileID: -8086809397760034199, guid: 59dc647221f4d084faead9e4de4dc52c, type: 3} +--- !u!23 &3543010387405235218 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9175300412304599053} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a24f0efc01a28834e9185f5583972413, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/Cars/CarBase_3.prefab.meta b/Assets/Prefabs/Cars/CarBase_6v1.prefab.meta similarity index 74% rename from Assets/Prefabs/Cars/CarBase_3.prefab.meta rename to Assets/Prefabs/Cars/CarBase_6v1.prefab.meta index 5e3627cf5..f7b5de3eb 100644 --- a/Assets/Prefabs/Cars/CarBase_3.prefab.meta +++ b/Assets/Prefabs/Cars/CarBase_6v1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6d083a803d63a64489cbfb2f44cb4155 +guid: 59472719e207a4712b0da85692d0c4c0 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Cars/CarBase_6v2.prefab b/Assets/Prefabs/Cars/CarBase_6v2.prefab new file mode 100644 index 000000000..f0c9a2eef --- /dev/null +++ b/Assets/Prefabs/Cars/CarBase_6v2.prefab @@ -0,0 +1,1153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1110764049248788986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7159165096883365333} + - component: {fileID: 6268752058287574940} + - component: {fileID: 29560384143654088} + m_Layer: 6 + m_Name: WheelFL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7159165096883365333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.26, y: -0.11800003, z: 2.919} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7526277025284346281} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6268752058287574940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1397676075479576648} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &29560384143654088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &1397676075479576648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7526277025284346281} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7526277025284346281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397676075479576648} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6083499936673045325} + m_Father: {fileID: 7159165096883365333} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1942601235650518722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1094679832575602324} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1094679832575602324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942601235650518722} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5540695673969735536} + m_Father: {fileID: 5247612288358509383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2182852637566001242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5247612288358509383} + - component: {fileID: 8682689606743262420} + - component: {fileID: 1472148342509242727} + m_Layer: 6 + m_Name: WheelRL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5247612288358509383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.26, y: -0.118, z: -1.563} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1094679832575602324} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8682689606743262420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1942601235650518722} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1472148342509242727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &2471502677899540838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3785063640350620915} + - component: {fileID: 6991348853993897010} + - component: {fileID: 1149245080732129436} + m_Layer: 6 + m_Name: WheelFR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3785063640350620915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.35, y: -0.118, z: 2.919} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1569748257410277726} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6991348853993897010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 2509405639672360047} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1149245080732129436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &2509405639672360047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1569748257410277726} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1569748257410277726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509405639672360047} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7518599394056225688} + m_Father: {fileID: 3785063640350620915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2635274829445771773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8661152633960831183} + - component: {fileID: 4254363105229466993} + - component: {fileID: 5487619518599885643} + m_Layer: 0 + m_Name: Wheel_RR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8661152633960831183 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635274829445771773} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6647212568088156140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4254363105229466993 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635274829445771773} + m_Mesh: {fileID: -2356839498367080463, guid: 59dc647221f4d084faead9e4de4dc52c, type: 3} +--- !u!23 &5487619518599885643 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635274829445771773} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a24f0efc01a28834e9185f5583972413, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3836177050164664280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4974391872023938678} + - component: {fileID: 741135404844445951} + - component: {fileID: 4294593319731521929} + m_Layer: 6 + m_Name: WheelRR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4974391872023938678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.35, y: -0.118, z: -1.563} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6647212568088156140} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &741135404844445951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 6415012679083194667} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &4294593319731521929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &4750641392648481865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6083499936673045325} + - component: {fileID: 4619128833222064989} + - component: {fileID: 7520850368326753189} + m_Layer: 0 + m_Name: Wheel_FL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6083499936673045325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4750641392648481865} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4619128833222064989 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4750641392648481865} + m_Mesh: {fileID: 4757561864315882115, guid: 59dc647221f4d084faead9e4de4dc52c, type: 3} +--- !u!23 &7520850368326753189 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4750641392648481865} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a24f0efc01a28834e9185f5583972413, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5612243847065418617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3904246284547298072} + - component: {fileID: 1620191114145386681} + - component: {fileID: 8622010067497241983} + m_Layer: 6 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3904246284547298072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1620191114145386681 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 64 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3, y: 1.8, z: 8} + m_Center: {x: 0, y: 0.8, z: 0.3} +--- !u!114 &8622010067497241983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996438ad0589e459b83acb42bc5e5b94, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Physics.Hybrid::Unity.Physics.Authoring.DetailedStaticMeshCollisionAuthoring +--- !u!1 &6415012679083194667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6647212568088156140} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6647212568088156140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415012679083194667} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8661152633960831183} + m_Father: {fileID: 4974391872023938678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7080989319400737165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5540695673969735536} + - component: {fileID: 5211643738000140792} + - component: {fileID: 7774803578513810770} + m_Layer: 0 + m_Name: Wheel_RL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5540695673969735536 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7080989319400737165} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1094679832575602324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5211643738000140792 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7080989319400737165} + m_Mesh: {fileID: -7426482797540670978, guid: 59dc647221f4d084faead9e4de4dc52c, type: 3} +--- !u!23 &7774803578513810770 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7080989319400737165} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a24f0efc01a28834e9185f5583972413, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8825397670790451460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241558961477521384} + - component: {fileID: 2619383203107180763} + - component: {fileID: 4200214256790136178} + - component: {fileID: 1463088054671943377} + - component: {fileID: 7516724550494346556} + - component: {fileID: -2269123043924288995} + - component: {fileID: -3607853263336098241} + - component: {fileID: 8992125931898149654} + m_Layer: 6 + m_Name: CarBase_6v2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7241558961477521384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3904246284547298072} + - {fileID: 7159165096883365333} + - {fileID: 3785063640350620915} + - {fileID: 5247612288358509383} + - {fileID: 4974391872023938678} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2619383203107180763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e91f316ad288f7741be1980b360541af, type: 3} + m_Name: + m_EditorClassIdentifier: + Wheels: + - {fileID: 6268752058287574940} + - {fileID: 6991348853993897010} + - {fileID: 8682689606743262420} + - {fileID: 741135404844445951} + AxlePairedWheels: + - LeftWheel: {fileID: 1110764049248788986} + RightWheel: {fileID: 2471502677899540838} + - LeftWheel: {fileID: 2182852637566001242} + RightWheel: {fileID: 3836177050164664280} + SubstepCount: 12 + Dimensions: + x: 3 + y: 1.8 + z: 8 + DimensionsDebugCenter: + x: 0 + y: 0.8 + z: 0.3 + UseContactFiltering: 1 + ContactSurfaceNormalAngleThreshold: 10 + HardTerrainFeatureAngleThreshold: 60 +--- !u!54 &4200214256790136178 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 5 + m_Mass: 1200 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: -0.5, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1463088054671943377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6a4e498afac0eb429588ead7b2f8c9e, type: 3} + m_Name: + m_EditorClassIdentifier: + EngineMaxRPM: 10000 + EngineIdleRPM: 700 + EngineAngularVelocityCalculation: 1 + EngineMaxTorque: 300 + EngineTorqueCurve: + AnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + SamplesCount: 12 + EngineBrakingIntensity: 0.25 + EngineAngularInertia: 0.5 + EngineStartOnAwake: 1 + EngineStartOnThrottle: 1 + TransmissionIsAutomatic: 1 + TransmissionForwardGearRatios: + - 8 + - 5.5 + - 4 + - 3 + - 2.2 + - 1.7 + TransmissionReverseGearRatios: + - -7 + TransmissionFinalGearRatio: 3 + TransmissionShiftUpRPM: 6000 + TransmissionShiftDownRPM: 2000 + SwapThrottleAndBrakeInReverse: 1 + SteerSpeed: 5 + SteeringSensitivityLowSpeed: 1 + SteeringSensitivityHighSpeed: 0.2 + SteeringSensitivitySpeedReference: 100 + MaxBrakeTorque: 40000 + WheelAngularVelocityLimit: 0 + AeroDragCoefficient: 0 + AeroDragOffset: + x: 0 + y: 0 + z: 0 + AeroDownforceCoefficient: 0 + AeroDownforceOffset: + x: 0 + y: 0 + z: 0 +--- !u!114 &7516724550494346556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e65554d43563b8419cb2aa89aaecfc6, type: 3} + m_Name: + m_EditorClassIdentifier: + MinAudioVolume: 0.4 + MaxAudioVolume: 1 +--- !u!114 &-2269123043924288995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-3607853263336098241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultGhostMode: 2 + SupportedGhostModes: 3 + OptimizationMode: 0 + Importance: 1 + MaxSendRate: 0 + prefabId: 3895fb58394414861a7ab2c9a056c9c9 + HasOwner: 1 + SupportAutoCommandTarget: 1 + TrackInterpolationDelay: 1 + GhostGroup: 0 + UsePreSerialization: 0 + UseSingleBaseline: 0 + RollbackPredictedSpawnedGhostState: 0 + RollbackPredictionOnStructuralChanges: 1 +--- !u!114 &8992125931898149654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} + m_Name: + m_EditorClassIdentifier: + ComponentOverrides: [] +--- !u!1 &9175300412304599053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7518599394056225688} + - component: {fileID: 2128918625604442825} + - component: {fileID: 3543010387405235218} + m_Layer: 0 + m_Name: Wheel_FR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7518599394056225688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9175300412304599053} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2128918625604442825 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9175300412304599053} + m_Mesh: {fileID: -8086809397760034199, guid: 59dc647221f4d084faead9e4de4dc52c, type: 3} +--- !u!23 &3543010387405235218 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9175300412304599053} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a24f0efc01a28834e9185f5583972413, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/Cars/CarBase_1.prefab.meta b/Assets/Prefabs/Cars/CarBase_6v2.prefab.meta similarity index 74% rename from Assets/Prefabs/Cars/CarBase_1.prefab.meta rename to Assets/Prefabs/Cars/CarBase_6v2.prefab.meta index d876668a5..dd3afdbff 100644 --- a/Assets/Prefabs/Cars/CarBase_1.prefab.meta +++ b/Assets/Prefabs/Cars/CarBase_6v2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 659c673f821729b4c8ff56074147b95c +guid: 3895fb58394414861a7ab2c9a056c9c9 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Cars/CarBase_7v1.prefab b/Assets/Prefabs/Cars/CarBase_7v1.prefab new file mode 100644 index 000000000..6d59c7a37 --- /dev/null +++ b/Assets/Prefabs/Cars/CarBase_7v1.prefab @@ -0,0 +1,1517 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &983350610724331152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 554451084403372500} + - component: {fileID: 8841839654158860297} + - component: {fileID: 5354926630525461033} + m_Layer: 0 + m_Name: Rims_Spikes3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &554451084403372500 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983350610724331152} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.32914686, y: -0.013563395, z: 0.025164843} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1094679832575602324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8841839654158860297 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983350610724331152} + m_Mesh: {fileID: -6346477800343841488, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &5354926630525461033 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983350610724331152} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1110764049248788986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7159165096883365333} + - component: {fileID: 6268752058287574940} + - component: {fileID: 29560384143654088} + m_Layer: 6 + m_Name: WheelFL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7159165096883365333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.4, y: -0.14000003, z: 2.95} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7526277025284346281} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6268752058287574940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1397676075479576648} + Radius: 0.7 + Width: 0.4 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &29560384143654088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &1338585618011616592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5249546851059245768} + - component: {fileID: 4022267309178534033} + - component: {fileID: 1340710080162391631} + m_Layer: 0 + m_Name: Rims_Spikes2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5249546851059245768 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338585618011616592} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.30513775, y: -0.013563402, z: 0.025164366} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6647212568088156140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4022267309178534033 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338585618011616592} + m_Mesh: {fileID: -7425919209920320647, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &1340710080162391631 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338585618011616592} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1397676075479576648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7526277025284346281} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7526277025284346281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397676075479576648} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3336317022207960409} + - {fileID: 4322266350528413429} + m_Father: {fileID: 7159165096883365333} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1549065436411203302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6798173222495185959} + - component: {fileID: 9143035083235189747} + - component: {fileID: 47501785309581945} + m_Layer: 0 + m_Name: Wheel_FR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6798173222495185959 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549065436411203302} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.004812002, y: -0.0017497987, z: -0.0015556812} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &9143035083235189747 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549065436411203302} + m_Mesh: {fileID: -8086809397760034199, guid: f9cd0f5360fcb0e4597d5e7fd8aa4cd5, type: 3} +--- !u!23 &47501785309581945 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549065436411203302} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9829febaecab7be4b917370746769c2b, type: 2} + - {fileID: 2100000, guid: d577fdaf51ea73e42be676ef697b7fcb, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1942601235650518722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1094679832575602324} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1094679832575602324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942601235650518722} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 554451084403372500} + - {fileID: 6439333275549473895} + m_Father: {fileID: 5247612288358509383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2182852637566001242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5247612288358509383} + - component: {fileID: 8682689606743262420} + - component: {fileID: 1472148342509242727} + m_Layer: 6 + m_Name: WheelRL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5247612288358509383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.4, y: -0.120000005, z: -2.89} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1094679832575602324} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8682689606743262420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1942601235650518722} + Radius: 0.7 + Width: 0.4 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1472148342509242727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &2471502677899540838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3785063640350620915} + - component: {fileID: 6991348853993897010} + - component: {fileID: 1149245080732129436} + m_Layer: 6 + m_Name: WheelFR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3785063640350620915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.52, y: -0.14, z: 2.95} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1569748257410277726} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6991348853993897010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 2509405639672360047} + Radius: 0.7 + Width: 0.4 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1149245080732129436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &2509405639672360047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1569748257410277726} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1569748257410277726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509405639672360047} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2724039765797795238} + - {fileID: 6798173222495185959} + m_Father: {fileID: 3785063640350620915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3273626043144379812 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3336317022207960409} + - component: {fileID: 7635290338110495548} + - component: {fileID: 2439857363211011479} + m_Layer: 0 + m_Name: Rims_Spikes1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3336317022207960409 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3273626043144379812} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.32914686, y: 0.006436631, z: 0.0063722134} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7635290338110495548 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3273626043144379812} + m_Mesh: {fileID: 2007926631757437021, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &2439857363211011479 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3273626043144379812} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3836177050164664280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4974391872023938678} + - component: {fileID: 741135404844445951} + - component: {fileID: 4294593319731521929} + m_Layer: 6 + m_Name: WheelRR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4974391872023938678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.52, y: -0.12, z: -2.89} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6647212568088156140} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &741135404844445951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 6415012679083194667} + Radius: 0.7 + Width: 0.4 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &4294593319731521929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &4965052708276806652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1827326559373029498} + - component: {fileID: 234504633015735023} + - component: {fileID: 7148766184624438212} + m_Layer: 0 + m_Name: Wheel_RR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1827326559373029498 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965052708276806652} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.004812002, y: 0.00016158074, z: -0.0060400963} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6647212568088156140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &234504633015735023 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965052708276806652} + m_Mesh: {fileID: -2356839498367080463, guid: f9cd0f5360fcb0e4597d5e7fd8aa4cd5, type: 3} +--- !u!23 &7148766184624438212 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965052708276806652} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d577fdaf51ea73e42be676ef697b7fcb, type: 2} + - {fileID: 2100000, guid: 9829febaecab7be4b917370746769c2b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5612243847065418617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3904246284547298072} + - component: {fileID: 1620191114145386681} + - component: {fileID: 5503132356384964782} + m_Layer: 6 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3904246284547298072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1620191114145386681 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 64 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3.8, y: 2, z: 9} + m_Center: {x: 0, y: 1, z: -0.34} +--- !u!114 &5503132356384964782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996438ad0589e459b83acb42bc5e5b94, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Physics.Hybrid::Unity.Physics.Authoring.DetailedStaticMeshCollisionAuthoring +--- !u!1 &6052316674218542473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6439333275549473895} + - component: {fileID: 2128513563521000954} + - component: {fileID: 3815183091593411475} + m_Layer: 0 + m_Name: Wheel_RL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6439333275549473895 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052316674218542473} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.019551396, y: 0.00016158819, z: -0.0060400963} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1094679832575602324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2128513563521000954 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052316674218542473} + m_Mesh: {fileID: -7426482797540670978, guid: f9cd0f5360fcb0e4597d5e7fd8aa4cd5, type: 3} +--- !u!23 &3815183091593411475 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052316674218542473} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d577fdaf51ea73e42be676ef697b7fcb, type: 2} + - {fileID: 2100000, guid: 9829febaecab7be4b917370746769c2b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6139661186577670527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2724039765797795238} + - component: {fileID: 8395297150357273969} + - component: {fileID: 7366960223961623918} + m_Layer: 0 + m_Name: Rims_Spikes4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2724039765797795238 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139661186577670527} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.30513775, y: 0.0064366013, z: 0.0063722134} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8395297150357273969 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139661186577670527} + m_Mesh: {fileID: 5326456303463703072, guid: 52f2ab697523c524cba1e6e36fa5c554, type: 3} +--- !u!23 &7366960223961623918 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139661186577670527} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d4e0d92e52500d349942711660c102a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6415012679083194667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6647212568088156140} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6647212568088156140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415012679083194667} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5249546851059245768} + - {fileID: 1827326559373029498} + m_Father: {fileID: 4974391872023938678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8825397670790451460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241558961477521384} + - component: {fileID: 2619383203107180763} + - component: {fileID: 4200214256790136178} + - component: {fileID: 1463088054671943377} + - component: {fileID: 7516724550494346556} + - component: {fileID: -2269123043924288995} + - component: {fileID: -3607853263336098241} + - component: {fileID: 8992125931898149654} + m_Layer: 6 + m_Name: CarBase_7v1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7241558961477521384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3904246284547298072} + - {fileID: 7159165096883365333} + - {fileID: 3785063640350620915} + - {fileID: 5247612288358509383} + - {fileID: 4974391872023938678} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2619383203107180763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e91f316ad288f7741be1980b360541af, type: 3} + m_Name: + m_EditorClassIdentifier: + Wheels: + - {fileID: 6268752058287574940} + - {fileID: 6991348853993897010} + - {fileID: 8682689606743262420} + - {fileID: 741135404844445951} + AxlePairedWheels: + - LeftWheel: {fileID: 1110764049248788986} + RightWheel: {fileID: 2471502677899540838} + - LeftWheel: {fileID: 2182852637566001242} + RightWheel: {fileID: 3836177050164664280} + SubstepCount: 12 + Dimensions: + x: 3.8 + y: 2 + z: 9 + DimensionsDebugCenter: + x: 0 + y: 1 + z: -0.3 + UseContactFiltering: 1 + ContactSurfaceNormalAngleThreshold: 10 + HardTerrainFeatureAngleThreshold: 60 +--- !u!54 &4200214256790136178 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 5 + m_Mass: 1200 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: -0.5, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1463088054671943377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6a4e498afac0eb429588ead7b2f8c9e, type: 3} + m_Name: + m_EditorClassIdentifier: + EngineMaxRPM: 10000 + EngineIdleRPM: 700 + EngineAngularVelocityCalculation: 1 + EngineMaxTorque: 300 + EngineTorqueCurve: + AnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + SamplesCount: 12 + EngineBrakingIntensity: 0.25 + EngineAngularInertia: 0.5 + EngineStartOnAwake: 1 + EngineStartOnThrottle: 1 + TransmissionIsAutomatic: 1 + TransmissionForwardGearRatios: + - 8 + - 5.5 + - 4 + - 3 + - 2.2 + - 1.7 + TransmissionReverseGearRatios: + - -7 + TransmissionFinalGearRatio: 3 + TransmissionShiftUpRPM: 6000 + TransmissionShiftDownRPM: 2000 + SwapThrottleAndBrakeInReverse: 1 + SteerSpeed: 5 + SteeringSensitivityLowSpeed: 1 + SteeringSensitivityHighSpeed: 0.2 + SteeringSensitivitySpeedReference: 100 + MaxBrakeTorque: 40000 + WheelAngularVelocityLimit: 0 + AeroDragCoefficient: 0 + AeroDragOffset: + x: 0 + y: 0 + z: 0 + AeroDownforceCoefficient: 0 + AeroDownforceOffset: + x: 0 + y: 0 + z: 0 +--- !u!114 &7516724550494346556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e65554d43563b8419cb2aa89aaecfc6, type: 3} + m_Name: + m_EditorClassIdentifier: + MinAudioVolume: 0.4 + MaxAudioVolume: 1 +--- !u!114 &-2269123043924288995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-3607853263336098241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultGhostMode: 2 + SupportedGhostModes: 3 + OptimizationMode: 0 + Importance: 1 + MaxSendRate: 0 + prefabId: ceab67b8af69c4948ab998f44c8aaa34 + HasOwner: 1 + SupportAutoCommandTarget: 1 + TrackInterpolationDelay: 1 + GhostGroup: 0 + UsePreSerialization: 0 + UseSingleBaseline: 0 + RollbackPredictedSpawnedGhostState: 0 + RollbackPredictionOnStructuralChanges: 1 +--- !u!114 &8992125931898149654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} + m_Name: + m_EditorClassIdentifier: + ComponentOverrides: [] +--- !u!1 &9077941728711803896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4322266350528413429} + - component: {fileID: 5196516815742560698} + - component: {fileID: 1297379813470901682} + m_Layer: 0 + m_Name: Wheel_FL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4322266350528413429 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9077941728711803896} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.019551396, y: 0.0017561167, z: 0.006332636} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5196516815742560698 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9077941728711803896} + m_Mesh: {fileID: 4757561864315882115, guid: f9cd0f5360fcb0e4597d5e7fd8aa4cd5, type: 3} +--- !u!23 &1297379813470901682 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9077941728711803896} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9829febaecab7be4b917370746769c2b, type: 2} + - {fileID: 2100000, guid: d577fdaf51ea73e42be676ef697b7fcb, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/Cars/CarBase_7v1.prefab.meta b/Assets/Prefabs/Cars/CarBase_7v1.prefab.meta new file mode 100644 index 000000000..70a4c49e9 --- /dev/null +++ b/Assets/Prefabs/Cars/CarBase_7v1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ceab67b8af69c4948ab998f44c8aaa34 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Cars/CarBase_8v1.prefab b/Assets/Prefabs/Cars/CarBase_8v1.prefab new file mode 100644 index 000000000..4aaa76b33 --- /dev/null +++ b/Assets/Prefabs/Cars/CarBase_8v1.prefab @@ -0,0 +1,1153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &764771839918359961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5381753342331092628} + - component: {fileID: 5479353308003349592} + - component: {fileID: 3917092458197882967} + m_Layer: 0 + m_Name: Wheel_RL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5381753342331092628 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764771839918359961} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.04799092, y: -0.037669085, z: -0.015750527} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1094679832575602324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5479353308003349592 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764771839918359961} + m_Mesh: {fileID: -7426482797540670978, guid: 7247c1657c63455418041e37afcff94b, type: 3} +--- !u!23 &3917092458197882967 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764771839918359961} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 677ccd23209de534d9eda6a663dfecc0, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1110764049248788986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7159165096883365333} + - component: {fileID: 6268752058287574940} + - component: {fileID: 29560384143654088} + m_Layer: 6 + m_Name: WheelFL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7159165096883365333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.19, y: -0.12, z: 2.58} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7526277025284346281} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6268752058287574940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1397676075479576648} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &29560384143654088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110764049248788986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &1397676075479576648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7526277025284346281} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7526277025284346281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397676075479576648} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6235205814865430966} + m_Father: {fileID: 7159165096883365333} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1942601235650518722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1094679832575602324} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1094679832575602324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942601235650518722} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5381753342331092628} + m_Father: {fileID: 5247612288358509383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2182852637566001242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5247612288358509383} + - component: {fileID: 8682689606743262420} + - component: {fileID: 1472148342509242727} + m_Layer: 6 + m_Name: WheelRL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5247612288358509383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.19, y: -0.115999974, z: -1.5520002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1094679832575602324} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8682689606743262420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 1942601235650518722} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1472148342509242727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2182852637566001242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &2392519174231881609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6235205814865430966} + - component: {fileID: 1040533630584603434} + - component: {fileID: 1877069937092646759} + m_Layer: 0 + m_Name: Wheel_FL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6235205814865430966 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392519174231881609} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.04799092, y: -0.033669062, z: -0.004183054} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7526277025284346281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1040533630584603434 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392519174231881609} + m_Mesh: {fileID: 4757561864315882115, guid: 7247c1657c63455418041e37afcff94b, type: 3} +--- !u!23 &1877069937092646759 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392519174231881609} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 677ccd23209de534d9eda6a663dfecc0, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2471502677899540838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3785063640350620915} + - component: {fileID: 6991348853993897010} + - component: {fileID: 1149245080732129436} + m_Layer: 6 + m_Name: WheelFR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3785063640350620915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.25, y: -0.119999975, z: 2.58} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1569748257410277726} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6991348853993897010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 2509405639672360047} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &1149245080732129436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471502677899540838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 25 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 1 + BrakeTorqueCoefficient: 1 + HandbrakeCoefficient: 0 + SpinResistanceTorque: 0 +--- !u!1 &2509405639672360047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1569748257410277726} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1569748257410277726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509405639672360047} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2000726421527571940} + m_Father: {fileID: 3785063640350620915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2971578392928739923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000726421527571940} + - component: {fileID: 4596076901066595015} + - component: {fileID: 1413190747916773989} + m_Layer: 0 + m_Name: Wheel_FR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2000726421527571940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2971578392928739923} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.01200819, y: -0.033669084, z: -0.004183054} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1569748257410277726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4596076901066595015 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2971578392928739923} + m_Mesh: {fileID: -8086809397760034199, guid: 7247c1657c63455418041e37afcff94b, type: 3} +--- !u!23 &1413190747916773989 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2971578392928739923} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 677ccd23209de534d9eda6a663dfecc0, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3836177050164664280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4974391872023938678} + - component: {fileID: 741135404844445951} + - component: {fileID: 4294593319731521929} + m_Layer: 6 + m_Name: WheelRR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4974391872023938678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.25, y: -0.115999974, z: -1.5520002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6647212568088156140} + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &741135404844445951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e5d0c177dc2a34fa75b65b96dd5bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + WheelSpinObject: {fileID: 6415012679083194667} + Radius: 0.5 + Width: 0.3 + Mass: 30 + SuspensionMaxLength: 0.1 + SuspensionSpringRate: 30 + SuspensionDampingRate: 6000 + VisualSuspensionSharpness: 30 + AntiRollBarStiffness: 10000 + FrictionCurve: + FrictionCurveMaximum: {x: 0.2, y: 2.4} + FrictionCurveMinimum: {x: 0.6, y: 1.8} + FrictionCircleStrength: 0.6 + WheelColliderSideCount: 6 + WheelColliderLayerOverrides: + LayerOverridePriority: 0 + IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + AddWheelProtectorCollider: 1 + WheelProtectorColliderProvidesContacts: 0 + WheelProtectorColliderPhysicsMaterial: {fileID: 0} +--- !u!114 &4294593319731521929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836177050164664280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a614fcefffb6e974c9a9cbccf1eea5ce, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxSteerAngleDegrees: 0 + AckermanCoefficient: 0.7 + MotorTorqueCoefficient: 0.8 + BrakeTorqueCoefficient: 0.5 + HandbrakeCoefficient: 1 + SpinResistanceTorque: 0 +--- !u!1 &5612243847065418617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3904246284547298072} + - component: {fileID: 1620191114145386681} + - component: {fileID: 7684111208922008637} + m_Layer: 6 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3904246284547298072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241558961477521384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1620191114145386681 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 64 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3, y: 1.82, z: 7} + m_Center: {x: 0, y: 0.54, z: 0.8} +--- !u!114 &7684111208922008637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612243847065418617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996438ad0589e459b83acb42bc5e5b94, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Physics.Hybrid::Unity.Physics.Authoring.DetailedStaticMeshCollisionAuthoring +--- !u!1 &6033547001579752796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3509999475113872908} + - component: {fileID: 825005609860701220} + - component: {fileID: 3020346943481302677} + m_Layer: 0 + m_Name: Wheel_RR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3509999475113872908 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6033547001579752796} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.01200819, y: -0.037669085, z: -0.015750527} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6647212568088156140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &825005609860701220 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6033547001579752796} + m_Mesh: {fileID: -2356839498367080463, guid: 7247c1657c63455418041e37afcff94b, type: 3} +--- !u!23 &3020346943481302677 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6033547001579752796} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 677ccd23209de534d9eda6a663dfecc0, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6415012679083194667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6647212568088156140} + m_Layer: 6 + m_Name: MeshContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6647212568088156140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415012679083194667} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3509999475113872908} + m_Father: {fileID: 4974391872023938678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8825397670790451460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241558961477521384} + - component: {fileID: 2619383203107180763} + - component: {fileID: 4200214256790136178} + - component: {fileID: 1463088054671943377} + - component: {fileID: 7516724550494346556} + - component: {fileID: -2269123043924288995} + - component: {fileID: -3607853263336098241} + - component: {fileID: 8992125931898149654} + m_Layer: 6 + m_Name: CarBase_8v1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7241558961477521384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3904246284547298072} + - {fileID: 7159165096883365333} + - {fileID: 3785063640350620915} + - {fileID: 5247612288358509383} + - {fileID: 4974391872023938678} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2619383203107180763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e91f316ad288f7741be1980b360541af, type: 3} + m_Name: + m_EditorClassIdentifier: + Wheels: + - {fileID: 6268752058287574940} + - {fileID: 6991348853993897010} + - {fileID: 8682689606743262420} + - {fileID: 741135404844445951} + AxlePairedWheels: + - LeftWheel: {fileID: 1110764049248788986} + RightWheel: {fileID: 2471502677899540838} + - LeftWheel: {fileID: 2182852637566001242} + RightWheel: {fileID: 3836177050164664280} + SubstepCount: 12 + Dimensions: + x: 3 + y: 1.8 + z: 7 + DimensionsDebugCenter: + x: 0 + y: 0.55 + z: 0.8 + UseContactFiltering: 1 + ContactSurfaceNormalAngleThreshold: 10 + HardTerrainFeatureAngleThreshold: 60 +--- !u!54 &4200214256790136178 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + serializedVersion: 5 + m_Mass: 1200 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: -0.5, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1463088054671943377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6a4e498afac0eb429588ead7b2f8c9e, type: 3} + m_Name: + m_EditorClassIdentifier: + EngineMaxRPM: 10000 + EngineIdleRPM: 700 + EngineAngularVelocityCalculation: 1 + EngineMaxTorque: 300 + EngineTorqueCurve: + AnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + SamplesCount: 12 + EngineBrakingIntensity: 0.25 + EngineAngularInertia: 0.5 + EngineStartOnAwake: 1 + EngineStartOnThrottle: 1 + TransmissionIsAutomatic: 1 + TransmissionForwardGearRatios: + - 8 + - 5.5 + - 4 + - 3 + - 2.2 + - 1.7 + TransmissionReverseGearRatios: + - -7 + TransmissionFinalGearRatio: 3 + TransmissionShiftUpRPM: 6000 + TransmissionShiftDownRPM: 2000 + SwapThrottleAndBrakeInReverse: 1 + SteerSpeed: 5 + SteeringSensitivityLowSpeed: 1 + SteeringSensitivityHighSpeed: 0.2 + SteeringSensitivitySpeedReference: 100 + MaxBrakeTorque: 40000 + WheelAngularVelocityLimit: 0 + AeroDragCoefficient: 0 + AeroDragOffset: + x: 0 + y: 0 + z: 0 + AeroDownforceCoefficient: 0 + AeroDownforceOffset: + x: 0 + y: 0 + z: 0 +--- !u!114 &7516724550494346556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e65554d43563b8419cb2aa89aaecfc6, type: 3} + m_Name: + m_EditorClassIdentifier: + MinAudioVolume: 0.4 + MaxAudioVolume: 1 +--- !u!114 &-2269123043924288995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-3607853263336098241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultGhostMode: 2 + SupportedGhostModes: 3 + OptimizationMode: 0 + Importance: 1 + MaxSendRate: 0 + prefabId: f594f6a972c77457abd3147de3723c9d + HasOwner: 1 + SupportAutoCommandTarget: 1 + TrackInterpolationDelay: 1 + GhostGroup: 0 + UsePreSerialization: 0 + UseSingleBaseline: 0 + RollbackPredictedSpawnedGhostState: 0 + RollbackPredictionOnStructuralChanges: 1 +--- !u!114 &8992125931898149654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825397670790451460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} + m_Name: + m_EditorClassIdentifier: + ComponentOverrides: [] diff --git a/Assets/Prefabs/Cars/CarBase_8v1.prefab.meta b/Assets/Prefabs/Cars/CarBase_8v1.prefab.meta new file mode 100644 index 000000000..a4de079f5 --- /dev/null +++ b/Assets/Prefabs/Cars/CarBase_8v1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f594f6a972c77457abd3147de3723c9d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Managers/Spawner.prefab b/Assets/Prefabs/Managers/Spawner.prefab index 27fd81777..e1fb8b88e 100644 --- a/Assets/Prefabs/Managers/Spawner.prefab +++ b/Assets/Prefabs/Managers/Spawner.prefab @@ -23,13 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118838507566858} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: 0, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118838507892608 GameObject: @@ -54,13 +54,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118838507892608} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118838512451744 GameObject: @@ -85,13 +85,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118838512451744} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118838588544311 GameObject: @@ -116,13 +116,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118838588544311} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118838822157311 GameObject: @@ -147,13 +147,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118838822157311} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118838922950112 GameObject: @@ -178,13 +178,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118838922950112} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118838956003760 GameObject: @@ -209,13 +209,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118838956003760} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118838988921632 GameObject: @@ -240,13 +240,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118838988921632} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: 0, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839025544787 GameObject: @@ -271,13 +271,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839025544787} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839045742712 GameObject: @@ -302,13 +302,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839045742712} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: 0, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839090184891 GameObject: @@ -333,13 +333,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839090184891} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839131703647 GameObject: @@ -364,13 +364,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839131703647} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839169224182 GameObject: @@ -395,13 +395,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839169224182} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839174492176 GameObject: @@ -426,13 +426,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839174492176} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839267961280 GameObject: @@ -457,13 +457,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839267961280} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839307172147 GameObject: @@ -488,13 +488,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839307172147} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839328112105 GameObject: @@ -519,13 +519,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839328112105} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: 0, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839398983614 GameObject: @@ -550,13 +550,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839398983614} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839518642600 GameObject: @@ -581,13 +581,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839518642600} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839555720143 GameObject: @@ -612,13 +612,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839555720143} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: 0, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839589808738 GameObject: @@ -643,6 +643,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839589808738} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 100.6, y: 4, z: 61} m_LocalScale: {x: 1, y: 1, z: 1} @@ -665,7 +666,6 @@ Transform: - {fileID: 7774118840077679952} - {fileID: 7774118839555720142} m_Father: {fileID: 7774118840020172644} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839640222141 GameObject: @@ -690,13 +690,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839640222141} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839830526075 GameObject: @@ -721,13 +721,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839830526075} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839848431503 GameObject: @@ -752,13 +752,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839848431503} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118839951117622 GameObject: @@ -783,13 +783,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118839951117622} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118840020172642 GameObject: @@ -815,6 +815,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840020172642} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -823,7 +824,6 @@ Transform: - {fileID: 7774118840037243853} - {fileID: 7774118839589808741} m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7774118840020172645 MonoBehaviour: @@ -840,67 +840,67 @@ MonoBehaviour: SkinPrefabs: - SkinPrefab: {fileID: 8553454587341421359, guid: 6cb9c24b1520c8c4c8adc7ec31f9458e, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 659c673f821729b4c8ff56074147b95c, + BaseType: {fileID: 8825397670790451460, guid: 04b1049bd33744a29a37d87c601c3c7c, type: 3} - SkinPrefab: {fileID: 1132478985436359462, guid: 837b5cc0e0c05dc4b8e51d40e22dbf3f, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 659c673f821729b4c8ff56074147b95c, + BaseType: {fileID: 8825397670790451460, guid: 04b1049bd33744a29a37d87c601c3c7c, type: 3} - SkinPrefab: {fileID: 5199460412571764072, guid: 87460322b7bdd9e42a79c550e2864157, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 659c673f821729b4c8ff56074147b95c, + BaseType: {fileID: 8825397670790451460, guid: 25aab33864672442fb6ba2f679a69ea5, type: 3} - SkinPrefab: {fileID: 5428630655250322553, guid: ef13879fbcc3cae43b9b46a453c53fc8, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 659c673f821729b4c8ff56074147b95c, + BaseType: {fileID: 8825397670790451460, guid: 04b1049bd33744a29a37d87c601c3c7c, type: 3} - SkinPrefab: {fileID: 2299916667034568104, guid: 2eef7c31a6644ca4d9fc18e1a4e5ef19, type: 3} - BaseType: {fileID: 8256455754772310685, guid: a527f25ca0a498743804f7b7f3b19b25, + BaseType: {fileID: 8825397670790451460, guid: 59472719e207a4712b0da85692d0c4c0, type: 3} - SkinPrefab: {fileID: 2971089824963667988, guid: a901c5acc43595c42b854e3eefc9375a, type: 3} - BaseType: {fileID: 8256455754772310685, guid: a527f25ca0a498743804f7b7f3b19b25, + BaseType: {fileID: 8825397670790451460, guid: 3895fb58394414861a7ab2c9a056c9c9, type: 3} - SkinPrefab: {fileID: 4393308037842597405, guid: 88f12d919a4966740b83fcf330cd878f, type: 3} - BaseType: {fileID: 8256455754772310685, guid: a527f25ca0a498743804f7b7f3b19b25, + BaseType: {fileID: 8825397670790451460, guid: 59472719e207a4712b0da85692d0c4c0, type: 3} - SkinPrefab: {fileID: 2737157075562144568, guid: 21c932263a7914b429e46ee0d1c2bffa, type: 3} - BaseType: {fileID: 8256455754772310685, guid: a527f25ca0a498743804f7b7f3b19b25, + BaseType: {fileID: 8825397670790451460, guid: 3895fb58394414861a7ab2c9a056c9c9, type: 3} - SkinPrefab: {fileID: 1085947432122279967, guid: 103e9c27cd47743428175b533e06bfa7, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 6d083a803d63a64489cbfb2f44cb4155, + BaseType: {fileID: 8825397670790451460, guid: ceab67b8af69c4948ab998f44c8aaa34, type: 3} - SkinPrefab: {fileID: 7429723171142044895, guid: f55680a4778ea2d47a56730f38b9ec00, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 6d083a803d63a64489cbfb2f44cb4155, + BaseType: {fileID: 8825397670790451460, guid: ceab67b8af69c4948ab998f44c8aaa34, type: 3} - SkinPrefab: {fileID: 1146333530112198686, guid: c09702193fca0be4f95286687d2b1a61, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 6d083a803d63a64489cbfb2f44cb4155, + BaseType: {fileID: 8825397670790451460, guid: ceab67b8af69c4948ab998f44c8aaa34, type: 3} - SkinPrefab: {fileID: 4254357197758828629, guid: 899beb9eeeea9ea45bb75e55c8df0f44, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 6d083a803d63a64489cbfb2f44cb4155, + BaseType: {fileID: 8825397670790451460, guid: ceab67b8af69c4948ab998f44c8aaa34, type: 3} - SkinPrefab: {fileID: 7746076441596042193, guid: 9a2103baf05486a49bd352d24adfd9e4, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 3cb91d93cb2a78944acdb4267c978aaf, + BaseType: {fileID: 8825397670790451460, guid: f594f6a972c77457abd3147de3723c9d, type: 3} - SkinPrefab: {fileID: 6321180905942854223, guid: da51bc335a547cd4aa191c2cb4ff2ab5, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 3cb91d93cb2a78944acdb4267c978aaf, + BaseType: {fileID: 8825397670790451460, guid: f594f6a972c77457abd3147de3723c9d, type: 3} - SkinPrefab: {fileID: 5684405732338410764, guid: ebd5a8cc23fffcf41be77963f0af7057, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 3cb91d93cb2a78944acdb4267c978aaf, + BaseType: {fileID: 8825397670790451460, guid: f594f6a972c77457abd3147de3723c9d, type: 3} - SkinPrefab: {fileID: 8736000566106499006, guid: 134e13aa21fc4c2408e0e4280e82cf85, type: 3} - BaseType: {fileID: 8256455754772310685, guid: 3cb91d93cb2a78944acdb4267c978aaf, + BaseType: {fileID: 8825397670790451460, guid: f594f6a972c77457abd3147de3723c9d, type: 3} SpawnPoints: - TrackSpawnPoint: {fileID: 7774118839169224185} @@ -958,6 +958,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840037243850} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.6250457, z: -0, w: -0.7805881} m_LocalPosition: {x: -246.18, y: 14, z: -179.76} m_LocalScale: {x: 1, y: 1, z: 1} @@ -980,7 +981,6 @@ Transform: - {fileID: 7774118839025544786} - {fileID: 7774118838507566861} m_Father: {fileID: 7774118840020172644} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 282.629, z: 0} --- !u!1 &7774118840077679953 GameObject: @@ -1005,13 +1005,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840077679953} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118840262139590 GameObject: @@ -1036,13 +1036,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840262139590} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118840399099198 GameObject: @@ -1067,13 +1067,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840399099198} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: 0, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118840422855919 GameObject: @@ -1098,13 +1098,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840422855919} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118840455264236 GameObject: @@ -1129,13 +1129,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840455264236} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: 0, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118840512900041 GameObject: @@ -1160,13 +1160,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840512900041} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118840513639058 GameObject: @@ -1191,13 +1191,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840513639058} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: 0, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118840037243853} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7774118840524858227 GameObject: @@ -1222,11 +1222,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7774118840524858227} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7774118839589808741} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Race/Track/Track.prefab b/Assets/Prefabs/Race/Track/Track.prefab index 543433318..621754973 100644 --- a/Assets/Prefabs/Race/Track/Track.prefab +++ b/Assets/Prefabs/Race/Track/Track.prefab @@ -18,7 +18,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &7902116566794982822 Transform: @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 306977140926550415} + serializedVersion: 2 m_LocalRotation: {x: 0.000000053902813, y: 0.00000008940697, z: 0.7071072, w: -0.7071065} m_LocalPosition: {x: -2.7499988, y: 0, z: 0.19999996} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90} --- !u!33 &7188313829398434545 MeshFilter: @@ -60,10 +60,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -81,6 +86,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -148,15 +154,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 183521009 m_ShapeType: 31 m_PrimitiveCenter: x: 0.000000029802322 - y: 0.4999996 - z: 0.009999998 + y: 0.50000024 + z: 0.01 m_PrimitiveSize: - x: 0.50000024 - y: 1.0000005 - z: 0.020000026 + x: 0.5000002 + y: 1.0000002 + z: 0.02 m_PrimitiveOrientation: Value: x: -0 @@ -164,21 +171,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.020000026 - Radius: 0.50000024 + Height: 0.02 + Radius: 0.5000001 Axis: 2 m_Cylinder: - Height: 0.020000026 - Radius: 0.50000024 + Height: 0.02 + Radius: 0.5000001 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.50000024 + m_SphereRadius: 0.5000001 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.015000007 + m_SimplificationTolerance: 0.015000003 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: 197073870140251343, guid: 7ab4fcdb929679c4d83fb6dec58a3a4b, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -186,10 +194,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -238,9 +250,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -278,7 +290,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &1382679181472814666 GameObject: m_ObjectHideFlags: 0 @@ -297,7 +309,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &6200044278546816399 Transform: @@ -306,13 +318,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382679181472814666} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.2499914, z: 0.19999954} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} --- !u!33 &1421234428178905624 MeshFilter: @@ -339,10 +351,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -360,6 +377,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -427,15 +445,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 1382389715 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.7499994 - y: 0.9999985 - z: -0.09000011 + x: -0.74999946 + y: 0.9999983 + z: -0.08999998 m_PrimitiveSize: - x: 1.9999993 - y: 1.9999969 - z: 0.22000012 + x: 1.9999987 + y: 1.9999964 + z: 0.21999998 m_PrimitiveOrientation: Value: x: -0 @@ -443,21 +462,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.22000012 - Radius: 0.99999964 + Height: 0.21999998 + Radius: 0.99999934 Axis: 2 m_Cylinder: - Height: 0.22000012 - Radius: 0.99999964 + Height: 0.21999998 + Radius: 0.99999934 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.99999964 + m_SphereRadius: 0.99999934 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.029999984 + m_SimplificationTolerance: 0.029999979 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -852961046278019963, guid: 28661dc173048db4f9068a2cd05ed03f, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -465,10 +485,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -517,9 +541,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -557,7 +581,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &1861949268972747690 GameObject: m_ObjectHideFlags: 0 @@ -576,7 +600,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &6229478383448836180 Transform: @@ -585,13 +609,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861949268972747690} + serializedVersion: 2 m_LocalRotation: {x: 0.000000053902813, y: 0.00000008940697, z: 0.7071072, w: -0.7071065} m_LocalPosition: {x: 1.7499962, y: -2.499998, z: 0.20749968} m_LocalScale: {x: -1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90} --- !u!33 &850693301422987700 MeshFilter: @@ -618,10 +642,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -639,6 +668,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -706,15 +736,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 361290383 m_ShapeType: 31 m_PrimitiveCenter: - x: 0.25000107 - y: 1.0000012 - z: 0.002500163 + x: -0.24999946 + y: 1.0000008 + z: 0.0024999985 m_PrimitiveSize: - x: 1.0000005 - y: 2.0000014 - z: 0.020000057 + x: 1.0000002 + y: 2.0000005 + z: 0.02 m_PrimitiveOrientation: Value: x: -0 @@ -722,21 +753,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.020000057 - Radius: 1.0000007 + Height: 0.02 + Radius: 1.0000002 Axis: 2 m_Cylinder: - Height: 0.020000057 - Radius: 1.0000007 + Height: 0.02 + Radius: 1.0000002 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 1.0000007 + m_SphereRadius: 1.0000002 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.030000018 + m_SimplificationTolerance: 0.030000007 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -259325831839032254, guid: 7ab4fcdb929679c4d83fb6dec58a3a4b, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -744,10 +776,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -796,9 +832,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -836,7 +872,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &2158911847549760820 GameObject: m_ObjectHideFlags: 0 @@ -855,7 +891,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &5888871673410415951 Transform: @@ -864,15 +900,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2158911847549760820} - m_LocalRotation: {x: 0.00000017881393, y: -0.0000000053329074, z: -0.00000050042934, - w: -1} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: -1, w: 0} m_LocalPosition: {x: 5, y: -1.7500085, z: 0.30000076} - m_LocalScale: {x: 1, y: -1, z: 1} + m_LocalScale: {x: -1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} --- !u!33 &3408110999072499309 MeshFilter: m_ObjectHideFlags: 0 @@ -898,10 +933,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -919,6 +959,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -986,15 +1027,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 1442985241 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.49999714 - y: 0.7500009 - z: -0.039999805 + x: -0.49999863 + y: 0.7499998 + z: -0.04 m_PrimitiveSize: - x: 1.4999983 - y: 1.4999998 - z: 0.11999996 + x: 1.4999977 + y: 1.4999995 + z: 0.11999999 m_PrimitiveOrientation: Value: x: -0 @@ -1002,21 +1044,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.11999996 - Radius: 0.7499999 + Height: 0.11999999 + Radius: 0.74999976 Axis: 2 m_Cylinder: - Height: 0.11999996 - Radius: 0.7499999 + Height: 0.11999999 + Radius: 0.74999976 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.7499999 + m_SphereRadius: 0.74999976 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.022499995 + m_SimplificationTolerance: 0.022499992 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -518661910922007935, guid: 28661dc173048db4f9068a2cd05ed03f, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -1024,10 +1067,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -1076,9 +1123,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -1116,7 +1163,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &2415739920722269947 GameObject: m_ObjectHideFlags: 0 @@ -1135,7 +1182,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &5107759363474916767 Transform: @@ -1144,13 +1191,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2415739920722269947} + serializedVersion: 2 m_LocalRotation: {x: 0.00000017311211, y: 0.00000008940697, z: 0.70710635, w: -0.7071073} m_LocalPosition: {x: -2.7499955, y: -0.000016479491, z: 0.20000057} m_LocalScale: {x: 1, y: -1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90} --- !u!33 &2916326336362861280 MeshFilter: @@ -1177,10 +1224,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1198,6 +1250,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1265,15 +1318,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 1344358192 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.4999987 - y: 0.7500009 - z: -0.04000003 + x: -0.49999845 + y: 0.7500003 + z: -0.039999984 m_PrimitiveSize: - x: 1.4999986 - y: 1.5000002 - z: 0.12000008 + x: 1.4999979 + y: 1.5 + z: 0.11999999 m_PrimitiveOrientation: Value: x: -0 @@ -1281,21 +1335,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.12000008 - Radius: 0.7500001 + Height: 0.11999999 + Radius: 0.75 Axis: 2 m_Cylinder: - Height: 0.12000008 - Radius: 0.7500001 + Height: 0.11999999 + Radius: 0.75 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.7500001 + m_SphereRadius: 0.75 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.022500003 + m_SimplificationTolerance: 0.022499999 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -518661910922007935, guid: 28661dc173048db4f9068a2cd05ed03f, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -1303,10 +1358,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -1355,9 +1414,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -1395,7 +1454,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &5031002866693366814 GameObject: m_ObjectHideFlags: 0 @@ -1414,7 +1473,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8997977132732387933 Transform: @@ -1423,13 +1482,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5031002866693366814} + serializedVersion: 2 m_LocalRotation: {x: 0.000000053902813, y: 0.00000008940697, z: 0.7071072, w: -0.7071065} m_LocalPosition: {x: 1.7499999, y: 0, z: 0.2074991} m_LocalScale: {x: -1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90} --- !u!33 &7691169525327360533 MeshFilter: @@ -1456,10 +1515,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1477,6 +1541,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1544,15 +1609,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 886904889 m_ShapeType: 31 m_PrimitiveCenter: - x: 0.25000012 - y: 1.0000012 - z: 0.002500014 + x: -0.24999946 + y: 1.0000006 + z: 0.0025000134 m_PrimitiveSize: - x: 1.0000005 - y: 2.0000014 - z: 0.020000057 + x: 1.0000002 + y: 2.0000005 + z: 0.02 m_PrimitiveOrientation: Value: x: -0 @@ -1560,21 +1626,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.020000057 - Radius: 1.0000007 + Height: 0.02 + Radius: 1.0000002 Axis: 2 m_Cylinder: - Height: 0.020000057 - Radius: 1.0000007 + Height: 0.02 + Radius: 1.0000002 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 1.0000007 + m_SphereRadius: 1.0000002 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.030000018 + m_SimplificationTolerance: 0.030000007 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -259325831839032254, guid: 7ab4fcdb929679c4d83fb6dec58a3a4b, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -1582,10 +1649,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -1634,9 +1705,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -1674,7 +1745,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &5598215132027779560 GameObject: m_ObjectHideFlags: 0 @@ -1693,7 +1764,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &5786046061241955614 Transform: @@ -1702,13 +1773,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5598215132027779560} + serializedVersion: 2 m_LocalRotation: {x: -0.000000008063603, y: 0.00000017881393, z: 1, w: -0.000000008063602} m_LocalPosition: {x: 0, y: 1.2499914, z: 0.19999954} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &6081965536304856208 MeshFilter: @@ -1735,10 +1806,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1756,6 +1832,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1823,15 +1900,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 1735029053 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.00000014901161 - y: 1.0000004 - z: 0.010000002 + x: -0.000000029802322 + y: 1 + z: 0.010000015 m_PrimitiveSize: - x: 0.5000001 - y: 2.0000005 - z: 0.020000122 + x: 0.5 + y: 2 + z: 0.02 m_PrimitiveOrientation: Value: x: -0 @@ -1839,21 +1917,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.020000122 - Radius: 1.0000002 + Height: 0.02 + Radius: 1 Axis: 2 m_Cylinder: - Height: 0.020000122 - Radius: 1.0000002 + Height: 0.02 + Radius: 1 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 1.0000002 + m_SphereRadius: 1 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.030000007 + m_SimplificationTolerance: 0.029999997 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -3271799415508612831, guid: 7ab4fcdb929679c4d83fb6dec58a3a4b, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -1861,10 +1940,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -1913,9 +1996,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -1953,7 +2036,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &5675453947590799523 GameObject: m_ObjectHideFlags: 0 @@ -1972,7 +2055,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &3174200246033193978 Transform: @@ -1981,13 +2064,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5675453947590799523} + serializedVersion: 2 m_LocalRotation: {x: -0.000000065306466, y: 0.00000008940696, z: 0.7071071, w: 0.7071065} - m_LocalPosition: {x: -3.2499993, y: 2.4999793, z: 0.099999234} + m_LocalPosition: {x: -3.2499943, y: 2.4999757, z: 0.09999967} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: -90} --- !u!33 &8929906103872787660 MeshFilter: @@ -2014,10 +2097,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2035,6 +2123,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -2102,15 +2191,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 92779605 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.24999931 - y: 0.50000036 - z: 0.009999873 + x: -0.24999955 + y: 0.49999985 + z: 0.010000007 m_PrimitiveSize: - x: 0.9999997 - y: 0.99999976 - z: 0.02000006 + x: 0.9999996 + y: 0.9999995 + z: 0.02 m_PrimitiveOrientation: Value: x: -0 @@ -2118,21 +2208,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.02000006 - Radius: 0.49999988 + Height: 0.02 + Radius: 0.4999998 Axis: 2 m_Cylinder: - Height: 0.02000006 - Radius: 0.49999988 + Height: 0.02 + Radius: 0.4999998 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.49999988 + m_SphereRadius: 0.4999998 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.014999995 + m_SimplificationTolerance: 0.014999993 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -4254125544146701228, guid: 7ab4fcdb929679c4d83fb6dec58a3a4b, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -2140,10 +2231,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -2192,9 +2287,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -2232,7 +2327,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &7211803552225425972 GameObject: m_ObjectHideFlags: 0 @@ -2247,7 +2342,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &485766106909550241 Transform: @@ -2256,6 +2351,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7211803552225425972} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0} m_LocalPosition: {x: 0, y: -28.265408, z: 0} m_LocalScale: {x: 60, y: 60, z: 60} @@ -2275,7 +2371,6 @@ Transform: - {fileID: 5888871673410415951} - {fileID: 5107759363474916767} m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} --- !u!1 &7319959122656392650 GameObject: @@ -2295,7 +2390,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &6682272760109266044 Transform: @@ -2304,13 +2399,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7319959122656392650} + serializedVersion: 2 m_LocalRotation: {x: -0.000000008063603, y: 0.00000017881393, z: 1, w: -0.000000008063602} m_LocalPosition: {x: -1.7499988, y: -0.0000008900961, z: 0.2080006} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &8535773282880016187 MeshFilter: @@ -2337,10 +2432,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2358,6 +2458,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -2425,15 +2526,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 1855924672 m_ShapeType: 31 m_PrimitiveCenter: - x: 0.00000011920929 - y: 0 - z: 0.027563892 + x: -1.7500002 + y: -0.0000006556511 + z: 0.10221882 m_PrimitiveSize: - x: 3.5000007 - y: 0.5000002 - z: 0.2205 + x: 3.5 + y: 0.50000036 + z: 0.22049999 m_PrimitiveOrientation: Value: x: -0 @@ -2441,21 +2543,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.2205 - Radius: 1.7500004 + Height: 0.22049999 + Radius: 1.75 Axis: 2 m_Cylinder: - Height: 0.2205 - Radius: 1.7500004 + Height: 0.22049999 + Radius: 1.75 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 1.7500004 + m_SphereRadius: 1.75 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.05250001 + m_SimplificationTolerance: 0.0525 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -1090370175664877168, guid: 7ab4fcdb929679c4d83fb6dec58a3a4b, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -2463,10 +2566,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -2515,9 +2622,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -2555,7 +2662,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &7815797654787845254 GameObject: m_ObjectHideFlags: 0 @@ -2574,7 +2681,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &6943986879620818338 Transform: @@ -2583,13 +2690,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7815797654787845254} + serializedVersion: 2 m_LocalRotation: {x: -7.136963e-15, y: 0.00000008225711, z: 0.00000080282666, w: 1} m_LocalPosition: {x: -4, y: 1.2499785, z: 0.09999992} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -89.98, y: 0, z: -180} --- !u!33 &7111371342442658690 MeshFilter: @@ -2616,10 +2723,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2637,6 +2749,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -2704,15 +2817,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 38656444 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.0000012516975 - y: 0.24999985 - z: 0.009999909 + x: -0.0000007748604 + y: 0.2499998 + z: 0.010000007 m_PrimitiveSize: - x: 0.50000083 - y: 0.5000003 - z: 0.02000003 + x: 0.5000007 + y: 0.50000024 + z: 0.02 m_PrimitiveOrientation: Value: x: -0 @@ -2720,21 +2834,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.02000003 - Radius: 0.25000042 + Height: 0.02 + Radius: 0.25000036 Axis: 2 m_Cylinder: - Height: 0.02000003 - Radius: 0.25000042 + Height: 0.02 + Radius: 0.25000036 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.25000042 + m_SphereRadius: 0.25000036 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: m_SimplificationTolerance: 0.01 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: 609871865625464099, guid: 7ab4fcdb929679c4d83fb6dec58a3a4b, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -2742,10 +2857,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -2794,9 +2913,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -2834,7 +2953,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &7861516964962222695 GameObject: m_ObjectHideFlags: 0 @@ -2853,7 +2972,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2396548775750651741 Transform: @@ -2862,6 +2981,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7861516964962222695} + serializedVersion: 2 m_LocalRotation: {x: 0.00000017881393, y: -0.0000000053329074, z: -0.00000050042934, w: -1} m_LocalPosition: {x: 5, y: -1.7500088, z: 0.30000013} @@ -2869,7 +2989,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &8359351912203220747 MeshFilter: @@ -2896,10 +3015,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2917,6 +3041,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -2984,15 +3109,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 185003132 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.4999969 - y: 0.7499991 - z: -0.039999925 + x: -0.49999863 + y: 0.7499998 + z: -0.04000003 m_PrimitiveSize: - x: 1.4999983 - y: 1.5 - z: 0.12000008 + x: 1.4999977 + y: 1.4999995 + z: 0.11999999 m_PrimitiveOrientation: Value: x: -0 @@ -3000,21 +3126,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.12000008 - Radius: 0.75 + Height: 0.11999999 + Radius: 0.74999976 Axis: 2 m_Cylinder: - Height: 0.12000008 - Radius: 0.75 + Height: 0.11999999 + Radius: 0.74999976 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.75 + m_SphereRadius: 0.74999976 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.022499999 + m_SimplificationTolerance: 0.022499992 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: -518661910922007935, guid: 28661dc173048db4f9068a2cd05ed03f, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -3022,10 +3149,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -3074,9 +3205,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -3114,7 +3245,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &8127066524387071717 GameObject: m_ObjectHideFlags: 0 @@ -3133,7 +3264,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1389064601217353758 Transform: @@ -3142,13 +3273,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8127066524387071717} + serializedVersion: 2 m_LocalRotation: {x: -0.00000014520084, y: -0, z: -1, w: 0.0000012992924} m_LocalPosition: {x: 0, y: -0.7500085, z: 0.2000003} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: -360} --- !u!33 &1499189533494273266 MeshFilter: @@ -3175,10 +3306,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3196,6 +3332,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -3263,15 +3400,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 1577940713 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.7499996 - y: 0.999999 - z: 0.010000103 + x: -0.74999946 + y: 0.9999978 + z: 0.01 m_PrimitiveSize: - x: 1.9999994 - y: 1.9999969 - z: 0.020000117 + x: 1.9999987 + y: 1.9999964 + z: 0.02 m_PrimitiveOrientation: Value: x: -0 @@ -3279,21 +3417,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.020000117 - Radius: 0.9999997 + Height: 0.02 + Radius: 0.99999934 Axis: 2 m_Cylinder: - Height: 0.020000117 - Radius: 0.9999997 + Height: 0.02 + Radius: 0.99999934 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.9999997 + m_SphereRadius: 0.99999934 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.029999988 + m_SimplificationTolerance: 0.029999979 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: 3506542031084528035, guid: 7ab4fcdb929679c4d83fb6dec58a3a4b, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -3301,10 +3440,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -3353,9 +3496,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -3393,7 +3536,7 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 --- !u!1 &8431483800611022570 GameObject: m_ObjectHideFlags: 0 @@ -3412,7 +3555,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &566841357946751817 Transform: @@ -3421,13 +3564,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8431483800611022570} + serializedVersion: 2 m_LocalRotation: {x: 0.00000008370516, y: 0.000000029802322, z: 0.70710397, w: -0.7071097} - m_LocalPosition: {x: -3.2500014, y: 2.4999793, z: 0.107499234} + m_LocalPosition: {x: -3.2499964, y: 2.4999762, z: 0.10999969} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485766106909550241} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90} --- !u!33 &313227520940416879 MeshFilter: @@ -3454,10 +3597,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b875c319458e6fe4dad10fddde63f517, type: 2} + - {fileID: 2100000, guid: b93eb2b4a47bda84d830257c92290417, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3475,6 +3623,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -3542,15 +3691,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3} m_Name: m_EditorClassIdentifier: + m_ForceUniqueID: 934356061 m_ShapeType: 31 m_PrimitiveCenter: - x: -0.2500003 - y: 0.7499988 - z: -0.04750017 + x: -0.25000012 + y: 0.75000006 + z: -0.05 m_PrimitiveSize: - x: 1.0000004 - y: 1.5000005 - z: 0.12000005 + x: 1.0000002 + y: 1.5000001 + z: 0.12 m_PrimitiveOrientation: Value: x: -0 @@ -3558,21 +3708,22 @@ MonoBehaviour: z: 0 RotationOrder: 4 m_Capsule: - Height: 0.12000005 - Radius: 0.75000024 + Height: 0.12 + Radius: 0.75000006 Axis: 2 m_Cylinder: - Height: 0.12000005 - Radius: 0.75000024 + Height: 0.12 + Radius: 0.75000006 Axis: 2 m_CylinderSideCount: 20 - m_SphereRadius: 0.75000024 + m_SphereRadius: 0.75000006 m_MinimumSkinnedVertexWeight: 0.1 m_ConvexHullGenerationParameters: - m_SimplificationTolerance: 0.022500006 + m_SimplificationTolerance: 0.0225 m_BevelRadius: 0.05 m_MinimumAngle: 2.5000002 - m_CustomMesh: {fileID: 0} + m_CustomMesh: {fileID: 4358896191231822173, guid: 28661dc173048db4f9068a2cd05ed03f, + type: 3} m_ForceUnique: 0 m_Material: m_SupportsTemplate: 1 @@ -3580,10 +3731,14 @@ MonoBehaviour: m_CollisionResponse: m_Override: 0 m_Value: 0 + m_DetailedStaticMeshCollision: + m_Override: 0 + m_Value: + Value: 1 m_Friction: m_Override: 0 m_Value: - Value: 0.5 + Value: 0.8 CombineMode: 0 m_Restitution: m_Override: 0 @@ -3632,9 +3787,9 @@ MonoBehaviour: Category01: 1 Category02: 0 Category03: 0 - Category04: 1 + Category04: 0 Category05: 0 - Category06: 0 + Category06: 1 Category07: 0 Category08: 0 Category09: 0 @@ -3672,4 +3827,4 @@ MonoBehaviour: Tag06: 0 Tag07: 0 m_SerializedVersion: 1 - m_SerializedVersion: 1 + m_SerializedVersion: 2 diff --git a/Assets/Prefabs/UI/Vivox.prefab b/Assets/Prefabs/UI/Vivox.prefab new file mode 100644 index 000000000..197583936 --- /dev/null +++ b/Assets/Prefabs/UI/Vivox.prefab @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &545502908568652006 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4139772111161393655} + - component: {fileID: 3458123367891910528} + - component: {fileID: 3934946353837556801} + - component: {fileID: 922190943685028192} + - component: {fileID: 1620054850052415247} + m_Layer: 0 + m_Name: Vivox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4139772111161393655 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 545502908568652006} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1000, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3458123367891910528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 545502908568652006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 408ae32ec1bed9a44b27f6c16f8eb6f5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3934946353837556801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 545502908568652006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f015244ed4bf9ca42b114c64d8592439, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &922190943685028192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 545502908568652006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a9116d070ce0e514cbc2be1697b2f73f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1620054850052415247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 545502908568652006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a1a7a46715df7e45a59840490694588, type: 3} + m_Name: + m_EditorClassIdentifier: + key: KpMFUJpRqFupppDbMjXK5wjujO6R52J6 + issuer: 24747-megac-87537-udash + domain: mtu1xp.vivox.com + server: https://unity.vivox.com/appconfig/24747-megac-87537-udash diff --git a/Assets/Prefabs/UI/Vivox.prefab.meta b/Assets/Prefabs/UI/Vivox.prefab.meta new file mode 100644 index 000000000..6d8b22348 --- /dev/null +++ b/Assets/Prefabs/UI/Vivox.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0569ad74bdaa04a4d8a32bb59c9eb106 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Unity Physics/1.0.11.meta b/Assets/Samples/Unity Physics/1.4.3.meta similarity index 77% rename from Assets/Samples/Unity Physics/1.0.11.meta rename to Assets/Samples/Unity Physics/1.4.3.meta index 5f2a54709..160128ac8 100644 --- a/Assets/Samples/Unity Physics/1.0.11.meta +++ b/Assets/Samples/Unity Physics/1.4.3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f8b8f25366b2ab245be88d44c0f7cd43 +guid: f9fd1b70f1f9c4a9592863cdd40c5d3e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring.meta similarity index 77% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring.meta index ed3443f96..d1b7e51cb 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring.meta +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 75ff85cb80df2b7428a6b72d3abb4120 +guid: eedc3d7792e9241389d00db22c766623 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor.meta similarity index 77% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor.meta index d047f1ef5..6e384e9f2 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor.meta +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 012e5c859c9beda4e908633ad7833dc9 +guid: 0ce726419c3044047ac231f530ff4792 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/AssemblyInfo.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/AssemblyInfo.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/AssemblyInfo.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/AssemblyInfo.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/AssemblyInfo.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/AssemblyInfo.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/AssemblyInfo.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/AssemblyInfo.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledBoxBoundsHandle.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledBoxBoundsHandle.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledBoxBoundsHandle.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledBoxBoundsHandle.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledBoxBoundsHandle.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledBoxBoundsHandle.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledBoxBoundsHandle.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledBoxBoundsHandle.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledCylinderBoundsHandle.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledCylinderBoundsHandle.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledCylinderBoundsHandle.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledCylinderBoundsHandle.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledCylinderBoundsHandle.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledCylinderBoundsHandle.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledCylinderBoundsHandle.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/BeveledCylinderBoundsHandle.cs.meta diff --git a/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/CustomComponentVersionUpgrader.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/CustomComponentVersionUpgrader.cs new file mode 100644 index 000000000..51bf1caf8 --- /dev/null +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/CustomComponentVersionUpgrader.cs @@ -0,0 +1,17 @@ +using UnityEditor; + +#if UNITY_EDITOR + +namespace Unity.Physics.Editor +{ + static class CustomComponentVersionUpgrader + { + [MenuItem("Tools/Unity Physics/Upgrade Physics Shape Versions")] + static void UpgradeAssetsWithPhysicsShape() + { + ComponentVersionUpgrader.UpgradeAssets("Physics Shape"); + } + } +} + +#endif diff --git a/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/CustomComponentVersionUpgrader.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/CustomComponentVersionUpgrader.cs.meta new file mode 100644 index 000000000..c314a1364 --- /dev/null +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/CustomComponentVersionUpgrader.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6829dc282497414b8070ae3073235a89 +timeCreated: 1758913310 \ No newline at end of file diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsBoundsHandleUtility.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsBoundsHandleUtility.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsBoundsHandleUtility.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsBoundsHandleUtility.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsBoundsHandleUtility.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsBoundsHandleUtility.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsBoundsHandleUtility.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsBoundsHandleUtility.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsSphereBoundsHandle.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsSphereBoundsHandle.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsSphereBoundsHandle.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsSphereBoundsHandle.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsSphereBoundsHandle.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsSphereBoundsHandle.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsSphereBoundsHandle.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/EditorTools/PhysicsSphereBoundsHandle.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/BallAndSocketJointEditor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/BallAndSocketJointEditor.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/BallAndSocketJointEditor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/BallAndSocketJointEditor.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/BallAndSocketJointEditor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/BallAndSocketJointEditor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/BallAndSocketJointEditor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/BallAndSocketJointEditor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/CustomPhysicsMaterialTagNamesEditor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/CustomPhysicsMaterialTagNamesEditor.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/CustomPhysicsMaterialTagNamesEditor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/CustomPhysicsMaterialTagNamesEditor.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/CustomPhysicsMaterialTagNamesEditor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/CustomPhysicsMaterialTagNamesEditor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/CustomPhysicsMaterialTagNamesEditor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/CustomPhysicsMaterialTagNamesEditor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/EditorUtilities.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/EditorUtilities.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/EditorUtilities.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/EditorUtilities.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/EditorUtilities.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/EditorUtilities.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/EditorUtilities.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/EditorUtilities.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/LimitedHingeJointEditor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/LimitedHingeJointEditor.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/LimitedHingeJointEditor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/LimitedHingeJointEditor.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/LimitedHingeJointEditor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/LimitedHingeJointEditor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/LimitedHingeJointEditor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/LimitedHingeJointEditor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsBodyAuthoringEditor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsBodyAuthoringEditor.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsBodyAuthoringEditor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsBodyAuthoringEditor.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsBodyAuthoringEditor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsBodyAuthoringEditor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsBodyAuthoringEditor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsBodyAuthoringEditor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsCategoryNamesEditor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsCategoryNamesEditor.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsCategoryNamesEditor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsCategoryNamesEditor.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsCategoryNamesEditor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsCategoryNamesEditor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsCategoryNamesEditor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsCategoryNamesEditor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsShapeAuthoringEditor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsShapeAuthoringEditor.cs similarity index 99% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsShapeAuthoringEditor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsShapeAuthoringEditor.cs index 194b86b1c..c906c5a0e 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsShapeAuthoringEditor.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Editors/PhysicsShapeAuthoringEditor.cs @@ -268,7 +268,7 @@ out ConvexHullGenerationParameters currentConvexProperties public void SchedulePreviewIfChanged(PhysicsShapeAuthoring shape) { - using (var currentPoints = new NativeList(65535, Allocator.Temp)) + using (var currentPoints = new NativeList(65535, Allocator.TempJob)) { var hash = GetInputHash( shape, currentPoints, m_HashedPoints, m_HashedConvexParameters, out var currentConvexParameters @@ -310,7 +310,7 @@ public void SchedulePreviewIfChanged(PhysicsShapeAuthoring shape) JobHandle ScheduleConvexHullPreview(PhysicsShapeAuthoring shape, NativeArray> output) { - var pointCloud = new NativeList(65535, Allocator.Temp); + using var pointCloud = new NativeList(65535, Allocator.TempJob); shape.GetBakedConvexProperties(pointCloud); if (pointCloud.Length == 0) @@ -333,7 +333,7 @@ JobHandle ScheduleConvexHullPreview(PhysicsShapeAuthoring shape, NativeArray> output) { - var points = new NativeList(1024, Allocator.Temp); + using var points = new NativeList(1024, Allocator.TempJob); var triangles = new NativeList(1024, Allocator.Temp); shape.GetBakedMeshProperties(points, triangles); @@ -359,7 +359,7 @@ JobHandle ScheduleMeshPreview(PhysicsShapeAuthoring shape, NativeArray + EditorGUIUtility.singleLineHeight; + + protected override bool IsCompatible(SerializedProperty property) => true; + + protected override void DoGUI(Rect position, SerializedProperty property, GUIContent label) + { + EditorGUI.BeginProperty(position, label, property); + EditorGUI.PropertyField(position, property.FindPropertyRelative("Value"), label); + EditorGUI.EndProperty(); + } + } + +} diff --git a/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialFlagDrawer.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialFlagDrawer.cs.meta new file mode 100644 index 000000000..5b16b2ff9 --- /dev/null +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialFlagDrawer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 93d85316e496c4919aa87d92181cbe9a \ No newline at end of file diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs similarity index 91% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs index a0140fffe..0a66cb379 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs @@ -40,6 +40,13 @@ static class Content "collide normally and raise notifications of collision events with other shapes, " + "or completely ignore collisions (but still move and intercept queries)." ); + + public static readonly GUIContent DetailedStaticMeshCollisionLabel = EditorGUIUtility.TrTextContent( + "Detailed Static Mesh Collision", + "When enabled, this option processes contact detection for dynamic objects colliding with static colliders " + + "across both the current and next frame. This helps predict and refine collision accuracy, reducing the " + + "likelihood of ghost collisions. Disable this if detailed precision is not required, as it may impact performance." + ); } const string k_CollisionFilterGroupKey = "m_BelongsToCategories"; @@ -88,7 +95,7 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent // m_CustomTags group = property.FindPropertyRelative(k_AdvancedGroupKey); if (group.isExpanded) - height += (EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing); + height += 2f * (EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing); // m_Template if (property.FindPropertyRelative("m_SupportsTemplate").boolValue) @@ -202,6 +209,11 @@ protected override void DoGUI(Rect position, SerializedProperty property, GUICon { ++EditorGUI.indentLevel; + FindToggleAndValueProperties(property, templateValue, "m_DetailedStaticMeshCollision", out toggle, out var detailedStaticMeshCollision); + position.y = position.yMax + EditorGUIUtility.standardVerticalSpacing; + position.height = EditorGUIUtility.singleLineHeight; + DisplayOverridableProperty(position, Content.DetailedStaticMeshCollisionLabel, toggle, detailedStaticMeshCollision, templateAssigned); + FindToggleAndValueProperties(property, templateValue, "m_CustomMaterialTags", out toggle, out var customFlags); position.y = position.yMax + EditorGUIUtility.standardVerticalSpacing; position.height = EditorGUIUtility.singleLineHeight; diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/PhysicsMaterialPropertiesDrawer.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/SoftRangeDrawer.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/SoftRangeDrawer.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/SoftRangeDrawer.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/SoftRangeDrawer.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/SoftRangeDrawer.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/SoftRangeDrawer.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/SoftRangeDrawer.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/SoftRangeDrawer.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/TagsDrawer.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/TagsDrawer.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/TagsDrawer.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/TagsDrawer.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/TagsDrawer.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/TagsDrawer.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/TagsDrawer.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/PropertyDrawers/TagsDrawer.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Unity.Physics.Custom.Editor.asmdef b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Unity.Physics.Custom.Editor.asmdef similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Unity.Physics.Custom.Editor.asmdef rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Unity.Physics.Custom.Editor.asmdef diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Unity.Physics.Custom.Editor.asmdef.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Unity.Physics.Custom.Editor.asmdef.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Unity.Physics.Custom.Editor.asmdef.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Unity.Physics.Custom.Editor.asmdef.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/EditorGUIControls.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/EditorGUIControls.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/EditorGUIControls.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/EditorGUIControls.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/EditorGUIControls.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/EditorGUIControls.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/EditorGUIControls.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/EditorGUIControls.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/ManipulatorUtility.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/ManipulatorUtility.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/ManipulatorUtility.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/ManipulatorUtility.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/ManipulatorUtility.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/ManipulatorUtility.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/ManipulatorUtility.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/ManipulatorUtility.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/SceneViewUtility.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/SceneViewUtility.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/SceneViewUtility.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/SceneViewUtility.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/SceneViewUtility.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/SceneViewUtility.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/SceneViewUtility.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/SceneViewUtility.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/StatusMessageUtility.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/StatusMessageUtility.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/StatusMessageUtility.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/StatusMessageUtility.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/StatusMessageUtility.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/StatusMessageUtility.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/StatusMessageUtility.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.Editor/Utilities/StatusMessageUtility.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.meta similarity index 77% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.meta index f17ae7c09..1cefcf7c3 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom.meta +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 17381b7978e919f449b1d2e8b0348126 +guid: 488279e7a4d64401a8464b03e3e1c0a8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/AssemblyInfo.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/AssemblyInfo.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/AssemblyInfo.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/AssemblyInfo.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/AssemblyInfo.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/AssemblyInfo.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/AssemblyInfo.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/AssemblyInfo.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/BaseBodyPairConnector.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/BaseBodyPairConnector.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/BaseBodyPairConnector.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/BaseBodyPairConnector.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/BaseBodyPairConnector.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/BaseBodyPairConnector.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/BaseBodyPairConnector.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/BaseBodyPairConnector.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs similarity index 61% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs index de33a8315..2352e1e38 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs @@ -1,7 +1,11 @@ using System.Collections.Generic; +using Unity.Burst; +using Unity.Collections; using Unity.Entities; using Unity.Mathematics; +using Unity.Physics.Extensions; using Unity.Physics.GraphicsIntegration; +using Unity.Transforms; using UnityEngine; namespace Unity.Physics.Authoring @@ -124,27 +128,73 @@ public override void Bake(PhysicsBodyAuthoring authoring) [RequireMatchingQueriesForUpdate] [UpdateAfter(typeof(EndColliderBakingSystem))] [WorldSystemFilter(WorldSystemFilterFlags.BakingSystem)] - public partial class PhysicsBodyBakingSystem : SystemBase + public partial struct PhysicsBodyBakingSystem : ISystem { - protected override void OnUpdate() + [BurstCompile] + public void OnUpdate(ref SystemState state) { - // Fill in the MassProperties based on the potential calculated value by BuildCompoundColliderBakingSystem - foreach (var(physicsMass, bodyData, collider) in - SystemAPI.Query, RefRO, RefRO>().WithOptions(EntityQueryOptions.IncludePrefab | EntityQueryOptions.IncludeDisabledEntities)) + var entityManager = state.EntityManager; + + // Fill in the mass properties based on custom mass properties for bodies without colliders + foreach (var(physicsMass, bodyData, entity) in + SystemAPI.Query, RefRO>() + .WithNone() + .WithEntityAccess() + .WithOptions(EntityQueryOptions.IncludePrefab | EntityQueryOptions.IncludeDisabledEntities)) { - // Build mass component - var massProperties = collider.ValueRO.MassProperties; - if (bodyData.ValueRO.OverrideDefaultMassDistribution) + physicsMass.ValueRW = CreatePhysicsMass(entityManager, entity, bodyData.ValueRO, MassProperties.UnitSphere); + } + + // Fill in the mass properties based on collider and custom mass properties if provided. + foreach (var(physicsMass, bodyData, collider, entity) in + SystemAPI.Query, RefRO, RefRO>() + .WithEntityAccess() + .WithOptions(EntityQueryOptions.IncludePrefab | EntityQueryOptions.IncludeDisabledEntities)) + { + physicsMass.ValueRW = CreatePhysicsMass(entityManager, entity, bodyData.ValueRO, + collider.ValueRO.MassProperties, true); + } + } + + private PhysicsMass CreatePhysicsMass(EntityManager entityManager, in Entity entity, + in PhysicsBodyAuthoringData inBodyData, in MassProperties inMassProperties, in bool hasCollider = false) + { + var massProperties = inMassProperties; + var scale = 1f; + + // Scale the provided mass properties by the LocalTransform.Scale value to create the correct + // initial mass distribution for the rigid body. + if (entityManager.HasComponent(entity)) + { + var localTransform = entityManager.GetComponentData(entity); + scale = localTransform.Scale; + + massProperties.Scale(scale); + } + + // Override the mass properties with user-provided values if specified + if (inBodyData.OverrideDefaultMassDistribution) + { + massProperties.MassDistribution = inBodyData.CustomMassDistribution; + if (hasCollider) { - massProperties.MassDistribution = bodyData.ValueRO.CustomMassDistribution; // Increase the angular expansion factor to account for the shift in center of mass - massProperties.AngularExpansionFactor += math.length(massProperties.MassDistribution.Transform.pos - bodyData.ValueRO.CustomMassDistribution.Transform.pos); + massProperties.AngularExpansionFactor += math.length(massProperties.MassDistribution.Transform.pos - + inBodyData.CustomMassDistribution.Transform.pos); } - - physicsMass.ValueRW = bodyData.ValueRO.IsDynamic ? - PhysicsMass.CreateDynamic(massProperties, bodyData.ValueRO.Mass) : - PhysicsMass.CreateKinematic(massProperties); } + + // Create the physics mass properties. Among others, this scales the unit mass inertia tensor + // by the scalar mass of the rigid body. + var physicsMass = inBodyData.IsDynamic ? + PhysicsMass.CreateDynamic(massProperties, inBodyData.Mass) : + PhysicsMass.CreateKinematic(massProperties); + + // Now, apply inverse scale to the final, baked physics mass properties in order to prevent invalid simulated mass properties + // caused by runtime scaling of the mass properties later on while building the physics world. + physicsMass = physicsMass.ApplyScale(math.rcp(scale)); + + return physicsMass; } } } diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsBodyBakingSystem.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsShapeBakingSystem.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsShapeBakingSystem.cs similarity index 74% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsShapeBakingSystem.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsShapeBakingSystem.cs index 152aada88..687f0e5e2 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsShapeBakingSystem.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/BakingSystems/PhysicsShapeBakingSystem.cs @@ -80,7 +80,10 @@ ShapeComputationDataBaking GetInputDataFromAuthoringComponent(PhysicsShapeAuthor BodyFromShape = ColliderInstanceBaking.GetCompoundFromChild(shapeTransform, bodyTransform), }; - var data = GenerateComputationData(shape, instance, colliderEntity); + ForceUniqueColliderAuthoring forceUniqueComponent = body.GetComponent(); + bool isForceUniqueComponentPresent = forceUniqueComponent != null && forceUniqueComponent.enabled; + + var data = GenerateComputationData(shape, bodyTransform, instance, colliderEntity, isForceUniqueComponentPresent); data.Instance.ConvertedAuthoringInstanceID = shapeInstanceID; data.Instance.ConvertedBodyInstanceID = bodyTransform.GetInstanceID(); @@ -170,33 +173,36 @@ bool GetMeshes(PhysicsShapeAuthoring shape, out List meshes, o meshes.Add(shape.CustomMesh); childrenToShape.Add(float4x4.identity); } - - // Try to get all the meshes in the children - var meshFilters = GetComponentsInChildren(); - - foreach (var meshFilter in meshFilters) + else { - if (meshFilter != null && meshFilter.sharedMesh != null) - { - var shapeAuthoring = GetComponent(meshFilter); - if (shapeAuthoring != null && shapeAuthoring != shape) - { - // Skip this case, since it will be treated independently - continue; - } - - meshes.Add(meshFilter.sharedMesh); + // Try to get all the meshes in the children + var meshFilters = GetComponentsInChildren(); - // Don't calculate the children to shape if not needed, to avoid approximation that could prevent collider to be shared - if (shape.transform.localToWorldMatrix.Equals(meshFilter.transform.localToWorldMatrix)) - childrenToShape.Add(float4x4.identity); - else + foreach (var meshFilter in meshFilters) + { + if (meshFilter != null && meshFilter.sharedMesh != null) { - var transform = math.mul(shape.transform.worldToLocalMatrix, meshFilter.transform.localToWorldMatrix); - childrenToShape.Add(transform); + var shapeAuthoring = GetComponent(meshFilter); + if (shapeAuthoring != null && shapeAuthoring != shape) + { + // Skip this case, since it will be treated independently + continue; + } + + meshes.Add(meshFilter.sharedMesh); + + // Don't calculate the children to shape if not needed, to avoid approximation that could prevent collider to be shared + if (shape.transform.localToWorldMatrix.Equals(meshFilter.transform.localToWorldMatrix)) + childrenToShape.Add(float4x4.identity); + else + { + var transform = math.mul(shape.transform.worldToLocalMatrix, + meshFilter.transform.localToWorldMatrix); + childrenToShape.Add(transform); + } + + DependsOn(meshes.Last()); } - - DependsOn(meshes.Last()); } } @@ -247,18 +253,60 @@ UnityEngine.Mesh CombineMeshes(PhysicsShapeAuthoring shape, List m_ForceUniqueID; + [SerializeField] + uint m_ForceUniqueID = 0; + [Serializable] struct CylindricalProperties { @@ -151,6 +158,18 @@ public bool OverrideCustomTags public CustomPhysicsMaterialTags CustomTags { get => m_Material.CustomTags; set => m_Material.CustomTags = value; } + public bool OverrideDetailedStaticMeshCollision + { + get => m_Material.OverrideDetailedStaticMeshCollision; + set => m_Material.OverrideDetailedStaticMeshCollision = value; + } + + public PhysicsMaterialFlag DetailedStaticMeshCollision + { + get => m_Material.DetailedStaticMeshCollision; + set => m_Material.DetailedStaticMeshCollision = value; + } + [SerializeField] PhysicsMaterialProperties m_Material = new PhysicsMaterialProperties(true); @@ -617,7 +636,7 @@ public void SetCapsule(CapsuleGeometryAuthoring geometry) m_PrimitiveOrientation = geometry.OrientationEuler; var radius = math.max(0f, geometry.Radius); - var height = math.max(0f, geometry.Height); + var height = math.max(radius * 2f, geometry.Height); m_PrimitiveSize = new float3(radius * 2f, radius * 2f, height); SyncCapsuleProperties(); @@ -722,28 +741,50 @@ void OnEnable() // included so tick box appears in Editor } - const int k_LatestVersion = 1; - - [SerializeField] - int m_SerializedVersion = 0; + const int k_VersionAddedForceUniqueID = 2; // added ForceUniqueID for stable artifact IDs + const int k_LatestVersion = k_VersionAddedForceUniqueID; - void ISerializationCallbackReceiver.OnBeforeSerialize() {} + [SerializeField, HideInInspector] + int m_SerializedVersion = k_LatestVersion; - void ISerializationCallbackReceiver.OnAfterDeserialize() => UpgradeVersionIfNecessary(); +#if UNITY_EDITOR + static string s_LastWarnedPath; + static double s_NextWarningTime; +#endif -#pragma warning disable 618 void UpgradeVersionIfNecessary() { if (m_SerializedVersion < k_LatestVersion) { - // old data from version < 1 have been removed - if (m_SerializedVersion < 1) - m_SerializedVersion = 1; + m_SerializedVersion = k_LatestVersion; + +#if UNITY_EDITOR + if (PrefabUtility.IsPartOfAnyPrefab(this) || gameObject.scene.IsValid()) + { + // Inform user that scene needs to be saved: + + var scenePath = gameObject.scene.path; + + if (string.IsNullOrEmpty(scenePath)) + { + var gameObjectPath = UnityEditor.Search.SearchUtils.GetHierarchyPath(gameObject); + UnityEngine.Debug.LogWarning("A Physics Shape component in game object '" + gameObjectPath + "' needs to be upgraded. " + + "To apply the upgrade, open and re-save the containing asset, " + + "or use the automatic version upgrade tool under 'Tools -> Unity Physics -> Upgrade Physics Shape Versions'.", gameObject); + } + else if (scenePath != s_LastWarnedPath || EditorApplication.timeSinceStartup > s_NextWarningTime) + { + UnityEngine.Debug.LogWarning("A Physics Shape component in a scene needs to be upgraded. To apply the upgrade, open and re-save the scene '" + scenePath + "', " + + "or use the automatic version upgrade tool under 'Tools -> Unity Physics -> Upgrade Physics Shape Versions'."); + + s_LastWarnedPath = scenePath; + s_NextWarningTime = EditorApplication.timeSinceStartup + 5f; + } + } +#endif } } -#pragma warning restore 618 - static void Validate(ref CylindricalProperties props) { props.Height = math.max(0f, props.Height); @@ -752,7 +793,10 @@ static void Validate(ref CylindricalProperties props) void OnValidate() { - UpgradeVersionIfNecessary(); + if (m_ForceUniqueID == 0) + { + m_ForceUniqueID = (uint)UnityEngine.Random.Range(1, Int32.MaxValue); + } m_PrimitiveSize = math.max(m_PrimitiveSize, new float3()); Validate(ref m_Capsule); @@ -789,6 +833,8 @@ void OnValidate() m_ConvexHullGenerationParameters.OnValidate(); PhysicsMaterialProperties.OnValidate(ref m_Material, true); + + UpgradeVersionIfNecessary(); } // matrix to transform point from shape space into world space @@ -802,22 +848,23 @@ internal float4x4 GetLocalToShapeMatrix() => internal unsafe void BakePoints(NativeArray points) { var localToShapeQuantized = GetLocalToShapeMatrix(); - using (var aabb = new NativeArray(1, Allocator.TempJob)) - { - new PhysicsShapeExtensions.GetAabbJob { Points = points, Aabb = aabb }.Run(); - HashableShapeInputs.GetQuantizedTransformations(localToShapeQuantized, aabb[0], out localToShapeQuantized); - } - using (var bakedPoints = new NativeArray(points.Length, Allocator.TempJob, NativeArrayOptions.UninitializedMemory)) + var aabb = new Aabb { Min = float.MaxValue, Max = float.MinValue }; + foreach (var p in points) + aabb.Include(p); + + HashableShapeInputs.GetQuantizedTransformations(localToShapeQuantized, aabb, out localToShapeQuantized); + using var bakedPoints = new NativeArray(points.Length, Allocator.TempJob, + NativeArrayOptions.UninitializedMemory); + + new BakePointsJob { - new BakePointsJob - { - Points = points, - LocalToShape = localToShapeQuantized, - Output = bakedPoints - }.Schedule(points.Length, 16).Complete(); + Points = points, + LocalToShape = localToShapeQuantized, + Output = bakedPoints + }.Schedule(points.Length, 16).Complete(); - UnsafeUtility.MemCpy(points.GetUnsafePtr(), bakedPoints.GetUnsafePtr(), points.Length * UnsafeUtility.SizeOf()); - } + UnsafeUtility.MemCpy(points.GetUnsafePtr(), bakedPoints.GetUnsafePtr(), + points.Length * UnsafeUtility.SizeOf()); } [BurstCompile] diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/PhysicsShapeAuthoring.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/PhysicsShapeAuthoring.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Bodies/PhysicsShapeAuthoring.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Bodies/PhysicsShapeAuthoring.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTagNames.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTagNames.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTagNames.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTagNames.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTagNames.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTagNames.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTagNames.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTagNames.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTags.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTags.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTags.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTags.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTags.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTags.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTags.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/CustomPhysicsMaterialTags.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs similarity index 66% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs index e13c6f8a0..02b253e60 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs @@ -1,6 +1,7 @@ #if UNITY_EDITOR using System.Linq; using UnityEditor; +using UnityEditor.Build; namespace Unity.Physics.Authoring { @@ -11,14 +12,14 @@ class EditorInitialization static EditorInitialization() { - var definesStr = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup); + var fromBuildTargetGroup = NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup); + var definesStr = PlayerSettings.GetScriptingDefineSymbols(fromBuildTargetGroup); var defines = definesStr.Split(';').ToList(); var found = defines.Find(define => define.Equals(k_CustomDefine)); if (found == null) { defines.Add(k_CustomDefine); - PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, - string.Join(";", defines.ToArray())); + PlayerSettings.SetScriptingDefineSymbols(fromBuildTargetGroup, string.Join(";", defines.ToArray())); } } } diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/EditorInitialization.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/BallAndSocketJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/BallAndSocketJoint.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/BallAndSocketJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/BallAndSocketJoint.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/BallAndSocketJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/BallAndSocketJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/BallAndSocketJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/BallAndSocketJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/BaseJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/BaseJoint.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/BaseJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/BaseJoint.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/BaseJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/BaseJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/BaseJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/BaseJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/FreeHingeJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/FreeHingeJoint.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/FreeHingeJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/FreeHingeJoint.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/FreeHingeJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/FreeHingeJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/FreeHingeJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/FreeHingeJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs similarity index 97% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs index 440e302b6..31071cead 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs @@ -26,7 +26,7 @@ public PhysicsJoint CreateLimitDOFJoint(RigidTransform offset) Min = 0, Max = 0, SpringFrequency = Constraint.DefaultSpringFrequency, - SpringDamping = Constraint.DefaultSpringDamping, + DampingRatio = Constraint.DefaultDampingRatio, MaxImpulse = MaxImpulse, }); } @@ -39,7 +39,7 @@ public PhysicsJoint CreateLimitDOFJoint(RigidTransform offset) Min = 0, Max = 0, SpringFrequency = Constraint.DefaultSpringFrequency, - SpringDamping = Constraint.DefaultSpringDamping, + DampingRatio = Constraint.DefaultDampingRatio, MaxImpulse = MaxImpulse, }); } diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitDOFJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedDistanceJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedDistanceJoint.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedDistanceJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedDistanceJoint.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedDistanceJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedDistanceJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedDistanceJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedDistanceJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedHingeJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedHingeJoint.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedHingeJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedHingeJoint.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedHingeJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedHingeJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedHingeJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/LimitedHingeJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/ModifyJointLimitsAuthoring.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/ModifyJointLimitsAuthoring.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/ModifyJointLimitsAuthoring.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/ModifyJointLimitsAuthoring.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/ModifyJointLimitsAuthoring.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/ModifyJointLimitsAuthoring.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/ModifyJointLimitsAuthoring.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/ModifyJointLimitsAuthoring.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/PrismaticJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/PrismaticJoint.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/PrismaticJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/PrismaticJoint.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/PrismaticJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/PrismaticJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/PrismaticJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/PrismaticJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/RagdollJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/RagdollJoint.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/RagdollJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/RagdollJoint.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/RagdollJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/RagdollJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/RagdollJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/RagdollJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/RigidJoint.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/RigidJoint.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/RigidJoint.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/RigidJoint.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/RigidJoint.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/RigidJoint.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Joints/RigidJoint.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Joints/RigidJoint.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs similarity index 86% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs index aba498180..9bfa1d75f 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs @@ -14,6 +14,8 @@ public class AngularVelocityMotor : BaseJoint public float TargetSpeed; [Tooltip("The magnitude of the maximum impulse the motor can exert in a single step. Applies only to the motor constraint.")] public float MaxImpulseAppliedByMotor = math.INFINITY; + [Tooltip("A ratio describing how quickly a motor will arrive at the target. A value of 0 will oscillate about a solution indefinitely, while a value of 1 is critically damped. Default value is 2530.126 which describes a stiff spring")] + public float DampingRatio = Constraint.DefaultDampingRatio; private float3 PerpendicularAxisLocal; private float3 PositionInConnectedEntity; @@ -48,7 +50,10 @@ public override void Bake(AngularVelocityMotor authoring) Position = authoring.PositionInConnectedEntity }, math.radians(authoring.TargetSpeed), - authoring.MaxImpulseAppliedByMotor + authoring.MaxImpulseAppliedByMotor, + + Constraint.DefaultSpringFrequency, + authoring.DampingRatio ); joint.SetImpulseEventThresholdAllConstraints(authoring.MaxImpulse); diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/AngularVelocityMotor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs similarity index 87% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs index 71f1c521d..15663e4ea 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs @@ -14,6 +14,8 @@ public class LinearVelocityMotor : BaseJoint public float TargetSpeed; [Tooltip("The magnitude of the maximum impulse the motor can exert in a single step. Applies only to the motor constraint.")] public float MaxImpulseAppliedByMotor = math.INFINITY; + [Tooltip("A ratio describing how quickly a motor will arrive at the target. A value of 0 will oscillate about a solution indefinitely, while a value of 1 is critically damped. Default value is 2530.126 which describes a stiff spring")] + public float DampingRatio = Constraint.DefaultDampingRatio; private float3 PerpendicularAxisLocal; private float3 PositionInConnectedEntity; @@ -51,7 +53,10 @@ public override void Bake(LinearVelocityMotor authoring) Position = authoring.PositionInConnectedEntity }, authoring.TargetSpeed, - authoring.MaxImpulseAppliedByMotor + authoring.MaxImpulseAppliedByMotor, + + Constraint.DefaultSpringFrequency, + authoring.DampingRatio ); joint.SetImpulseEventThresholdAllConstraints(authoring.MaxImpulse); diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/LinearVelocityMotor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs similarity index 83% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs index 4c48d16a8..c8c188ad1 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs @@ -13,6 +13,10 @@ public class PositionMotor : BaseJoint public float TargetDistance; [Tooltip("The magnitude of the maximum impulse the motor can exert in a single step. Applies only to the motor constraint.")] public float MaxImpulseAppliedByMotor = math.INFINITY; + [Tooltip("The spring frequency, in Hz. Default value is 74341.31 which describes a stiff spring.")] + public float SpringFrequency = Constraint.DefaultSpringFrequency; + [Tooltip("A ratio describing how quickly a motor will arrive at the target. A value of 0 will oscillate about a solution indefinitely, while a value of 1 critically damped. Default value is 2530.126 which describes a stiff spring")] + public float DampingRatio = Constraint.DefaultDampingRatio; private float3 PerpendicularAxisLocal; private float3 PositionInConnectedEntity; @@ -50,7 +54,10 @@ public override void Bake(PositionMotor authoring) Position = authoring.PositionInConnectedEntity }, authoring.TargetDistance, - authoring.MaxImpulseAppliedByMotor + authoring.MaxImpulseAppliedByMotor, + + authoring.SpringFrequency, + authoring.DampingRatio ); joint.SetImpulseEventThresholdAllConstraints(authoring.MaxImpulse); diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/PositionMotor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs similarity index 82% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs index 28acb8175..f44b60df8 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs @@ -14,6 +14,10 @@ public class RotationalMotor : BaseJoint public float TargetAngle; [Tooltip("The magnitude of the maximum impulse the motor can exert in one step. Applies only to the motor constraint.")] public float MaxImpulseAppliedByMotor = math.INFINITY; + [Tooltip("The spring frequency, in Hz. Default value is 74341.31 which describes a stiff spring.")] + public float SpringFrequency = Constraint.DefaultSpringFrequency; + [Tooltip("A ratio describing how quickly a motor will arrive at the target. A value of 0 will oscillate about a solution indefinitely, while a value of 1 critically damped. Default value is 2530.126 which describes a stiff spring")] + public float DampingRatio = Constraint.DefaultDampingRatio; private float3 PerpendicularAxisLocal; private float3 PositionInConnectedEntity; @@ -48,7 +52,10 @@ public override void Bake(RotationalMotor authoring) Position = authoring.PositionInConnectedEntity }, math.radians(authoring.TargetAngle), - authoring.MaxImpulseAppliedByMotor + authoring.MaxImpulseAppliedByMotor, + + authoring.SpringFrequency, + authoring.DampingRatio ); joint.SetImpulseEventThresholdAllConstraints(authoring.MaxImpulse); diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Motors/RotationalMotor.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryNames.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryNames.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryNames.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryNames.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryNames.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryNames.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryNames.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryNames.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryTags.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryTags.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryTags.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryTags.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryTags.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryTags.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryTags.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsCategoryTags.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs similarity index 88% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs index ab415411f..7b0aa4299 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs @@ -6,6 +6,8 @@ namespace Unity.Physics.Authoring { interface IPhysicsMaterialProperties { + PhysicsMaterialFlag DetailedStaticMeshCollision { get; set; } + CollisionResponsePolicy CollisionResponse { get; set; } PhysicsMaterialCoefficient Friction { get; set; } @@ -25,6 +27,7 @@ interface IPhysicsMaterialProperties interface IInheritPhysicsMaterialProperties : IPhysicsMaterialProperties { PhysicsMaterialTemplate Template { get; set; } + bool OverrideDetailedStaticMeshCollision { get; set; } bool OverrideCollisionResponse { get; set; } bool OverrideFriction { get; set; } bool OverrideRestitution { get; set; } @@ -33,6 +36,12 @@ interface IInheritPhysicsMaterialProperties : IPhysicsMaterialProperties bool OverrideCustomTags { get; set; } } + [Serializable] + public struct PhysicsMaterialFlag + { + public bool Value; + } + [Serializable] public struct PhysicsMaterialCoefficient { @@ -74,6 +83,9 @@ protected override void OnValidate(ref PhysicsMaterialCoefficient value) => value.Value = math.max(0f, value.Value); } + [Serializable] + class OverridablePhysicsMaterialFlag : OverridableValue { } + [Serializable] class OverridableCategoryTags : OverridableValue {} @@ -114,6 +126,25 @@ public CollisionResponsePolicy CollisionResponse Override = false }; + public bool OverrideDetailedStaticMeshCollision + { + get => m_DetailedStaticMeshCollision.Override; + set => m_DetailedStaticMeshCollision.Override = value; + } + + public PhysicsMaterialFlag DetailedStaticMeshCollision + { + get => Get(m_DetailedStaticMeshCollision, m_Template == null ? null : m_Template?.DetailedStaticMeshCollision); + set => m_DetailedStaticMeshCollision.Value = value; + } + + [SerializeField] + OverridablePhysicsMaterialFlag m_DetailedStaticMeshCollision = new OverridablePhysicsMaterialFlag + { + Value = new PhysicsMaterialFlag { Value = false }, + Override = false + }; + public bool OverrideFriction { get => m_Friction.Override; set => m_Friction.Override = value; } public PhysicsMaterialCoefficient Friction { diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialProperties.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs similarity index 88% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs index 67118b2c9..d6a9428ee 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs @@ -19,6 +19,8 @@ public sealed class PhysicsMaterialTemplate : ScriptableObject, IPhysicsMaterial public CustomPhysicsMaterialTags CustomTags { get => m_Value.CustomTags; set => m_Value.CustomTags = value; } + public PhysicsMaterialFlag DetailedStaticMeshCollision { get => m_Value.DetailedStaticMeshCollision; set => m_Value.DetailedStaticMeshCollision = value; } + [SerializeField] PhysicsMaterialProperties m_Value = new PhysicsMaterialProperties(false); diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsMaterialTemplate.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsRenderEntityAuthoring.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsRenderEntityAuthoring.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsRenderEntityAuthoring.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsRenderEntityAuthoring.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsRenderEntityAuthoring.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsRenderEntityAuthoring.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/PhysicsRenderEntityAuthoring.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/PhysicsRenderEntityAuthoring.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Unity.Physics.Custom.asmdef b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Unity.Physics.Custom.asmdef similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Unity.Physics.Custom.asmdef rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Unity.Physics.Custom.asmdef diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Unity.Physics.Custom.asmdef.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Unity.Physics.Custom.asmdef.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Unity.Physics.Custom.asmdef.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Unity.Physics.Custom.asmdef.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs similarity index 50% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs index 2d6eabaea..0cfa7f5b6 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs @@ -8,64 +8,25 @@ namespace Unity.Physics.Authoring { static partial class PhysicsShapeExtensions { - static void MakeZAxisPrimaryBasis(ref int3 basisPriority) - { - if (basisPriority[1] == 2) - basisPriority = basisPriority.yxz; - else if (basisPriority[2] == 2) - basisPriority = basisPriority.zxy; - } - #region Box [BurstCompile] internal struct BakeBoxJob : IJob { public NativeArray Box; - // TODO: make members PascalCase after merging static query fixes - public float4x4 localToWorld; - public float4x4 shapeToWorld; - public EulerAngles orientation; - - public static float4x4 GetBakeToShape(float4x4 localToWorld, float4x4 shapeToWorld, ref float3 center, - ref EulerAngles orientation) - { - float4x4 bakeToShape; - float4x4 rotationMatrix = float4x4.identity; - var basisPriority = k_DefaultAxisPriority; - var sheared = localToWorld.HasShear(); - if (localToWorld.HasNonUniformScale() || sheared) - { - if (sheared) - { - var transformScale = localToWorld.DecomposeScale(); - var basisToWorld = - GetBasisToWorldMatrix(localToWorld, center, orientation, transformScale); - basisPriority = GetBasisAxisPriority(basisToWorld); - } - - rotationMatrix = new float4x4( - new float4 { [basisPriority[2]] = 1 }, - new float4 { [basisPriority[1]] = 1 }, - new float4 { [basisPriority[0]] = 1 }, - new float4 { [3] = 1 } - ); - } - - bakeToShape = GetPrimitiveBakeToShapeMatrix(localToWorld, shapeToWorld, ref center, - ref orientation, 1f, basisPriority); - - bakeToShape = math.mul(bakeToShape, rotationMatrix); - return bakeToShape; - } + public float4x4 LocalToWorld; + public float4x4 ShapeToWorld; + public EulerAngles Orientation; + public bool BakeUniformScale; public void Execute() { var center = Box[0].Center; var size = Box[0].Size; var bevelRadius = Box[0].BevelRadius; + quaternion orientation = Orientation; - var bakeToShape = GetBakeToShape(localToWorld, shapeToWorld, ref center, ref orientation); + var bakeToShape = Math.GetBakeToShape(LocalToWorld, ShapeToWorld, ref center, ref orientation, BakeUniformScale); bakeToShape = math.mul(bakeToShape, float4x4.Scale(size)); var scale = bakeToShape.DecomposeScale(); @@ -77,7 +38,7 @@ public void Execute() Center = center, Orientation = orientation, Size = size, - BevelRadius = math.clamp(bevelRadius, 0f, 0.5f * math.cmin(size)) + BevelRadius = math.clamp(bevelRadius, 0f, 0.5f * math.cmin(size)), }; } } @@ -89,39 +50,18 @@ internal struct BakeCapsuleJob : IJob { public NativeArray Capsule; - // TODO: make members PascalCase after merging static query fixes - public float4x4 localToWorld; - public float4x4 shapeToWorld; - - public static float4x4 GetBakeToShape(float4x4 localToWorld, float4x4 shapeToWorld, ref float3 center, - ref EulerAngles orientation) - { - var basisPriority = k_DefaultAxisPriority; - var sheared = localToWorld.HasShear(); - if (localToWorld.HasNonUniformScale() || sheared) - { - if (sheared) - { - var transformScale = localToWorld.DecomposeScale(); - var basisToWorld = GetBasisToWorldMatrix(localToWorld, center, orientation, transformScale); - basisPriority = GetBasisAxisPriority(basisToWorld); - } - - MakeZAxisPrimaryBasis(ref basisPriority); - } - - return GetPrimitiveBakeToShapeMatrix(localToWorld, shapeToWorld, ref center, ref orientation, 1f, - basisPriority); - } + public float4x4 LocalToWorld; + public float4x4 ShapeToWorld; + public bool BakeUniformScale; public void Execute() { var radius = Capsule[0].Radius; var center = Capsule[0].Center; var height = Capsule[0].Height; - var orientationEuler = Capsule[0].OrientationEuler; + quaternion orientation = Capsule[0].OrientationEuler; - var bakeToShape = GetBakeToShape(localToWorld, shapeToWorld, ref center, ref orientationEuler); + var bakeToShape = Math.GetBakeToShape(LocalToWorld, ShapeToWorld, ref center, ref orientation, BakeUniformScale, makeZAxisPrimaryBasis: true); var scale = bakeToShape.DecomposeScale(); radius *= math.cmax(scale.xy); @@ -129,7 +69,7 @@ public void Execute() Capsule[0] = new CapsuleGeometryAuthoring { - OrientationEuler = orientationEuler, + OrientationEuler = orientation, Center = center, Height = height, Radius = radius @@ -145,31 +85,10 @@ internal struct BakeCylinderJob : IJob { public NativeArray Cylinder; - // TODO: make members PascalCase after merging static query fixes - public float4x4 localToWorld; - public float4x4 shapeToWorld; - public EulerAngles orientation; - - public static float4x4 GetBakeToShape(float4x4 localToWorld, float4x4 shapeToWorld, ref float3 center, - ref EulerAngles orientation) - { - var basisPriority = k_DefaultAxisPriority; - var sheared = localToWorld.HasShear(); - if (localToWorld.HasNonUniformScale() || sheared) - { - if (sheared) - { - var transformScale = localToWorld.DecomposeScale(); - var basisToWorld = GetBasisToWorldMatrix(localToWorld, center, orientation, transformScale); - basisPriority = GetBasisAxisPriority(basisToWorld); - } - - MakeZAxisPrimaryBasis(ref basisPriority); - } - - return GetPrimitiveBakeToShapeMatrix(localToWorld, shapeToWorld, ref center, ref orientation, 1f, - basisPriority); - } + public float4x4 LocalToWorld; + public float4x4 ShapeToWorld; + public EulerAngles Orientation; + public bool BakeUniformScale; public void Execute() { @@ -177,8 +96,9 @@ public void Execute() var height = Cylinder[0].Height; var radius = Cylinder[0].Radius; var bevelRadius = Cylinder[0].BevelRadius; + quaternion orientation = Orientation; - var bakeToShape = GetBakeToShape(localToWorld, shapeToWorld, ref center, ref orientation); + var bakeToShape = Math.GetBakeToShape(LocalToWorld, ShapeToWorld, ref center, ref orientation, BakeUniformScale, makeZAxisPrimaryBasis: true); var scale = bakeToShape.DecomposeScale(); height *= scale.z; @@ -197,7 +117,7 @@ public void Execute() } internal static CylinderGeometry BakeToBodySpace( - this CylinderGeometry cylinder, float4x4 localToWorld, float4x4 shapeToWorld, EulerAngles orientation + this CylinderGeometry cylinder, float4x4 localToWorld, float4x4 shapeToWorld, EulerAngles orientation, bool bakeUniformScale = true ) { using (var geometry = new NativeArray(1, Allocator.TempJob) { [0] = cylinder }) @@ -205,9 +125,10 @@ internal static CylinderGeometry BakeToBodySpace( var job = new BakeCylinderJob { Cylinder = geometry, - localToWorld = localToWorld, - shapeToWorld = shapeToWorld, - orientation = orientation + LocalToWorld = localToWorld, + ShapeToWorld = shapeToWorld, + Orientation = orientation, + BakeUniformScale = bakeUniformScale }; job.Run(); return geometry[0]; @@ -223,19 +144,19 @@ struct BakeSphereJob : IJob { public NativeArray Sphere; public NativeArray Orientation; - // TODO: make members PascalCase after merging static query fixes - public float4x4 localToWorld; - public float4x4 shapeToWorld; + public float4x4 LocalToWorld; + public float4x4 ShapeToWorld; + public bool BakeUniformScale; public void Execute() { var center = Sphere[0].Center; var radius = Sphere[0].Radius; - var orientation = Orientation[0]; + quaternion orientation = Orientation[0]; - var basisToWorld = GetBasisToWorldMatrix(localToWorld, center, orientation, 1f); - var basisPriority = basisToWorld.HasShear() ? GetBasisAxisPriority(basisToWorld) : k_DefaultAxisPriority; - var bakeToShape = GetPrimitiveBakeToShapeMatrix(localToWorld, shapeToWorld, ref center, ref orientation, 1f, basisPriority); + var basisToWorld = Math.GetBasisToWorldMatrix(LocalToWorld, center, orientation, 1f); + var basisPriority = basisToWorld.HasShear() ? Math.GetBasisAxisPriority(basisToWorld) : Math.Constants.DefaultAxisPriority; + var bakeToShape = Math.GetPrimitiveBakeToShapeMatrix(LocalToWorld, ShapeToWorld, ref center, ref orientation, basisPriority, BakeUniformScale); radius *= math.cmax(bakeToShape.DecomposeScale()); @@ -249,7 +170,7 @@ public void Execute() } internal static SphereGeometry BakeToBodySpace( - this SphereGeometry sphere, float4x4 localToWorld, float4x4 shapeToWorld, ref EulerAngles orientation + this SphereGeometry sphere, float4x4 localToWorld, float4x4 shapeToWorld, ref EulerAngles orientation, bool bakeUniformScale = true ) { using (var geometry = new NativeArray(1, Allocator.TempJob) { [0] = sphere }) @@ -259,8 +180,9 @@ internal static SphereGeometry BakeToBodySpace( { Sphere = geometry, Orientation = outOrientation, - localToWorld = localToWorld, - shapeToWorld = shapeToWorld + LocalToWorld = localToWorld, + ShapeToWorld = shapeToWorld, + BakeUniformScale = bakeUniformScale }; job.Run(); orientation = outOrientation[0]; @@ -276,28 +198,25 @@ internal static SphereGeometry BakeToBodySpace( struct BakePlaneJob : IJob { public NativeArray Vertices; - // TODO: make members PascalCase after merging static query fixes - public float3 center; - public float2 size; - public EulerAngles orientation; - public float4x4 localToWorld; - public float4x4 shapeToWorld; + public float3 Center; + public float2 Size; + public EulerAngles Orientation; + public float4x4 BakeFromShape; public void Execute() { var v = Vertices[0]; - GetPlanePoints(center, size, orientation, out v.c0, out v.c1, out v.c2, out v.c3); - var localToShape = math.mul(math.inverse(shapeToWorld), localToWorld); - v.c0 = math.mul(localToShape, new float4(v.c0, 1f)).xyz; - v.c1 = math.mul(localToShape, new float4(v.c1, 1f)).xyz; - v.c2 = math.mul(localToShape, new float4(v.c2, 1f)).xyz; - v.c3 = math.mul(localToShape, new float4(v.c3, 1f)).xyz; + GetPlanePoints(Center, Size, Orientation, out v.c0, out v.c1, out v.c2, out v.c3); + v.c0 = math.mul(BakeFromShape, new float4(v.c0, 1f)).xyz; + v.c1 = math.mul(BakeFromShape, new float4(v.c1, 1f)).xyz; + v.c2 = math.mul(BakeFromShape, new float4(v.c2, 1f)).xyz; + v.c3 = math.mul(BakeFromShape, new float4(v.c3, 1f)).xyz; Vertices[0] = v; } } internal static void BakeToBodySpace( - float3 center, float2 size, EulerAngles orientation, float4x4 localToWorld, float4x4 shapeToWorld, + float3 center, float2 size, EulerAngles orientation, float4x4 bakeFromShape, out float3 vertex0, out float3 vertex1, out float3 vertex2, out float3 vertex3 ) { @@ -306,11 +225,10 @@ internal static void BakeToBodySpace( var job = new BakePlaneJob { Vertices = geometry, - center = center, - size = size, - orientation = orientation, - localToWorld = localToWorld, - shapeToWorld = shapeToWorld + Center = center, + Size = size, + Orientation = orientation, + BakeFromShape = bakeFromShape }; job.Run(); vertex0 = geometry[0].c0; @@ -363,23 +281,5 @@ public void Execute() } } #endregion - - - #region AABB - [BurstCompile] - internal struct GetAabbJob : IJob - { - [ReadOnly] public NativeArray Points; - public NativeArray Aabb; - - public void Execute() - { - var aabb = new Aabb { Min = float.MaxValue, Max = float.MinValue }; - for (var i = 0; i < Points.Length; ++i) - aabb.Include(Points[i]); - Aabb[0] = aabb; - } - } - #endregion } } diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobs.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs similarity index 75% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs index 5ce90ef8e..eb59e1a83 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs @@ -1,7 +1,6 @@ using Unity.Collections; using Unity.Jobs; using Unity.Mathematics; -using UnityEngine; namespace Unity.Physics.Authoring { @@ -14,7 +13,9 @@ internal static float4x4 GetBakeToShape(PhysicsShapeAuthoring shape, float3 cent var transform = shape.transform; var localToWorld = (float4x4)transform.localToWorldMatrix; var shapeToWorld = shape.GetShapeToWorldMatrix(); - return BakeBoxJob.GetBakeToShape(localToWorld, shapeToWorld, ref center, ref orientation); + quaternion tmpOri = orientation; + return Math.GetBakeToShape(localToWorld, shapeToWorld, ref center, + ref tmpOri); } } @@ -25,8 +26,9 @@ internal static float4x4 GetBakeToShape(PhysicsShapeAuthoring shape, float3 cent var transform = shape.transform; var localToWorld = (float4x4)transform.localToWorldMatrix; var shapeToWorld = shape.GetShapeToWorldMatrix(); - return BakeCapsuleJob.GetBakeToShape(localToWorld, shapeToWorld, ref center, - ref orientation); + quaternion tmpOri = orientation; + return Math.GetBakeToShape(localToWorld, shapeToWorld, ref center, + ref tmpOri, bakeUniformScale: true, makeZAxisPrimaryBasis: true); } } @@ -51,7 +53,7 @@ public static void SetBakedCapsuleSize(this PhysicsShapeAuthoring shape, float h } internal static CapsuleGeometryAuthoring BakeToBodySpace( - this CapsuleGeometryAuthoring capsule, float4x4 localToWorld, float4x4 shapeToWorld + this CapsuleGeometryAuthoring capsule, float4x4 localToWorld, float4x4 shapeToWorld, bool bakeUniformScale = true ) { using (var geometry = new NativeArray(1, Allocator.TempJob) { [0] = capsule }) @@ -59,8 +61,9 @@ internal static CapsuleGeometryAuthoring BakeToBodySpace( var job = new BakeCapsuleJob { Capsule = geometry, - localToWorld = localToWorld, - shapeToWorld = shapeToWorld + LocalToWorld = localToWorld, + ShapeToWorld = shapeToWorld, + BakeUniformScale = bakeUniformScale }; job.Run(); return geometry[0]; @@ -74,8 +77,9 @@ internal static float4x4 GetBakeToShape(PhysicsShapeAuthoring shape, float3 cent var transform = shape.transform; var localToWorld = (float4x4)transform.localToWorldMatrix; var shapeToWorld = shape.GetShapeToWorldMatrix(); - return BakeCylinderJob.GetBakeToShape(localToWorld, shapeToWorld, ref center, - ref orientation); + quaternion tmpOri = orientation; + return Math.GetBakeToShape(localToWorld, shapeToWorld, ref center, + ref tmpOri, bakeUniformScale: true, makeZAxisPrimaryBasis: true); } } @@ -89,12 +93,13 @@ public static CylinderGeometry GetBakedCylinderProperties(this PhysicsShapeAutho public static void SetBakedSphereRadius(this PhysicsShapeAuthoring shape, float radius) { var sphere = shape.GetSphereProperties(out EulerAngles eulerAngles); + quaternion orientation = eulerAngles; var center = sphere.Center; radius = math.abs(radius); - var basisToWorld = GetBasisToWorldMatrix(shape.transform.localToWorldMatrix, center, eulerAngles, 1f); - var basisPriority = basisToWorld.HasShear() ? GetBasisAxisPriority(basisToWorld) : k_DefaultAxisPriority; - var bakeToShape = GetPrimitiveBakeToShapeMatrix(shape.transform.localToWorldMatrix, shape.GetShapeToWorldMatrix(), ref center, ref eulerAngles, 1f, basisPriority); + var basisToWorld = Math.GetBasisToWorldMatrix(shape.transform.localToWorldMatrix, center, orientation, 1f); + var basisPriority = basisToWorld.HasShear() ? Math.GetBasisAxisPriority(basisToWorld) : Math.Constants.DefaultAxisPriority; + var bakeToShape = Math.GetPrimitiveBakeToShapeMatrix(shape.transform.localToWorldMatrix, shape.GetShapeToWorldMatrix(), ref center, ref orientation, basisPriority); var scale = math.cmax(bakeToShape.DecomposeScale()); diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/BakeGeometryJobsExtensions.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs similarity index 98% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs index 7aab53f70..27bb04b86 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs @@ -70,7 +70,7 @@ public static class CapsuleGeometryAuthoringExtensions public static CapsuleGeometryAuthoring ToAuthoring(this CapsuleGeometry input) { var orientationEuler = EulerAngles.Default; - orientationEuler.SetValue(quaternion.LookRotationSafe(input.Vertex1 - input.Vertex0, math.up())); + orientationEuler.SetValue(quaternion.LookRotationSafe(input.Vertex0 - input.Vertex1, new float3 { z = 1f })); return new CapsuleGeometryAuthoring { Height = input.GetHeight(), diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/CapsuleGeometryAuthoring.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/ConvexHullGenerationParametersExtensions.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/ConvexHullGenerationParametersExtensions.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/ConvexHullGenerationParametersExtensions.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/ConvexHullGenerationParametersExtensions.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/ConvexHullGenerationParametersExtensions.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/ConvexHullGenerationParametersExtensions.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/ConvexHullGenerationParametersExtensions.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/ConvexHullGenerationParametersExtensions.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs similarity index 82% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs index a3103c333..80f400680 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs @@ -18,6 +18,13 @@ internal struct EulerAngles : IEquatable public static implicit operator quaternion(EulerAngles euler) => math.normalize(quaternion.Euler(math.radians(euler.Value), euler.RotationOrder)); + public static implicit operator EulerAngles(quaternion orientation) + { + var euler = new EulerAngles(); + euler.SetValue(orientation); + return euler; + } + public bool Equals(EulerAngles other) => Value.Equals(other.Value) && RotationOrder == other.RotationOrder; public override bool Equals(object obj) => obj is EulerAngles other && Equals(other); diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/EulerAngles.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/GetActiveChildrenScope.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/GetActiveChildrenScope.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/GetActiveChildrenScope.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/GetActiveChildrenScope.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/GetActiveChildrenScope.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/GetActiveChildrenScope.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/GetActiveChildrenScope.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/GetActiveChildrenScope.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs similarity index 57% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs index 95c8ef741..4b113f39a 100644 --- a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs +++ b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs @@ -20,109 +20,9 @@ static class PhysicsShapeExtensions_NonBursted public static partial class PhysicsShapeExtensions { - // used for de-skewing basis vectors; default priority assumes primary axis is z, secondary axis is y - public static readonly int3 k_DefaultAxisPriority = new int3(2, 1, 0); - // avoids drift in axes we're not actually changing public const float kMinimumChange = HashableShapeInputs.k_DefaultLinearPrecision; - static readonly int[] k_NextAxis = { 1, 2, 0 }; - static readonly int[] k_PrevAxis = { 2, 0, 1 }; - - // matrix to transform point from shape's local basis into world space - public static float4x4 GetBasisToWorldMatrix( - float4x4 localToWorld, float3 center, quaternion orientation, float3 size - ) => - math.mul(localToWorld, float4x4.TRS(center, orientation, size)); - - static float4 DeskewSecondaryAxis(float4 primaryAxis, float4 secondaryAxis) - { - var n0 = math.normalizesafe(primaryAxis); - var dot = math.dot(secondaryAxis, n0); - return secondaryAxis - n0 * dot; - } - - // priority is determined by length of each size dimension in the shape's basis after applying localToWorld transformation - public static int3 GetBasisAxisPriority(float4x4 basisToWorld) - { - var basisAxisLengths = basisToWorld.DecomposeScale(); - var max = math.cmax(basisAxisLengths); - var min = math.cmin(basisAxisLengths); - if (max == min) - return k_DefaultAxisPriority; - - var imax = max == basisAxisLengths.x ? 0 : max == basisAxisLengths.y ? 1 : 2; - - basisToWorld[k_NextAxis[imax]] = DeskewSecondaryAxis(basisToWorld[imax], basisToWorld[k_NextAxis[imax]]); - basisToWorld[k_PrevAxis[imax]] = DeskewSecondaryAxis(basisToWorld[imax], basisToWorld[k_PrevAxis[imax]]); - - basisAxisLengths = basisToWorld.DecomposeScale(); - min = math.cmin(basisAxisLengths); - var imin = min == basisAxisLengths.x ? 0 : min == basisAxisLengths.y ? 1 : 2; - if (imin == imax) - imin = k_NextAxis[imax]; - var imid = k_NextAxis[imax] == imin ? k_PrevAxis[imax] : k_NextAxis[imax]; - - return new int3(imax, imid, imin); - } - - [Conditional(CompilationSymbols.CollectionsChecksSymbol), Conditional(CompilationSymbols.DebugChecksSymbol)] - static void CheckBasisPriorityAndThrow(int3 basisPriority) - { - if ( - basisPriority.x == basisPriority.y - || basisPriority.x == basisPriority.z - || basisPriority.y == basisPriority.z - ) - throw new ArgumentException(nameof(basisPriority)); - } - - public static bool HasNonUniformScale(this float4x4 m) - { - var s = new float3(math.lengthsq(m.c0.xyz), math.lengthsq(m.c1.xyz), math.lengthsq(m.c2.xyz)); - return math.cmin(s) != math.cmax(s); - } - - // matrix to transform point on a primitive from bake space into space of the shape - internal static float4x4 GetPrimitiveBakeToShapeMatrix( - float4x4 localToWorld, float4x4 shapeToWorld, ref float3 center, ref EulerAngles orientation, float3 scale, int3 basisPriority - ) - { - CheckBasisPriorityAndThrow(basisPriority); - - var localToBasis = float4x4.TRS(center, orientation, scale); - // correct for imprecision in cases of no scale to prevent e.g., convex radius from being altered - if (scale.Equals(new float3(1f))) - { - localToBasis.c0 = math.normalizesafe(localToBasis.c0); - localToBasis.c1 = math.normalizesafe(localToBasis.c1); - localToBasis.c2 = math.normalizesafe(localToBasis.c2); - } - var localToBake = math.mul(localToWorld, localToBasis); - - if (localToBake.HasNonUniformScale() || localToBake.HasShear()) - { - // deskew second longest axis with respect to longest axis - localToBake[basisPriority[1]] = - DeskewSecondaryAxis(localToBake[basisPriority[0]], localToBake[basisPriority[1]]); - - // recompute third axes from first two - var n2 = math.normalizesafe( - new float4(math.cross(localToBake[basisPriority[0]].xyz, localToBake[basisPriority[1]].xyz), 0f) - ); - localToBake[basisPriority[2]] = n2 * math.dot(localToBake[basisPriority[2]], n2); - } - - var bakeToShape = math.mul(math.inverse(shapeToWorld), localToBake); - // transform baked center/orientation (i.e. primitive basis) into shape space - orientation.SetValue( - quaternion.LookRotationSafe(bakeToShape[basisPriority[0]].xyz, bakeToShape[basisPriority[1]].xyz) - ); - center = bakeToShape.c3.xyz; - - return bakeToShape; - } - internal static CollisionFilter GetFilter(this PhysicsShapeAuthoring shape) { // TODO: determine optimal workflow for specifying group index @@ -143,7 +43,8 @@ internal static Material GetMaterial(this PhysicsShapeAuthoring shape) Restitution = shape.Restitution.Value, RestitutionCombinePolicy = shape.Restitution.CombineMode, CollisionResponse = shape.CollisionResponse, - CustomTags = shape.CustomTags.Value + CustomTags = shape.CustomTags.Value, + EnableDetailedStaticMeshCollision = shape.DetailedStaticMeshCollision.Value }; } @@ -208,7 +109,7 @@ public static BoxGeometry GetBakedBoxProperties(this PhysicsShapeAuthoring shape } internal static BoxGeometry BakeToBodySpace( - this BoxGeometry box, float4x4 localToWorld, float4x4 shapeToWorld, EulerAngles orientation + this BoxGeometry box, float4x4 localToWorld, float4x4 shapeToWorld, EulerAngles orientation, bool bakeUniformScale = true ) { using (var geometry = new NativeArray(1, Allocator.TempJob) { [0] = box }) @@ -216,9 +117,10 @@ internal static BoxGeometry BakeToBodySpace( var job = new BakeBoxJob { Box = geometry, - localToWorld = localToWorld, - shapeToWorld = shapeToWorld, - orientation = orientation + LocalToWorld = localToWorld, + ShapeToWorld = shapeToWorld, + Orientation = orientation, + BakeUniformScale = bakeUniformScale }; job.Run(); return geometry[0]; @@ -281,9 +183,10 @@ internal static void GetBakedPlaneProperties( this PhysicsShapeAuthoring shape, out float3 vertex0, out float3 vertex1, out float3 vertex2, out float3 vertex3 ) { + var bakeToShape = shape.GetLocalToShapeMatrix(); shape.GetPlaneProperties(out var center, out var size, out EulerAngles orientation); BakeToBodySpace( - center, size, orientation, shape.transform.localToWorldMatrix, shape.GetShapeToWorldMatrix(), + center, size, orientation, bakeToShape, out vertex0, out vertex1, out vertex2, out vertex3 ); } @@ -294,60 +197,6 @@ public static void GetBakedConvexProperties(this PhysicsShapeAuthoring shape, Na shape.BakePoints(pointCloud.AsArray()); } - internal static Hash128 GetBakedMeshInputs(this PhysicsShapeAuthoring shape, HashSet meshAssets = null) - { - using (var inputs = new NativeList(8, Allocator.TempJob)) - { - shape.GetMeshProperties(default, default, true, inputs, meshAssets); - using (var hash = new NativeArray(1, Allocator.TempJob)) - using (var allSkinIndices = new NativeArray(0, Allocator.TempJob)) - using (var allBlendShapeWeights = new NativeArray(0, Allocator.TempJob)) - { - var job = new GetShapeInputsHashJob - { - Result = hash, - ForceUniqueIdentifier = (uint)(shape.ForceUnique ? shape.GetInstanceID() : 0), - Material = shape.GetMaterial(), - CollisionFilter = shape.GetFilter(), - BakeFromShape = shape.GetLocalToShapeMatrix(), - Inputs = inputs.AsArray(), - AllSkinIndices = allSkinIndices, - AllBlendShapeWeights = allBlendShapeWeights - }; - job.Run(); - return hash[0]; - } - } - } - - internal static Hash128 GetBakedConvexInputs(this PhysicsShapeAuthoring shape, HashSet meshAssets) - { - using (var inputs = new NativeList(8, Allocator.TempJob)) - using (var allSkinIndices = new NativeList(4096, Allocator.TempJob)) - using (var allBlendShapeWeights = new NativeList(64, Allocator.TempJob)) - { - shape.GetConvexHullProperties(default, true, inputs, allSkinIndices, allBlendShapeWeights, meshAssets); - - using (var hash = new NativeArray(1, Allocator.TempJob)) - { - var job = new GetShapeInputsHashJob - { - Result = hash, - ForceUniqueIdentifier = (uint)(shape.ForceUnique ? shape.GetInstanceID() : 0), - GenerationParameters = shape.ConvexHullGenerationParameters, - Material = shape.GetMaterial(), - CollisionFilter = shape.GetFilter(), - BakeFromShape = shape.GetLocalToShapeMatrix(), - Inputs = inputs.AsArray(), - AllSkinIndices = allSkinIndices.AsArray(), - AllBlendShapeWeights = allBlendShapeWeights.AsArray() - }; - job.Run(); - return hash[0]; - } - } - } - public static void GetBakedMeshProperties( this PhysicsShapeAuthoring shape, NativeList vertices, NativeList triangles, HashSet meshAssets = null diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PhysicsShapeExtensions.cs.meta diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PropertyAttributes.cs b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PropertyAttributes.cs similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PropertyAttributes.cs rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PropertyAttributes.cs diff --git a/Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PropertyAttributes.cs.meta b/Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PropertyAttributes.cs.meta similarity index 100% rename from Assets/Samples/Unity Physics/1.0.11/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PropertyAttributes.cs.meta rename to Assets/Samples/Unity Physics/1.4.3/Custom Physics Authoring/Unity.Physics.Custom/Utilities/PropertyAttributes.cs.meta diff --git a/Assets/SceneDependencyCache.meta b/Assets/SceneDependencyCache.meta index 3f56450af..ed4d629ba 100644 --- a/Assets/SceneDependencyCache.meta +++ b/Assets/SceneDependencyCache.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c56b135e467b854d8097047b65c5731 +guid: 7f2f36547e423804da0e69583c1b9ef7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/SceneDependencyCache/08c7fcc5c68e429b50a67220f73a6aaa.sceneWithBuildSettings b/Assets/SceneDependencyCache/08c7fcc5c68e429b50a67220f73a6aaa.sceneWithBuildSettings deleted file mode 100644 index 36e60605d..000000000 Binary files a/Assets/SceneDependencyCache/08c7fcc5c68e429b50a67220f73a6aaa.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/08c7fcc5c68e429b50a67220f73a6aaa.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/08c7fcc5c68e429b50a67220f73a6aaa.sceneWithBuildSettings.meta deleted file mode 100644 index 4b51db029..000000000 --- a/Assets/SceneDependencyCache/08c7fcc5c68e429b50a67220f73a6aaa.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 08c7fcc5c68e429b50a67220f73a6aaa -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/18f7c6e1f951aad73ecb2763e88c89d4.sceneWithBuildSettings b/Assets/SceneDependencyCache/18f7c6e1f951aad73ecb2763e88c89d4.sceneWithBuildSettings deleted file mode 100644 index f034276e5..000000000 Binary files a/Assets/SceneDependencyCache/18f7c6e1f951aad73ecb2763e88c89d4.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/18f7c6e1f951aad73ecb2763e88c89d4.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/18f7c6e1f951aad73ecb2763e88c89d4.sceneWithBuildSettings.meta deleted file mode 100644 index 3e72adb3e..000000000 --- a/Assets/SceneDependencyCache/18f7c6e1f951aad73ecb2763e88c89d4.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 18f7c6e1f951aad73ecb2763e88c89d4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/39dc4417425bdcae9334f24eefc0503a.sceneWithBuildSettings b/Assets/SceneDependencyCache/39dc4417425bdcae9334f24eefc0503a.sceneWithBuildSettings deleted file mode 100644 index 0ceb1289a..000000000 Binary files a/Assets/SceneDependencyCache/39dc4417425bdcae9334f24eefc0503a.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/39dc4417425bdcae9334f24eefc0503a.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/39dc4417425bdcae9334f24eefc0503a.sceneWithBuildSettings.meta deleted file mode 100644 index 17eb0c461..000000000 --- a/Assets/SceneDependencyCache/39dc4417425bdcae9334f24eefc0503a.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 39dc4417425bdcae9334f24eefc0503a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/3b5f7cfec319f58fc6c1b25bc2d042e3.sceneWithBuildSettings b/Assets/SceneDependencyCache/3b5f7cfec319f58fc6c1b25bc2d042e3.sceneWithBuildSettings deleted file mode 100644 index 09ae85ee9..000000000 Binary files a/Assets/SceneDependencyCache/3b5f7cfec319f58fc6c1b25bc2d042e3.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/3b5f7cfec319f58fc6c1b25bc2d042e3.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/3b5f7cfec319f58fc6c1b25bc2d042e3.sceneWithBuildSettings.meta deleted file mode 100644 index eadf830bd..000000000 --- a/Assets/SceneDependencyCache/3b5f7cfec319f58fc6c1b25bc2d042e3.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3b5f7cfec319f58fc6c1b25bc2d042e3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/49ac999c8a83a9e3defc2ecce43067e8.sceneWithBuildSettings b/Assets/SceneDependencyCache/49ac999c8a83a9e3defc2ecce43067e8.sceneWithBuildSettings deleted file mode 100644 index 7b0850ad7..000000000 Binary files a/Assets/SceneDependencyCache/49ac999c8a83a9e3defc2ecce43067e8.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/49ac999c8a83a9e3defc2ecce43067e8.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/49ac999c8a83a9e3defc2ecce43067e8.sceneWithBuildSettings.meta deleted file mode 100644 index d9835f7f5..000000000 --- a/Assets/SceneDependencyCache/49ac999c8a83a9e3defc2ecce43067e8.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 49ac999c8a83a9e3defc2ecce43067e8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/4c37f6d27fc06298b61fa91dd6d7ac46.sceneWithBuildSettings b/Assets/SceneDependencyCache/4c37f6d27fc06298b61fa91dd6d7ac46.sceneWithBuildSettings deleted file mode 100644 index b02334a1c..000000000 Binary files a/Assets/SceneDependencyCache/4c37f6d27fc06298b61fa91dd6d7ac46.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/4c37f6d27fc06298b61fa91dd6d7ac46.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/4c37f6d27fc06298b61fa91dd6d7ac46.sceneWithBuildSettings.meta deleted file mode 100644 index b6666e98f..000000000 --- a/Assets/SceneDependencyCache/4c37f6d27fc06298b61fa91dd6d7ac46.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c37f6d27fc06298b61fa91dd6d7ac46 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/5e27cbc1219781b7d70442c48e359e03.sceneWithBuildSettings b/Assets/SceneDependencyCache/5e27cbc1219781b7d70442c48e359e03.sceneWithBuildSettings deleted file mode 100644 index 340d1deb0..000000000 Binary files a/Assets/SceneDependencyCache/5e27cbc1219781b7d70442c48e359e03.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/5e27cbc1219781b7d70442c48e359e03.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/5e27cbc1219781b7d70442c48e359e03.sceneWithBuildSettings.meta deleted file mode 100644 index 0934060c2..000000000 --- a/Assets/SceneDependencyCache/5e27cbc1219781b7d70442c48e359e03.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5e27cbc1219781b7d70442c48e359e03 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/7fe1510e281ab8e8228a00ebbab4737d.sceneWithBuildSettings b/Assets/SceneDependencyCache/7fe1510e281ab8e8228a00ebbab4737d.sceneWithBuildSettings deleted file mode 100644 index c3fd675da..000000000 Binary files a/Assets/SceneDependencyCache/7fe1510e281ab8e8228a00ebbab4737d.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/7fe1510e281ab8e8228a00ebbab4737d.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/7fe1510e281ab8e8228a00ebbab4737d.sceneWithBuildSettings.meta deleted file mode 100644 index 2bde1ce0d..000000000 --- a/Assets/SceneDependencyCache/7fe1510e281ab8e8228a00ebbab4737d.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7fe1510e281ab8e8228a00ebbab4737d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/8a1f9d906603c2fbd05d6b09bc00ec29.sceneWithBuildSettings b/Assets/SceneDependencyCache/8a1f9d906603c2fbd05d6b09bc00ec29.sceneWithBuildSettings deleted file mode 100644 index 42c822169..000000000 Binary files a/Assets/SceneDependencyCache/8a1f9d906603c2fbd05d6b09bc00ec29.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/8a1f9d906603c2fbd05d6b09bc00ec29.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/8a1f9d906603c2fbd05d6b09bc00ec29.sceneWithBuildSettings.meta deleted file mode 100644 index c69df411a..000000000 --- a/Assets/SceneDependencyCache/8a1f9d906603c2fbd05d6b09bc00ec29.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8a1f9d906603c2fbd05d6b09bc00ec29 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/8c61756b2435de33288254efd0d4bc62.sceneWithBuildSettings b/Assets/SceneDependencyCache/8c61756b2435de33288254efd0d4bc62.sceneWithBuildSettings deleted file mode 100644 index 41699f515..000000000 Binary files a/Assets/SceneDependencyCache/8c61756b2435de33288254efd0d4bc62.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/8c61756b2435de33288254efd0d4bc62.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/8c61756b2435de33288254efd0d4bc62.sceneWithBuildSettings.meta deleted file mode 100644 index 6b2738a42..000000000 --- a/Assets/SceneDependencyCache/8c61756b2435de33288254efd0d4bc62.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8c61756b2435de33288254efd0d4bc62 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/9230c5f2ed30970a04ac7d552d0049ad.sceneWithBuildSettings b/Assets/SceneDependencyCache/9230c5f2ed30970a04ac7d552d0049ad.sceneWithBuildSettings deleted file mode 100644 index 14fddef13..000000000 Binary files a/Assets/SceneDependencyCache/9230c5f2ed30970a04ac7d552d0049ad.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/9230c5f2ed30970a04ac7d552d0049ad.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/9230c5f2ed30970a04ac7d552d0049ad.sceneWithBuildSettings.meta deleted file mode 100644 index 5925dd6c8..000000000 --- a/Assets/SceneDependencyCache/9230c5f2ed30970a04ac7d552d0049ad.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9230c5f2ed30970a04ac7d552d0049ad -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/a18b192b7fcf31730108b28822367f52.sceneWithBuildSettings b/Assets/SceneDependencyCache/a18b192b7fcf31730108b28822367f52.sceneWithBuildSettings deleted file mode 100644 index 32bb9c598..000000000 Binary files a/Assets/SceneDependencyCache/a18b192b7fcf31730108b28822367f52.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/a18b192b7fcf31730108b28822367f52.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/a18b192b7fcf31730108b28822367f52.sceneWithBuildSettings.meta deleted file mode 100644 index f1a46a047..000000000 --- a/Assets/SceneDependencyCache/a18b192b7fcf31730108b28822367f52.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a18b192b7fcf31730108b28822367f52 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/bbc58ac6cbfa213faf19f3014cb55590.sceneWithBuildSettings b/Assets/SceneDependencyCache/bbc58ac6cbfa213faf19f3014cb55590.sceneWithBuildSettings deleted file mode 100644 index 6b8d01b83..000000000 Binary files a/Assets/SceneDependencyCache/bbc58ac6cbfa213faf19f3014cb55590.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/bbc58ac6cbfa213faf19f3014cb55590.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/bbc58ac6cbfa213faf19f3014cb55590.sceneWithBuildSettings.meta deleted file mode 100644 index c9cd78d55..000000000 --- a/Assets/SceneDependencyCache/bbc58ac6cbfa213faf19f3014cb55590.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: bbc58ac6cbfa213faf19f3014cb55590 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/cb78f3d2a04cf1a9fecb00f723fe28e5.sceneWithBuildSettings b/Assets/SceneDependencyCache/cb78f3d2a04cf1a9fecb00f723fe28e5.sceneWithBuildSettings deleted file mode 100644 index 7783f4127..000000000 Binary files a/Assets/SceneDependencyCache/cb78f3d2a04cf1a9fecb00f723fe28e5.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/cb78f3d2a04cf1a9fecb00f723fe28e5.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/cb78f3d2a04cf1a9fecb00f723fe28e5.sceneWithBuildSettings.meta deleted file mode 100644 index b4c8ceb62..000000000 --- a/Assets/SceneDependencyCache/cb78f3d2a04cf1a9fecb00f723fe28e5.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cb78f3d2a04cf1a9fecb00f723fe28e5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/d750c2f08d2fd0da79719d2228006cb7.sceneWithBuildSettings b/Assets/SceneDependencyCache/d750c2f08d2fd0da79719d2228006cb7.sceneWithBuildSettings deleted file mode 100644 index 8641e9621..000000000 Binary files a/Assets/SceneDependencyCache/d750c2f08d2fd0da79719d2228006cb7.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/d750c2f08d2fd0da79719d2228006cb7.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/d750c2f08d2fd0da79719d2228006cb7.sceneWithBuildSettings.meta deleted file mode 100644 index ff883d388..000000000 --- a/Assets/SceneDependencyCache/d750c2f08d2fd0da79719d2228006cb7.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d750c2f08d2fd0da79719d2228006cb7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/dfe3892fe0d65d1e48b94f913dd89dc6.sceneWithBuildSettings b/Assets/SceneDependencyCache/dfe3892fe0d65d1e48b94f913dd89dc6.sceneWithBuildSettings deleted file mode 100644 index f25768467..000000000 Binary files a/Assets/SceneDependencyCache/dfe3892fe0d65d1e48b94f913dd89dc6.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/dfe3892fe0d65d1e48b94f913dd89dc6.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/dfe3892fe0d65d1e48b94f913dd89dc6.sceneWithBuildSettings.meta deleted file mode 100644 index a78b30db3..000000000 --- a/Assets/SceneDependencyCache/dfe3892fe0d65d1e48b94f913dd89dc6.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: dfe3892fe0d65d1e48b94f913dd89dc6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/ed1b433060a0c69457dcca9bbdb5e7bd.sceneWithBuildSettings b/Assets/SceneDependencyCache/ed1b433060a0c69457dcca9bbdb5e7bd.sceneWithBuildSettings deleted file mode 100644 index da3bc423c..000000000 Binary files a/Assets/SceneDependencyCache/ed1b433060a0c69457dcca9bbdb5e7bd.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/ed1b433060a0c69457dcca9bbdb5e7bd.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/ed1b433060a0c69457dcca9bbdb5e7bd.sceneWithBuildSettings.meta deleted file mode 100644 index d8948a4cd..000000000 --- a/Assets/SceneDependencyCache/ed1b433060a0c69457dcca9bbdb5e7bd.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed1b433060a0c69457dcca9bbdb5e7bd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/efac5432397c4e638e9d4be60468d8b5.sceneWithBuildSettings b/Assets/SceneDependencyCache/efac5432397c4e638e9d4be60468d8b5.sceneWithBuildSettings deleted file mode 100644 index e1c173489..000000000 Binary files a/Assets/SceneDependencyCache/efac5432397c4e638e9d4be60468d8b5.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/efac5432397c4e638e9d4be60468d8b5.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/efac5432397c4e638e9d4be60468d8b5.sceneWithBuildSettings.meta deleted file mode 100644 index 1dc2a775e..000000000 --- a/Assets/SceneDependencyCache/efac5432397c4e638e9d4be60468d8b5.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: efac5432397c4e638e9d4be60468d8b5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SceneDependencyCache/f51ef8615209907c0a90448ba55037d9.sceneWithBuildSettings b/Assets/SceneDependencyCache/f51ef8615209907c0a90448ba55037d9.sceneWithBuildSettings deleted file mode 100644 index 6a90567d6..000000000 Binary files a/Assets/SceneDependencyCache/f51ef8615209907c0a90448ba55037d9.sceneWithBuildSettings and /dev/null differ diff --git a/Assets/SceneDependencyCache/f51ef8615209907c0a90448ba55037d9.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/f51ef8615209907c0a90448ba55037d9.sceneWithBuildSettings.meta deleted file mode 100644 index fd4a0b77b..000000000 --- a/Assets/SceneDependencyCache/f51ef8615209907c0a90448ba55037d9.sceneWithBuildSettings.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f51ef8615209907c0a90448ba55037d9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f8eae0795..d484941fc 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78f0195ed0a27fcc61eae0cc982a82e4b10a28d3dff935179391718a44081e5a -size 422280 +oid sha256:097a3a8edaf1219f204f4494fa6935c86c84ce082bee284ecf180d64dcf2a48a +size 408000 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 903a50eb3..7cff23bc9 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bd1f447d1f7e66ad4516bce7a7820d244111639b43d8fa879fec212ba4030e4 -size 173346 +oid sha256:3b7733ec268952965346fd8f8ca934a362b374004b415c6820671b57424544a6 +size 170552 diff --git a/Assets/Scenes/Subscenes/Common.unity b/Assets/Scenes/Subscenes/Common.unity index f65a34dfd..9263cdf76 100644 --- a/Assets/Scenes/Subscenes/Common.unity +++ b/Assets/Scenes/Subscenes/Common.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df315beb7f54819ed9da06d48b882ad8aa34bbf38dc457ed98285c9f49dfa52a -size 155212 +oid sha256:f7c558c38488317b85e447a424fd0db9d8fed2ac67e68c1256bc9c649f9c2bab +size 19528 diff --git a/Assets/Scenes/Subscenes/Race.unity b/Assets/Scenes/Subscenes/Race.unity index 835a8dca5..0fd26c7ba 100644 --- a/Assets/Scenes/Subscenes/Race.unity +++ b/Assets/Scenes/Subscenes/Race.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3dee1f8e0aed0b9bb69cf27ce63619762a1fb24069ae43e5a520b3f085aa5c5 -size 1035500 +oid sha256:c33e1c7ef24e9344a1abea16a1620a5cc57e14f3c7e70eeac1ca8fbf6582cb22 +size 809106 diff --git a/Assets/GlobalEntitiesDependencies.meta b/Assets/Scenes/TestScenes.meta similarity index 77% rename from Assets/GlobalEntitiesDependencies.meta rename to Assets/Scenes/TestScenes.meta index c70a43556..d1e9571a8 100644 --- a/Assets/GlobalEntitiesDependencies.meta +++ b/Assets/Scenes/TestScenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc4ffa951bae41846b60dba037687855 +guid: 44000cb8e820b5343aad1d16b2bc5f47 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scenes/TestScenes/CarStudio.unity b/Assets/Scenes/TestScenes/CarStudio.unity new file mode 100644 index 000000000..a07453597 --- /dev/null +++ b/Assets/Scenes/TestScenes/CarStudio.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c6eb6e46fa93ddddbf37090e9e96cfc61ad2135bff60ff467a627a0e3d2c80f +size 22894 diff --git a/Assets/Scenes/TestScenes/CarStudio.unity.meta b/Assets/Scenes/TestScenes/CarStudio.unity.meta new file mode 100644 index 000000000..f08e45573 --- /dev/null +++ b/Assets/Scenes/TestScenes/CarStudio.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 10b76026fbca93541ae94558fe3d27f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestScenes/LobbyTest.unity b/Assets/Scenes/TestScenes/LobbyTest.unity new file mode 100644 index 000000000..8df1a9c4b --- /dev/null +++ b/Assets/Scenes/TestScenes/LobbyTest.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e84e6188ab3bdf19ea8cafc3b533fe5d16ec0fb9bf5227eb3375e84b70e81f89 +size 35801 diff --git a/Assets/Scenes/TestScenes/LobbyTest.unity.meta b/Assets/Scenes/TestScenes/LobbyTest.unity.meta new file mode 100644 index 000000000..b4fb3ccf0 --- /dev/null +++ b/Assets/Scenes/TestScenes/LobbyTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bce9304ee4ee86b42ae48dee6ddf26bf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestScenes/RaceTest.unity b/Assets/Scenes/TestScenes/RaceTest.unity new file mode 100644 index 000000000..677ff5c56 --- /dev/null +++ b/Assets/Scenes/TestScenes/RaceTest.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ae4e853ef7e15d187b9a92d58c01ef7e19de0df03a87c6aff4789930e426cc0 +size 39266 diff --git a/Assets/Scenes/TestScenes/RaceTest.unity.meta b/Assets/Scenes/TestScenes/RaceTest.unity.meta new file mode 100644 index 000000000..6ddeec02e --- /dev/null +++ b/Assets/Scenes/TestScenes/RaceTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0e70763b690a1ec44b98a8388396020d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestScenes/SphereTest.unity b/Assets/Scenes/TestScenes/SphereTest.unity new file mode 100644 index 000000000..c0ab1498a --- /dev/null +++ b/Assets/Scenes/TestScenes/SphereTest.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1d42d5886ac9fe6c26566fe843d1e6d264cd9836c709c4efb0985ecff0cd1fa +size 14597 diff --git a/Assets/Scenes/TestScenes/SphereTest.unity.meta b/Assets/Scenes/TestScenes/SphereTest.unity.meta new file mode 100644 index 000000000..5fffc5771 --- /dev/null +++ b/Assets/Scenes/TestScenes/SphereTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f27bb4aeca88ae040b4ed38d921f03cc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Sprites.meta b/Assets/Scenes/TestScenes/SubScenes.meta similarity index 77% rename from Assets/TextMesh Pro/Sprites.meta rename to Assets/Scenes/TestScenes/SubScenes.meta index 8b699e5fc..f600c544f 100644 --- a/Assets/TextMesh Pro/Sprites.meta +++ b/Assets/Scenes/TestScenes/SubScenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d0603b6d5186471b96c778c3949c7ce2 +guid: 149f517ed25bc8f4c9b99b110b471980 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scenes/TestScenes/SubScenes/LobbyTestSubScene.unity b/Assets/Scenes/TestScenes/SubScenes/LobbyTestSubScene.unity new file mode 100644 index 000000000..800069f10 --- /dev/null +++ b/Assets/Scenes/TestScenes/SubScenes/LobbyTestSubScene.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eec9efe6cbc3df7ec2b7017ed8997d7e6600d3d3efdbf8d92205123bb759ae5 +size 142551 diff --git a/Assets/Scenes/TestScenes/SubScenes/LobbyTestSubScene.unity.meta b/Assets/Scenes/TestScenes/SubScenes/LobbyTestSubScene.unity.meta new file mode 100644 index 000000000..f850b2b7f --- /dev/null +++ b/Assets/Scenes/TestScenes/SubScenes/LobbyTestSubScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9186eaeae2c01c441870df18d2b5d39a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestScenes/SubScenes/RaceTestSubScene.unity b/Assets/Scenes/TestScenes/SubScenes/RaceTestSubScene.unity new file mode 100644 index 000000000..f322c6a8d --- /dev/null +++ b/Assets/Scenes/TestScenes/SubScenes/RaceTestSubScene.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:780e2e439dfc4e992b9b15d439d1fa8d0aa3592e586ef1c2d21d5be6d8ed3190 +size 91116 diff --git a/Assets/Scenes/TestScenes/SubScenes/RaceTestSubScene.unity.meta b/Assets/Scenes/TestScenes/SubScenes/RaceTestSubScene.unity.meta new file mode 100644 index 000000000..45098d12a --- /dev/null +++ b/Assets/Scenes/TestScenes/SubScenes/RaceTestSubScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4efcaa2e9f1244b43a6e7c38f1bdab04 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestScenes/Track.unity b/Assets/Scenes/TestScenes/Track.unity new file mode 100644 index 000000000..926aab1af --- /dev/null +++ b/Assets/Scenes/TestScenes/Track.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6fe9c6c84d6863b99d92d56c54ad11c2546ec9b252b7f0c4c208c6e9029bc05 +size 18576 diff --git a/Assets/Scenes/TestScenes/Track.unity.meta b/Assets/Scenes/TestScenes/Track.unity.meta new file mode 100644 index 000000000..552e9dbaa --- /dev/null +++ b/Assets/Scenes/TestScenes/Track.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1cd793d3cdbf4749bb46633844ef925 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestScenes/Vivox.unity b/Assets/Scenes/TestScenes/Vivox.unity new file mode 100644 index 000000000..3fa110424 --- /dev/null +++ b/Assets/Scenes/TestScenes/Vivox.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e38c0352d6cc460faf70d720a3438345728fe2d7487587498779c5285bd6538 +size 20350 diff --git a/Assets/Scenes/TestScenes/Vivox.unity.meta b/Assets/Scenes/TestScenes/Vivox.unity.meta new file mode 100644 index 000000000..caa64134e --- /dev/null +++ b/Assets/Scenes/TestScenes/Vivox.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e58b53f4fc5f88842a1ded3f779102c5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Authoring/Car/CarInputAuthoring.cs b/Assets/Scripts/Authoring/Car/CarInputAuthoring.cs deleted file mode 100644 index ccf3710eb..000000000 --- a/Assets/Scripts/Authoring/Car/CarInputAuthoring.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Unity.Entities.Racing.Common; -using UnityEngine; - -namespace Unity.Entities.Racing.Authoring -{ - public class CarInputAuthoring : MonoBehaviour - { - private class Baker : Baker - { - public override void Bake(CarInputAuthoring authoring) - { - var entity = GetEntity(authoring.gameObject, TransformUsageFlags.None); - AddComponent(entity); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Authoring/Car/CarInputAuthoring.cs.meta b/Assets/Scripts/Authoring/Car/CarInputAuthoring.cs.meta deleted file mode 100644 index 129607ae2..000000000 --- a/Assets/Scripts/Authoring/Car/CarInputAuthoring.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5dc2559610af4aceb2b2e4773fca5e02 -timeCreated: 1649125386 \ No newline at end of file diff --git a/Assets/Scripts/Authoring/Car/PlayerAuthoring.cs b/Assets/Scripts/Authoring/Car/PlayerAuthoring.cs deleted file mode 100644 index 44a598776..000000000 --- a/Assets/Scripts/Authoring/Car/PlayerAuthoring.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Unity.Entities.Racing.Common; -using UnityEngine; - -namespace Unity.Entities.Racing.Authoring -{ - public class PlayerAuthoring : MonoBehaviour - { - private class Baker : Baker - { - public override void Bake(PlayerAuthoring authoring) - { - var entity = GetEntity(authoring.gameObject, TransformUsageFlags.None); - AddComponent(entity); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Authoring/Car/PlayerAuthoring.cs.meta b/Assets/Scripts/Authoring/Car/PlayerAuthoring.cs.meta deleted file mode 100644 index 79b1a98fb..000000000 --- a/Assets/Scripts/Authoring/Car/PlayerAuthoring.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e1f90ceec3a048eb949ce28fc78407c5 -timeCreated: 1658960209 \ No newline at end of file diff --git a/Assets/Scripts/Authoring/Car/VehicleAuthoring.cs b/Assets/Scripts/Authoring/Car/VehicleAuthoring.cs deleted file mode 100644 index 520d0181d..000000000 --- a/Assets/Scripts/Authoring/Car/VehicleAuthoring.cs +++ /dev/null @@ -1,231 +0,0 @@ -using System; -using System.Linq; -using Unity.Collections; -using Unity.Entities.Racing.Common; -using Unity.Mathematics; -using UnityEngine; - -namespace Unity.Entities.Racing.Authoring -{ - public class VehicleAuthoring : MonoBehaviour - { - [Header("Suspension")] public float RestLength = 0.45f; - public float SpringStiffness; - public float DamperStiffness; - - [Header("Steering")] public float TurnRadius; - public float SteeringForce = 2; - public float SteeringTime = 10; - - [Header("AntiRollBar")] public float AntiRollStiffness = 5000; - public float DownForce = 50; - - [Header("Acceleration")] public float DriveTorque = 50; - public float MaxDriveTorque = 70; - public AnimationCurve DriveTorqueCurve = new(); - public CollisionCategories BodyCollisionMask; - - [Header("Wheels")] public float WheelsRadius; - public CollisionCategories WheelsCollisionMask; - public WheelAuthoringHelper[] Wheels; - - [Header("Engine Sound")] public float MinAudioVolume = 0.4f; - public float MaxAudioVolume = 1.0f; - - [Serializable] - public class WheelAuthoringHelper - { - public GameObject WheelSpring; - public GameObject WheelMesh; - public WheelPlacement Placement; - public bool IsSteering; - [Range(0, 1)] public float GripFactor = 0.3f; - } - - private void OnDrawGizmos() - { - foreach (var wheel in Wheels) - { - var pos = wheel.WheelSpring.transform.position; - var wheelCenter = pos - RestLength * Vector3.up; - Gizmos.color = Color.green; - Gizmos.DrawLine(pos, pos - RestLength * Vector3.up); - - Gizmos.color = Color.gray; - Gizmos.DrawWireSphere(wheelCenter, WheelsRadius); - } - } - - private class Baker : Baker - { - public override void Bake(VehicleAuthoring authoring) - { - var vehicleBakingData = new VehicleBakingData - { - Authoring = authoring, - WheelVisual0 = GetEntity(authoring.Wheels[0].WheelMesh.gameObject, TransformUsageFlags.Dynamic), - WheelVisual1 = GetEntity(authoring.Wheels[1].WheelMesh.gameObject, TransformUsageFlags.Dynamic), - WheelVisual2 = GetEntity(authoring.Wheels[2].WheelMesh.gameObject, TransformUsageFlags.Dynamic), - WheelVisual3 = GetEntity(authoring.Wheels[3].WheelMesh.gameObject, TransformUsageFlags.Dynamic), - WheelSpring0 = GetEntity(authoring.Wheels[0].WheelSpring.gameObject, TransformUsageFlags.Dynamic), - WheelSpring1 = GetEntity(authoring.Wheels[1].WheelSpring.gameObject, TransformUsageFlags.Dynamic), - WheelSpring2 = GetEntity(authoring.Wheels[2].WheelSpring.gameObject, TransformUsageFlags.Dynamic), - WheelSpring3 = GetEntity(authoring.Wheels[3].WheelSpring.gameObject, TransformUsageFlags.Dynamic) - }; - - var vehicleEntity = GetEntity(authoring.gameObject, TransformUsageFlags.Dynamic); - AddComponent(vehicleEntity, vehicleBakingData); - - AddComponent(vehicleEntity); - AddComponent(vehicleEntity); - AddComponent(vehicleEntity); - AddComponent(vehicleEntity); - AddComponent(vehicleEntity); - - AddComponent(vehicleEntity, new VolumeData - { - Min = authoring.MinAudioVolume, - Max = authoring.MaxAudioVolume, - }); - } - } - } - - [TemporaryBakingType] - public struct VehicleBakingData : IComponentData - { - public UnityObjectRef Authoring; - public Entity WheelVisual0; - public Entity WheelVisual1; - public Entity WheelVisual2; - public Entity WheelVisual3; - - public Entity WheelSpring0; - public Entity WheelSpring1; - public Entity WheelSpring2; - public Entity WheelSpring3; - } - - [WorldSystemFilter(WorldSystemFilterFlags.BakingSystem)] - [UpdateInGroup(typeof(PostBakingSystemGroup))] - public partial class VehicleBaker : SystemBase - { - protected override void OnUpdate() - { - Entities - .WithEntityQueryOptions(EntityQueryOptions.IncludePrefab) - .WithStructuralChanges() - .ForEach((Entity entity, ref VehicleBakingData vehicleBakingData) => - { - var vehicleAuthoring = vehicleBakingData.Authoring.Value; - var chassis = new ChassisReference { Value = entity }; - var suspension = new Suspension - { - RestLength = vehicleAuthoring.RestLength, - SpringStiffness = vehicleAuthoring.SpringStiffness, - DamperStiffness = vehicleAuthoring.DamperStiffness, - SpringLength = vehicleAuthoring.RestLength - }; - //Setup steering - var wheelsBase = GetWheelsBaseDistance(vehicleAuthoring.Wheels); - var rearTrack = GetRearTrackDistance(vehicleAuthoring.Wheels); - var antiRoll = new AntiRollBar { Stiffness = vehicleAuthoring.AntiRollStiffness }; - var driveTorqueCurve = - AnimationCurveBlob.CreateBlob(vehicleAuthoring.DriveTorqueCurve, Allocator.Persistent); - var vehicleChassis = new VehicleChassis - { - DownForce = vehicleAuthoring.DownForce, - CollisionMask = vehicleAuthoring.BodyCollisionMask - }; - for (var i = 0; i < vehicleAuthoring.Wheels.Length; i++) - { - var wheelAuthoring = vehicleAuthoring.Wheels[i]; - - var visualMesh = i switch - { - 0 => vehicleBakingData.WheelVisual0, - 1 => vehicleBakingData.WheelVisual1, - 2 => vehicleBakingData.WheelVisual2, - 3 => vehicleBakingData.WheelVisual3, - _ => vehicleBakingData.WheelVisual0 - }; - - var wheel = new Wheel - { - CollisionMask = vehicleAuthoring.WheelsCollisionMask, - Radius = vehicleAuthoring.WheelsRadius, - DriveTorque = vehicleAuthoring.DriveTorque, - MaxDriveTorque = vehicleAuthoring.MaxDriveTorque, - DriveTorqueCurve = driveTorqueCurve, - GripFactor = wheelAuthoring.GripFactor, - Placement = wheelAuthoring.Placement, - VisualMesh = visualMesh, - }; - - var wheelEntity = i switch - { - 0 => vehicleBakingData.WheelSpring0, - 1 => vehicleBakingData.WheelSpring1, - 2 => vehicleBakingData.WheelSpring2, - 3 => vehicleBakingData.WheelSpring3, - _ => vehicleBakingData.WheelSpring0 - }; - - if (wheelAuthoring.IsSteering) - { - var steering = new Steering - { - TurnRadius = vehicleAuthoring.TurnRadius, - SteeringForce = vehicleAuthoring.SteeringForce, - WheelsBase = wheelsBase, - RearTrack = rearTrack, - SteeringTime = vehicleAuthoring.SteeringTime, - }; - EntityManager.AddComponentData(wheelEntity, steering); - } - - switch (wheelAuthoring.Placement) - { - case WheelPlacement.FrontRight: - antiRoll.FrontRightWheel = wheelEntity; - break; - case WheelPlacement.FrontLeft: - antiRoll.FrontLeftWheel = wheelEntity; - break; - case WheelPlacement.RearRight: - antiRoll.RearRightWheel = wheelEntity; - break; - case WheelPlacement.RearLeft: - antiRoll.RearLeftWheel = wheelEntity; - break; - } - - EntityManager.AddComponentData(wheelEntity, wheel); - EntityManager.AddComponentData(wheelEntity, suspension); - EntityManager.AddComponentData(wheelEntity, chassis); - EntityManager.AddComponent(wheelEntity); - EntityManager.AddComponent(wheelEntity); - } - - EntityManager.AddComponentData(entity, antiRoll); - EntityManager.AddComponentData(entity, vehicleChassis); - }).Run(); - } - - // Calculates the distance between front and rear wheels - private float GetWheelsBaseDistance(VehicleAuthoring.WheelAuthoringHelper[] wheels) - { - var frontLeft = wheels.First(w => w.Placement == WheelPlacement.FrontLeft); - var rearLeft = wheels.First(w => w.Placement == WheelPlacement.RearLeft); - return math.distance(frontLeft.WheelSpring.transform.position, rearLeft.WheelSpring.transform.position); - } - - // Calculates the distance between the rear wheels - private float GetRearTrackDistance(VehicleAuthoring.WheelAuthoringHelper[] wheels) - { - var rearRight = wheels.First(w => w.Placement == WheelPlacement.RearRight); - var rearLeft = wheels.First(w => w.Placement == WheelPlacement.RearLeft); - return math.distance(rearLeft.WheelSpring.transform.position, rearRight.WheelSpring.transform.position); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Authoring/Car/VehicleAuthoring.cs.meta b/Assets/Scripts/Authoring/Car/VehicleAuthoring.cs.meta deleted file mode 100644 index 91910fee7..000000000 --- a/Assets/Scripts/Authoring/Car/VehicleAuthoring.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 547b466801d44ac88c5c05602012313e -timeCreated: 1650694140 \ No newline at end of file diff --git a/Assets/Scripts/Authoring/Car/VehiclePlayerAuthoring.cs b/Assets/Scripts/Authoring/Car/VehiclePlayerAuthoring.cs new file mode 100644 index 000000000..1208e1ff2 --- /dev/null +++ b/Assets/Scripts/Authoring/Car/VehiclePlayerAuthoring.cs @@ -0,0 +1,35 @@ +using Unity.Entities.Racing.Common; +using UnityEngine; + +namespace Unity.Entities.Racing.Authoring +{ + public class VehiclePlayerAuthoring : MonoBehaviour + { + [Header("Engine Sound")] + [SerializeField, Range(0, 1)] + private float MinAudioVolume = 0.4f; + [SerializeField, Range(0, 1)] + private float MaxAudioVolume = 1.0f; + + private class Baker : Baker + { + public override void Bake(VehiclePlayerAuthoring authoring) + { + var entity = GetEntity(authoring.gameObject, TransformUsageFlags.Dynamic); + AddComponent(entity); + AddComponent(entity); + AddComponent(entity); + AddComponent(entity); + AddComponent(entity); + AddComponent(entity); + AddComponent(entity); + + AddComponent(entity, new VolumeData + { + Min = authoring.MinAudioVolume, + Max = authoring.MaxAudioVolume, + }); + } + } + } +} diff --git a/Assets/Scripts/Authoring/Car/VehiclePlayerAuthoring.cs.meta b/Assets/Scripts/Authoring/Car/VehiclePlayerAuthoring.cs.meta new file mode 100644 index 000000000..9a82787a1 --- /dev/null +++ b/Assets/Scripts/Authoring/Car/VehiclePlayerAuthoring.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3e65554d43563b8419cb2aa89aaecfc6 \ No newline at end of file diff --git a/Assets/Scripts/Components/Audio.cs b/Assets/Scripts/Components/Audio.cs index 99325c383..63fcde177 100644 --- a/Assets/Scripts/Components/Audio.cs +++ b/Assets/Scripts/Components/Audio.cs @@ -19,22 +19,4 @@ public struct VolumeData : IComponentData public float Min; public float Max; } - - /// - /// References the components to Calculate volume according to the velocity. - /// - public readonly partial struct AudioAspect : IAspect - { - public readonly Entity Self; - readonly RefRO m_Velocity; - readonly RefRO m_LocalToWorld; - private readonly RefRO m_VolumeData; - public LocalToWorld LocalToWorld => m_LocalToWorld.ValueRO; - public float GetVolumeRange() - { - var audioVolumeRange = new float2(m_VolumeData.ValueRO.Min, m_VolumeData.ValueRO.Max); - var linearVelocityMagnitude = math.length(m_Velocity.ValueRO.Linear); - return math.min(audioVolumeRange.y, audioVolumeRange.x + (linearVelocityMagnitude / 100f)); - } - } } \ No newline at end of file diff --git a/Assets/Scripts/Components/CheckPoint.cs b/Assets/Scripts/Components/CheckPoint.cs index bbf1f848c..e5fabc209 100644 --- a/Assets/Scripts/Components/CheckPoint.cs +++ b/Assets/Scripts/Components/CheckPoint.cs @@ -20,33 +20,4 @@ public struct CheckPointLocator : IComponentData { public float3 ResetPosition; } - - /// - /// Points to all check point component and transform, - /// for accessing the position location and rotation. - /// - public readonly partial struct CheckPointAspect : IAspect - { - readonly RefRO m_LocalTransform; - readonly RefRO m_CheckPoint; - public int CheckPointId => m_CheckPoint.ValueRO.Id; - public float3 LocalPosition => m_LocalTransform.ValueRO.Position; - public quaternion LocalRotation => m_LocalTransform.ValueRO.Rotation; - } - - /// - /// Accessing the Check point entity locator or visuals - /// - public readonly partial struct CheckPointLocatorAspect : IAspect - { - readonly RefRW m_LocalTransform; - readonly RefRO m_CheckPointLocator; - public float3 GetResetPosition => m_CheckPointLocator.ValueRO.ResetPosition; - - public void SetLocalTransform(float3 position, quaternion rotation) - { - m_LocalTransform.ValueRW.Position = position; - m_LocalTransform.ValueRW.Rotation = rotation; - } - } } \ No newline at end of file diff --git a/Assets/Scripts/Components/Connection.cs b/Assets/Scripts/Components/Connection.cs index 2ec1da3ec..4e1d05116 100644 --- a/Assets/Scripts/Components/Connection.cs +++ b/Assets/Scripts/Components/Connection.cs @@ -18,16 +18,4 @@ public struct TimeOutServer : IComponentData { public double Value; } - - /// - /// Stores the network global components to track the connection - /// - public readonly partial struct NetworkIdAspect : IAspect - { - public readonly Entity Self; - readonly RefRO m_NetworkId; - readonly RefRO m_NetworkSnapshot; - public int Id => m_NetworkId.ValueRO.Value; - public int EstimatedRTT => (int) m_NetworkSnapshot.ValueRO.EstimatedRTT; - } } \ No newline at end of file diff --git a/Assets/Scripts/Components/Connection.cs~ b/Assets/Scripts/Components/Connection.cs~ deleted file mode 100644 index 2ec1da3ec..000000000 --- a/Assets/Scripts/Components/Connection.cs~ +++ /dev/null @@ -1,33 +0,0 @@ -using Unity.NetCode; - -namespace Unity.Entities.Racing.Common -{ - /// - /// Tags component to allow auto connection to the multiplayer server - /// - public struct AutoConnect : IComponentData { } - - /// - /// Sets the state for resetting the server if all players got disconnected. - /// - public struct ResetServerOnDisconnect : IComponentData - { - } - - public struct TimeOutServer : IComponentData - { - public double Value; - } - - /// - /// Stores the network global components to track the connection - /// - public readonly partial struct NetworkIdAspect : IAspect - { - public readonly Entity Self; - readonly RefRO m_NetworkId; - readonly RefRO m_NetworkSnapshot; - public int Id => m_NetworkId.ValueRO.Value; - public int EstimatedRTT => (int) m_NetworkSnapshot.ValueRO.EstimatedRTT; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Components/Input.cs b/Assets/Scripts/Components/Input.cs index aa479d950..55558407b 100644 --- a/Assets/Scripts/Components/Input.cs +++ b/Assets/Scripts/Components/Input.cs @@ -1,10 +1,33 @@ +using System; +using System.Runtime.InteropServices; using Unity.NetCode; namespace Unity.Entities.Racing.Common { public struct CarInput : IInputComponentData { - public float Horizontal; + public float Break; + public float Handbreak; public float Vertical; + public float Horizontal; + public bool EngineStartStop; + } + + public struct PlayerGameInput : IComponentData + { + public IntPtr Value; + public GCHandle gCHandle; + public GameInput.VehicleActions GetInput() + { + gCHandle = GCHandle.FromIntPtr(Value); + var gameInput = gCHandle.Target as GameInput; + return gameInput.Vehicle; + } + + public void Free() + { + if (gCHandle.IsAllocated) + gCHandle.Free(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Components/Player.cs b/Assets/Scripts/Components/Player.cs index 96c0c8177..61cd5a60b 100644 --- a/Assets/Scripts/Components/Player.cs +++ b/Assets/Scripts/Components/Player.cs @@ -24,16 +24,6 @@ public struct PlayerName : IComponentData [GhostField] public FixedString64Bytes Name; } - /// - /// Access to player's name component - /// - public readonly partial struct PlayerNameAspect : IAspect - { - public readonly Entity Self; - readonly RefRO m_PlayerName; - public FixedString64Bytes Name => m_PlayerName.ValueRO.Name; - } - /// /// Tags the local player for filtering /// @@ -63,6 +53,18 @@ public struct Reset : IComponentData [GhostField] public quaternion TargetRotation; [GhostField] public bool Wheels; [GhostField] public bool Transform; + + public void ResetVehicle() + { + Transform = true; + Wheels = true; + } + + public void SetTargetTransform(float3 position, quaternion rotation) + { + TargetPosition = position; + TargetRotation = rotation; + } } /// @@ -76,151 +78,4 @@ public struct Player : IComponentData public bool HasFinished => State == PlayerState.Finished; public bool IsCelebrating => State == PlayerState.CelebrationIdle; } - - /// - /// Access the only the local player information - /// - public readonly partial struct LocalPlayerAspect : IAspect - { - private readonly RefRW CarInput; - private readonly RefRO m_LocalTransform; - private readonly RefRO m_LapProgress; - private readonly RefRW m_Player; - private readonly RefRW m_LocalUser; - private readonly RefRO m_LocalToWorld; - public Player Player => m_Player.ValueRO; - public LapProgress LapProgress => m_LapProgress.ValueRO; - public LocalToWorld LocalToWorld => m_LocalToWorld.ValueRO; - - public bool HasAnyInput() - { - return math.abs(CarInput.ValueRO.Horizontal) > 0 || math.abs(CarInput.ValueRO.Vertical) > 0; - } - - public bool HasValidPosition() - { - var isFinite = math.isfinite(m_LocalTransform.ValueRO.Position); - return isFinite.x && isFinite.y && isFinite.z; - } - } - - /// - /// Access all players information - /// - public readonly partial struct PlayerAspect : IAspect - { - public readonly Entity Self; - readonly RefRW m_LocalTransform; - readonly RefRO m_LocalToWorld; - readonly RefRO m_GhostOwner; - readonly RefRO m_Rank; - readonly RefRO m_Name; - readonly RefRW m_Player; - readonly RefRW m_Skin; - readonly RefRW m_LapProgress; - readonly RefRW m_Velocity; - readonly RefRW m_Reset; - - public int NetworkId => m_GhostOwner.ValueRO.NetworkId; - public int Rank => m_Rank.ValueRO.Value; - public FixedString64Bytes Name => m_Name.ValueRO.Name; - public bool IsCelebrating => Player.IsCelebrating && LapProgress.CelebrationIdleDelay > 0; - public bool FinishedCelebration => Player.IsCelebrating && LapProgress.CelebrationIdleDelay <= 0; - public bool HasArrived => (Player.IsCelebrating || Player.HasFinished) && LapProgress.HasArrived; - - [CreateProperty] public LapProgress LapProgress => m_LapProgress.ValueRO; - public Player Player => m_Player.ValueRO; - public Skin Skin => m_Skin.ValueRO; - public PhysicsVelocity Velocity => m_Velocity.ValueRO; - public Reset Reset => m_Reset.ValueRO; - public LocalToWorld LocalToWorld => m_LocalToWorld.ValueRO; - - public void ResetPlayer() - { - m_LocalTransform.ValueRW.Position = Reset.TargetPosition; - m_LocalTransform.ValueRW.Rotation = Reset.TargetRotation; - ResetVelocity(); - SetPlayerTransformReady(); - } - - public void AddedToLeaderboard() - { - m_LapProgress.ValueRW.AddedToLeaderboard = true; - } - - public void ResetLapProgress() - { - m_LapProgress.ValueRW.Reset(); - } - - public void ResetCheckpoint() - { - m_LapProgress.ValueRW.CurrentCheckPoint = 0; - } - - public void SetCheckPoint(float3 value) - { - m_LapProgress.ValueRW.LastCheckPointPosition = value; - } - - public void IncreaseLapCount() - { - m_LapProgress.ValueRW.CurrentLap++; - } - - public void RestLapCount() - { - m_LapProgress.ValueRW.CurrentLap = 0; - } - - public void ReduceCelebrationTimer(float value) - { - m_LapProgress.ValueRW.CelebrationIdleDelay -= value; - } - - public void UpdateSkin(bool value = false) - { - m_Skin.ValueRW.NeedUpdate = value; - } - - public void SetCelebration(float time, double elapseTime) - { - m_Player.ValueRW.State = PlayerState.CelebrationIdle; - m_LapProgress.ValueRW.CelebrationIdleDelay = time; - m_LapProgress.ValueRW.ArrivalTime = elapseTime; - } - - public void SetFinishedRace() - { - m_Player.ValueRW.State = PlayerState.Finished; - } - - public void ResetVelocity() - { - m_Velocity.ValueRW.Linear = float3.zero; - m_Velocity.ValueRW.Angular = float3.zero; - } - - public void ResetVehicle() - { - m_Reset.ValueRW.Transform = true; - m_Reset.ValueRW.Wheels = true; - } - - public void SetTargetTransform(float3 position, quaternion rotation) - { - m_Reset.ValueRW.TargetPosition = position; - m_Reset.ValueRW.TargetRotation = rotation; - } - - public void SetPlayerTransformReady() - { - m_Reset.ValueRW.Transform = false; - } - - public void SetPlayerWheelsReady() - { - m_Reset.ValueRW.Wheels = false; - } - } } \ No newline at end of file diff --git a/Assets/Scripts/Components/PlayerSpawners.cs b/Assets/Scripts/Components/PlayerSpawners.cs index 2ff6cf210..7eb4ce974 100644 --- a/Assets/Scripts/Components/PlayerSpawners.cs +++ b/Assets/Scripts/Components/PlayerSpawners.cs @@ -35,17 +35,4 @@ public struct SpawnPlayerRequest : IRpcCommand /// Tags a player who already spawns an instance. /// public struct PlayerSpawned : IComponentData { } - - /// - /// Access the necessary information to spawn a player. - /// - public readonly partial struct SpawnPlayerRequestAspect : IAspect - { - public readonly Entity Self; - readonly RefRO m_SpawnRequest; - readonly RefRO m_ReceiveRpcRequest; - public int Id => m_SpawnRequest.ValueRO.Id; - public FixedString64Bytes Name => m_SpawnRequest.ValueRO.Name; - public Entity SourceConnection => m_ReceiveRpcRequest.ValueRO.SourceConnection; - } } \ No newline at end of file diff --git a/Assets/Scripts/Components/Unity.Entities.Racing.Common.asmdef b/Assets/Scripts/Components/Unity.Entities.Racing.Common.asmdef index 09dcd1f97..8679a7ea6 100644 --- a/Assets/Scripts/Components/Unity.Entities.Racing.Common.asmdef +++ b/Assets/Scripts/Components/Unity.Entities.Racing.Common.asmdef @@ -13,9 +13,11 @@ "Unity.Scenes", "Unity.Cars.Utils", "Unity.NetCode.Physics", + "Unity.Cinemachine", "Unity.Mathematics.Extensions", - "Cinemachine", - "Unity.Networking.Transport" + "Unity.Networking.Transport", + "com.unity.vehicles", + "Input" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Scripts/Components/Vehicle.cs b/Assets/Scripts/Components/Vehicle.cs index fac07aa50..e3e5c0071 100644 --- a/Assets/Scripts/Components/Vehicle.cs +++ b/Assets/Scripts/Components/Vehicle.cs @@ -1,20 +1,10 @@ +using Unity.Mathematics; using Unity.NetCode; +using Unity.Physics; +using Unity.Vehicles; namespace Unity.Entities.Racing.Common { - /// - /// Calculate anti-roll bar and apply correction forces to reduce body roll - /// https://en.wikipedia.org/wiki/Anti-roll_bar - /// - public struct AntiRollBar : IComponentData - { - public float Stiffness; - public Entity FrontRightWheel; - public Entity FrontLeftWheel; - public Entity RearRightWheel; - public Entity RearLeftWheel; - } - /// /// Stores data for the chassis and physics forces. /// Quantized or unquantized. Where quantized means a float value is sent as an int with a certain multiplication factor which sets the precision (12.456789 can be sent as 12345 with a quantization factor of 1000). @@ -25,4 +15,77 @@ public struct VehicleChassis : IComponentData public CollisionCategories CollisionMask; [GhostField(Quantization = 10000)] public float DownForce; } + + + /// + /// The ghost variants (VehicleControlData_GhostVariant, WheelOnVehicle_GhostVariant) are required to update wheel visuals. + /// See: https://docs.unity3d.com/Packages/com.unity.vehicles@0.1/manual/networking.html + /// + [GhostComponentVariation(typeof(VehicleControlData))] + public struct VehicleControlData_GhostVariant + { + [GhostField()] + public float SteeringPosition; + [GhostField()] + public int TransmissionCurrentGear; + [GhostField()] + public float TransmissionCurrentGearRatio; + [GhostField()] + public float EngineAngularVelocity; + [GhostField()] + public bool EngineIsRunning; + } + + [GhostComponentVariation(typeof(WheelOnVehicle))] + public struct WheelOnVehicle_GhostVariant + { + [GhostField(SendData = false)] + public int WheelProtectorChildColliderIndex; + [GhostField(SendData = false)] + public RigidTransform SuspensionLocalTransform; + [GhostField(SendData = false)] + public Entity AxlePairedWheelEntity; + [GhostField(SendData = false)] + public int AxlePairedWheelIndex; + [GhostField(SendData = false)] + public Entity Entity; + [GhostField(SendData = false)] + public float MotorTorque; + [GhostField(SendData = false)] + public float BrakeTorque; + [GhostField(SendData = false)] + public float AngularVelocityLimit; + + [GhostField()] + public float SteerAngle; + [GhostField()] + public float AngularVelocity; + [GhostField()] + public float RotationAngle; + [GhostField()] + public float SuspensionLength; + [GhostField(SendData = false)] + public float VisualSuspensionLength; + + [GhostField(SendData = false)] + public bool IsGrounded; + [GhostField(SendData = false)] + public ColliderCastHit WheelHit; + [GhostField(SendData = false)] + public float3 SuspensionImpulse; + [GhostField(SendData = false)] + public float3 FrictionImpulse; + [GhostField()] + public float2 FrictionSlip; + [GhostField(SendData = false)] + public float2 FrictionSpeed; + + [GhostField()] + public bool StaticFrictionReferenceIsSet; + [GhostField()] + public float3 StaticFrictionRefPosition; + [GhostField(SendData = false)] + public bool DisableStaticFrictionSingleFrame; + } + } \ No newline at end of file diff --git a/Assets/Scripts/Components/Wheel.cs b/Assets/Scripts/Components/Wheel.cs index b464ec87f..6c7be13b7 100644 --- a/Assets/Scripts/Components/Wheel.cs +++ b/Assets/Scripts/Components/Wheel.cs @@ -5,67 +5,6 @@ namespace Unity.Entities.Racing.Common { - /// - /// Stores wheel data such as, visuals, rotation, size... - /// - [GhostComponent(SendDataForChildEntity = true)] - public struct Wheel : IComponentData - { - public CollisionCategories CollisionMask; - public float Radius; - public WheelPlacement Placement; - public float DriveTorque; - public float MaxDriveTorque; - public Entity VisualMesh; - public float RotationAngle; - public float GripFactor; - [GhostField(Quantization = 10000)] public float SteeringAngle; - [GhostField(Quantization = 10000)] public float DriveForce; - [GhostField(Quantization = 10000)] public float SidewaysForce; - public BlobAssetReference DriveTorqueCurve; - - public void Reset() - { - RotationAngle = 0; - SteeringAngle = 0; - SidewaysForce = 0; - DriveForce = 0; - } - - public void Lerp(Wheel newData, float delta) - { - RotationAngle = math.lerp(RotationAngle , newData.RotationAngle, delta); - SteeringAngle = math.lerp(SteeringAngle , newData.SteeringAngle, delta); - SidewaysForce = math.lerp(SidewaysForce , newData.SidewaysForce, delta); - DriveForce = (DriveForce + newData.DriveForce) * delta; - } - } - /// - /// Stores data for physics Steering. - /// - [GhostComponent(SendDataForChildEntity = true)] - public struct Steering : IComponentData - { - public float TurnRadius; - public float SteeringForce; - public float SteeringTime; - public float WheelsBase; - public float RearTrack; - - public float CalculateSteeringAngle(float amount, int dir) - { - return math.atan(WheelsBase / (TurnRadius + dir * RearTrack / 2)) * amount * SteeringForce; - } - } - - public enum WheelPlacement - { - FrontRight, - FrontLeft, - RearRight, - RearLeft - } - /// /// Based on Physics Category Names. /// @@ -77,86 +16,6 @@ public enum CollisionCategories Triggers = 0x4, Car = 0x8, } - - /// - /// Keeps the driving physics parameters. - /// - public struct WheelDriveControls : IComponentData - { - public float DriveAmount; - public float SteerAmount; - - public void Reset() - { - DriveAmount = 0; - SteerAmount = 0; - } - } - - /// - /// Stores suspension parameters for physics - /// - [GhostComponent(SendDataForChildEntity = true)] - public struct Suspension : IComponentData - { - public float RestLength; - public float SpringStiffness; - public float DamperStiffness; - [GhostField(Quantization = 100000)] public float SuspensionForce; - [GhostField(Quantization = 100000)] public float SpringLength; - [GhostField(Quantization = 100000)] public float SpringForce; - [GhostField(Quantization = 100000)] public float DamperForce; - - public void Reset() - { - SuspensionForce = 0; - SpringLength = RestLength; - SpringForce = 0; - DamperForce = 0; - } - - public void Lerp(Suspension newSuspension, float delta) - { - SuspensionForce = math.lerp(SuspensionForce , newSuspension.SpringForce, delta); - SpringLength = math.lerp(SpringLength , newSuspension.SpringLength, delta); - SpringForce = math.lerp(SpringForce , newSuspension.SpringForce, delta); - DamperForce = math.lerp(DamperForce , newSuspension.DamperForce, delta); - } - } - - /// - /// Stores all hit collision data for Wheels. - /// - [GhostComponent(SendDataForChildEntity = true)] - public struct WheelHitData : IComponentData - { - public float3 Origin; - public float3 WheelCenter; - public float3 Position; - public float SurfaceFriction; - public float3 Velocity; - public bool HasHit; - - public void Reset() - { - Origin = float3.zero; - WheelCenter = float3.zero; - Position = float3.zero; - SurfaceFriction = 0; - HasHit = false; - Velocity = float3.zero; - } - - public void Lerp(WheelHitData newHitData, float delta) - { - Origin = math.lerp(Origin, newHitData.Origin, delta); - WheelCenter = math.lerp(WheelCenter, newHitData.WheelCenter, delta); - Position = math.lerp(Position, newHitData.Position, delta); - SurfaceFriction = math.lerp(SurfaceFriction, newHitData.SurfaceFriction, delta); - Velocity = math.lerp(Velocity, newHitData.Velocity, delta); - } - } - /// /// Assign the chassis entity to the wheel for later processing /// @@ -164,31 +23,4 @@ public struct ChassisReference : IComponentData { public Entity Value; } - - public readonly partial struct WheelAspect : IAspect - { - readonly RefRW m_Wheel; - readonly RefRO m_ChassisReference; - public Wheel Wheel => m_Wheel.ValueRO; - public Entity ChassisReference => m_ChassisReference.ValueRO.Value; - - public void SetVisualMesh(Entity value) - { - m_Wheel.ValueRW.VisualMesh = value; - } - } - - /// - /// Access all components required for debuging wheels. - /// - public readonly partial struct WheelDebugAspect : IAspect - { - public readonly RefRW LocalTransform; - readonly RefRO m_Wheel; - readonly RefRO m_Suspension; - readonly RefRO m_WheelHitData; - public Wheel Wheel => m_Wheel.ValueRO; - public Suspension Suspension => m_Suspension.ValueRO; - public WheelHitData WheelHitData => m_WheelHitData.ValueRO; - } } \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/Audio/UpdateAudioSourceSystem.cs b/Assets/Scripts/Gameplay/Audio/UpdateAudioSourceSystem.cs index 8aecc2288..1444b0e76 100644 --- a/Assets/Scripts/Gameplay/Audio/UpdateAudioSourceSystem.cs +++ b/Assets/Scripts/Gameplay/Audio/UpdateAudioSourceSystem.cs @@ -1,5 +1,9 @@ using Unity.Burst; using Unity.Entities.Racing.Common; +using Unity.Mathematics; +using Unity.NetCode; +using Unity.Physics; +using Unity.Transforms; using static Unity.Entities.SystemAPI; namespace Unity.Entities.Racing.Gameplay @@ -13,9 +17,13 @@ public partial struct UpdateAudioSourceSystem : ISystem { public void OnDestroy(ref SystemState state) { - foreach (var car in Query().WithAll()) + foreach (var (car, entity) in Query>() + .WithAll() + .WithAll() + .WithAll() + .WithAll().WithEntityAccess()) { - PlayerAudioManager.Instance.DeleteAudioSource(car.Self); + PlayerAudioManager.Instance.DeleteAudioSource(entity); } } @@ -27,17 +35,26 @@ public void OnUpdate(ref SystemState state) } var ecb = new EntityCommandBuffer(state.WorldUpdateAllocator); - foreach (var car in Query().WithNone()) + foreach (var (car, entity) in Query>() + .WithAll() + .WithAll() + .WithAll().WithEntityAccess() + .WithNone()) { - var isLocalUser = state.EntityManager.HasComponent(car.Self); - PlayerAudioManager.Instance.AddAudioSource(car.Self, isLocalUser); - ecb.AddComponent(car.Self); + var isLocalUser = state.EntityManager.HasComponent(entity); + PlayerAudioManager.Instance.AddAudioSource(entity, isLocalUser); + ecb.AddComponent(entity); } - foreach (var audio in Query()) + foreach (var (localToWorld, volumeData, velocity, entity) in + Query, RefRO,RefRO>().WithEntityAccess()) { - PlayerAudioManager.Instance.UpdatePitchAndVolume(audio.Self, audio.GetVolumeRange()); - PlayerAudioManager.Instance.UpdatePosition(audio.Self, audio.LocalToWorld.Position, + var audioVolumeRange = new float2(volumeData.ValueRO.Min, volumeData.ValueRO.Max); + var linearVelocityMagnitude = math.length(velocity.ValueRO.Linear); + var audio = math.min(audioVolumeRange.y, audioVolumeRange.x + (linearVelocityMagnitude / 100f)); + + PlayerAudioManager.Instance.UpdatePitchAndVolume(entity, audio); + PlayerAudioManager.Instance.UpdatePosition(entity, localToWorld.ValueRO.Position, state.EntityManager); } @@ -75,9 +92,9 @@ public void OnUpdate(ref SystemState state) } else if (race.IsInProgress) { - foreach (var localPlayer in Query()) + foreach (var lapProgress in Query>().WithAll()) { - if (localPlayer.LapProgress.HasArrived) + if (lapProgress.ValueRO.HasArrived) { PlayerAudioManager.Instance.PlayCelebrationMusic(); } @@ -100,9 +117,13 @@ public partial struct UpdateUIAudioSourceSystem : ISystem { public void OnDestroy(ref SystemState state) { - foreach (var car in Query().WithAll()) + foreach (var (car, entity) in Query>() + .WithAll() + .WithAll() + .WithAll() + .WithAll().WithEntityAccess()) { - PlayerAudioManager.Instance.DeleteAudioSource(car.Self); + PlayerAudioManager.Instance.DeleteAudioSource(entity); } } diff --git a/Assets/Scripts/Gameplay/Audio/VivoxManager.cs b/Assets/Scripts/Gameplay/Audio/VivoxManager.cs deleted file mode 100644 index 06b484dab..000000000 --- a/Assets/Scripts/Gameplay/Audio/VivoxManager.cs +++ /dev/null @@ -1,347 +0,0 @@ -using System; -using System.ComponentModel; -using Unity.Services.Core; -using Unity.Services.Vivox; -using UnityEngine; -using VivoxUnity; -#if AUTH_PACKAGE_PRESENT -using Unity.Services.Authentication; -#endif - -namespace Unity.Entities.Racing.Gameplay -{ - public class VivoxManager : MonoBehaviour - { - public enum ChatCapability - { - TextOnly, - AudioOnly, - TextAndAudio - } - - public event ParticipantValueChangedHandler OnSpeechDetectedEvent; - public event ParticipantValueUpdatedHandler OnAudioEnergyChangedEvent; - public event ChannelTextMessageChangedHandler OnTextMessageLogReceivedEvent; - public event LoginStatusChangedHandler OnUserLoggedInEvent; - public event LoginStatusChangedHandler OnUserLoggedOutEvent; - public event ParticipantStatusChangedHandler OnParticipantAddedEvent; - public event ParticipantStatusChangedHandler OnParticipantRemovedEvent; - public event RecoveryStateChangedHandler OnRecoveryStateChangedEvent; - - public delegate void ChannelTextMessageChangedHandler(string sender, IChannelTextMessage channelTextMessage); - public delegate void LoginStatusChangedHandler(); - public delegate void ParticipantStatusChangedHandler(string username, ChannelId channel, IParticipant participant); - public delegate void ParticipantValueChangedHandler(string username, ChannelId channel, bool value); - public delegate void ParticipantValueUpdatedHandler(string username, ChannelId channel, double value); - public delegate void RecoveryStateChangedHandler(ConnectionRecoveryState recoveryState); - - public ILoginSession LoginSession; - private Account m_Account; - public static VivoxManager Instance { get; private set; } - public string Channel => "MultipleUserChannel"; - public IReadOnlyDictionary ActiveChannels => LoginSession?.ChannelSessions; - private Client _client => VivoxService.Instance.Client; - public LoginState LoginState { get; private set; } - public bool Muted => _client.AudioInputDevices.Muted; - private bool IsInitiliazed { get; set; } - - private void Awake() - { - if (Instance != this && Instance != null) - { - Debug.LogWarning("Multiple VivoxVoiceManager detected in the scene. " + - "Only one VivoxVoiceManager can exist at a time. " + - "The duplicate VivoxVoiceManager will be destroyed."); - Destroy(this); - return; - } - - Instance = this; - IsInitiliazed = false; - DontDestroyOnLoad(this); - } - - private async void Start() - { - // if the Unity project is not linked to a Unity services project. - if (string.IsNullOrEmpty(Application.cloudProjectId)) - { - Debug.LogWarning("To use Unity's dashboard services, " + - "you need to link your Unity project to a project ID. " + - "To do this, go to Project Settings to select your organization, " + - "select your project and then link a project ID. " + - "You also need to make sure your organization has access to the required products. " + - "Visit https://dashboard.unity3d.com to sign up."); - return; - } - - var options = new InitializationOptions(); - await UnityServices.InitializeAsync(options); -#if AUTH_PACKAGE_PRESENT - await AuthenticationService.Instance.SignInAnonymouslyAsync(); -#endif - if (UnityServices.State == ServicesInitializationState.Initialized) - { - IsInitiliazed = true; - VivoxService.Instance.Initialize(); - } - } - - private void OnApplicationQuit() - { - // Needed to add this to prevent some unsuccessful uninit, we can revisit to do better - if (IsInitiliazed) - { - Client.Cleanup(); - } - - if (IsInitiliazed && _client != null) - { - _client.Uninitialize(); - } - } - - public void SetMute(bool value) - { - _client.AudioInputDevices.Muted = value; - } - - public void Login(string displayName = null) - { - if (string.IsNullOrEmpty(displayName)) - { - displayName = "Player"; - } - - m_Account = new Account(displayName); - LoginSession = _client.GetLoginSession(m_Account); - LoginSession.PropertyChanged += OnLoginSessionPropertyChanged; - LoginSession.BeginLogin(LoginSession.GetLoginToken(), SubscriptionMode.Accept, null, null, null, ar => - { - try - { - LoginSession.EndLogin(ar); - } - catch (Exception e) - { - // Unbind if we failed to login. - Debug.LogException(e); - LoginSession.PropertyChanged -= OnLoginSessionPropertyChanged; - } - }); - } - - private void OnLoginSessionPropertyChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs) - { - if (propertyChangedEventArgs.PropertyName == "RecoveryState") - { - OnRecoveryStateChangedEvent?.Invoke(LoginSession.RecoveryState); - return; - } - - if (propertyChangedEventArgs.PropertyName != "State") - { - return; - } - - var loginSession = (ILoginSession)sender; - LoginState = loginSession.State; - switch (LoginState) - { - case LoginState.LoggingIn: - { - break; - } - case LoginState.LoggedIn: - { - OnUserLoggedInEvent?.Invoke(); - break; - } - case LoginState.LoggingOut: - { - break; - } - case LoginState.LoggedOut: - { - OnUserLoggedOutEvent?.Invoke(); - LoginSession.PropertyChanged -= OnLoginSessionPropertyChanged; - break; - } - } - } - - public void Logout() - { - if (LoginSession != null && LoginState != LoginState.LoggedOut && LoginState != LoginState.LoggingOut) - { - LoginSession.Logout(); - } - } - - public void JoinChannel() - { - if (LoginState == LoginState.LoggedIn) - { - var transmissionSwitch = true; - var chatCapability = ChatCapability.TextAndAudio; - var channel = new Channel(Channel); - - var channelSession = LoginSession.GetChannelSession(channel); - channelSession.PropertyChanged += OnChannelPropertyChanged; - channelSession.Participants.AfterKeyAdded += OnParticipantAdded; - channelSession.Participants.BeforeKeyRemoved += OnParticipantRemoved; - channelSession.Participants.AfterValueUpdated += OnParticipantValueUpdated; - channelSession.MessageLog.AfterItemAdded += OnMessageLogRecieved; - channelSession.BeginConnect(chatCapability != ChatCapability.TextOnly, - chatCapability != ChatCapability.AudioOnly, transmissionSwitch, channelSession.GetConnectToken(), - ar => - { - try - { - channelSession.EndConnect(ar); - } - catch (Exception e) - { - Debug.LogException(e); - } - }); - } - } - - public void DisconnectAllChannels() - { - if (ActiveChannels?.Count > 0) - { - foreach (var channelSession in ActiveChannels) - { - channelSession?.Disconnect(); - } - } - } - - private void OnParticipantAdded(object sender, KeyEventArg keyEventArg) - { - ValidateArgs(new[] { sender, keyEventArg }); - - // INFO: sender is the dictionary that changed and trigger the event. Need to cast it back to access it. - var source = (IReadOnlyDictionary)sender; - // Look up the participant via the key. - var participant = source[keyEventArg.Key]; - var username = participant.Account.Name; - var channel = participant.ParentChannelSession.Key; - var channelSession = participant.ParentChannelSession; - - // Trigger callback - OnParticipantAddedEvent?.Invoke(username, channel, participant); - } - - private void OnParticipantRemoved(object sender, KeyEventArg keyEventArg) - { - ValidateArgs(new[] { sender, keyEventArg }); - - // INFO: sender is the dictionary that changed and trigger the event. Need to cast it back to access it. - var source = (IReadOnlyDictionary)sender; - // Look up the participant via the key. - var participant = source[keyEventArg.Key]; - var username = participant.Account.Name; - var channel = participant.ParentChannelSession.Key; - var channelSession = participant.ParentChannelSession; - - if (participant.IsSelf) - { - // Now that we are disconnected, unsubscribe. - channelSession.PropertyChanged -= OnChannelPropertyChanged; - channelSession.Participants.AfterKeyAdded -= OnParticipantAdded; - channelSession.Participants.BeforeKeyRemoved -= OnParticipantRemoved; - channelSession.Participants.AfterValueUpdated -= OnParticipantValueUpdated; - channelSession.MessageLog.AfterItemAdded -= OnMessageLogRecieved; - - // Remove session. - var user = _client.GetLoginSession(m_Account); - user.DeleteChannelSession(channelSession.Channel); - } - - // Trigger callback - OnParticipantRemovedEvent?.Invoke(username, channel, participant); - } - - private static void ValidateArgs(object[] objs) - { - foreach (var obj in objs) - { - if (obj == null) - { - throw new ArgumentNullException(obj.GetType().ToString(), "Specify a non-null/non-empty argument."); - } - } - } - - private void OnParticipantValueUpdated(object sender, ValueEventArg valueEventArg) - { - ValidateArgs(new[] { sender, valueEventArg }); - - var source = (IReadOnlyDictionary)sender; - // Look up the participant via the key. - var participant = source[valueEventArg.Key]; - - var username = valueEventArg.Value.Account.Name; - var channel = valueEventArg.Value.ParentChannelSession.Key; - var property = valueEventArg.PropertyName; - - switch (property) - { - case "SpeechDetected": - { - OnSpeechDetectedEvent?.Invoke(username, channel, valueEventArg.Value.SpeechDetected); - break; - } - case "AudioEnergy": - { - OnAudioEnergyChangedEvent?.Invoke(username, channel, valueEventArg.Value.AudioEnergy); - break; - } - } - } - - private void OnChannelPropertyChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs) - { - ValidateArgs(new[] { sender, propertyChangedEventArgs }); - var channelSession = (IChannelSession)sender; - - // IF the channel has removed audio, make sure all the VAD indicators aren't showing speaking. - if (propertyChangedEventArgs.PropertyName == "AudioState" && - channelSession.AudioState == ConnectionState.Disconnected) - { - foreach (var participant in channelSession.Participants) - { - OnSpeechDetectedEvent?.Invoke(participant.Account.Name, channelSession.Channel, false); - } - } - - // IF the channel has fully disconnected, unsubscribe and remove. - if ((propertyChangedEventArgs.PropertyName == "AudioState" || - propertyChangedEventArgs.PropertyName == "TextState") && - channelSession.AudioState == ConnectionState.Disconnected && - channelSession.TextState == ConnectionState.Disconnected) - { - // Now that we are disconnected, unsubscribe. - channelSession.PropertyChanged -= OnChannelPropertyChanged; - channelSession.Participants.AfterKeyAdded -= OnParticipantAdded; - channelSession.Participants.BeforeKeyRemoved -= OnParticipantRemoved; - channelSession.Participants.AfterValueUpdated -= OnParticipantValueUpdated; - channelSession.MessageLog.AfterItemAdded -= OnMessageLogRecieved; - - // Remove session. - var user = _client.GetLoginSession(m_Account); - user.DeleteChannelSession(channelSession.Channel); - } - } - - private void OnMessageLogRecieved(object sender, QueueItemAddedEventArgs textMessage) - { - ValidateArgs(new[] { sender, textMessage }); - var channelTextMessage = textMessage.Value; - OnTextMessageLogReceivedEvent?.Invoke(channelTextMessage.Sender.DisplayName, channelTextMessage); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/Camera/CameraSwitcher.cs b/Assets/Scripts/Gameplay/Camera/CameraSwitcher.cs index d84cb93d0..c54ee4732 100644 --- a/Assets/Scripts/Gameplay/Camera/CameraSwitcher.cs +++ b/Assets/Scripts/Gameplay/Camera/CameraSwitcher.cs @@ -1,4 +1,4 @@ -using Cinemachine; +using Unity.Cinemachine; using UnityEngine; namespace Unity.Entities.Racing.Gameplay @@ -10,8 +10,8 @@ public class CameraSwitcher : MonoBehaviour { public static CameraSwitcher Instance; - [SerializeField] private CinemachineVirtualCamera mainCamera; - [SerializeField] private CinemachineVirtualCamera frontCamera; + [SerializeField] private CinemachineCamera mainCamera; + [SerializeField] private CinemachineCamera frontCamera; private void Awake() { diff --git a/Assets/Scripts/Gameplay/Camera/LobbyCameraSwitcherSystem.cs b/Assets/Scripts/Gameplay/Camera/LobbyCameraSwitcherSystem.cs index 571cef981..115e99d44 100644 --- a/Assets/Scripts/Gameplay/Camera/LobbyCameraSwitcherSystem.cs +++ b/Assets/Scripts/Gameplay/Camera/LobbyCameraSwitcherSystem.cs @@ -1,5 +1,6 @@ using Unity.Burst; using Unity.Entities.Racing.Common; +using Unity.Mathematics; using static Unity.Entities.SystemAPI; namespace Unity.Entities.Racing.Gameplay @@ -18,14 +19,16 @@ public void OnCreate(ref SystemState state) public void OnUpdate(ref SystemState state) { - foreach (var localPlayer in Query()) + foreach (var (carInput, player) + in Query, RefRO>().WithAll()) { - if (localPlayer.Player.State != PlayerState.Lobby) + if (player.ValueRO.State != PlayerState.Lobby) { return; } - if (localPlayer.HasAnyInput() && CameraSwitcher.Instance != null) + var hasAnyInput = math.abs(carInput.ValueRO.Horizontal) > 0 || math.abs(carInput.ValueRO.Vertical) > 0; + if (hasAnyInput && CameraSwitcher.Instance != null) { CameraSwitcher.Instance.ShowBackCamera(); state.Enabled = false; diff --git a/Assets/Scripts/Gameplay/Camera/MainMenuCameraSwitcher.cs b/Assets/Scripts/Gameplay/Camera/MainMenuCameraSwitcher.cs index 25bf41430..3b8258159 100644 --- a/Assets/Scripts/Gameplay/Camera/MainMenuCameraSwitcher.cs +++ b/Assets/Scripts/Gameplay/Camera/MainMenuCameraSwitcher.cs @@ -1,4 +1,4 @@ -using Cinemachine; +using Unity.Cinemachine; using UnityEngine; namespace Unity.Entities.Racing.Gameplay @@ -7,8 +7,8 @@ public class MainMenuCameraSwitcher : MonoBehaviour { public static MainMenuCameraSwitcher Instance; - [SerializeField] private CinemachineVirtualCamera mainCamera; - [SerializeField] private CinemachineVirtualCamera carSelectionCamera; + [SerializeField] private CinemachineCamera m_MainCamera; + [SerializeField] private CinemachineCamera m_CarSelectionCamera; private void Awake() { @@ -20,8 +20,8 @@ private void Awake() public void ShowCarSelectionCamera() { - carSelectionCamera.Priority = 10; - mainCamera.Priority = 6; + m_CarSelectionCamera.Priority = 10; + m_MainCamera.Priority = 6; } } } \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/Camera/TimelineManager.cs b/Assets/Scripts/Gameplay/Camera/TimelineManager.cs index bfe013313..0cb5e827c 100644 --- a/Assets/Scripts/Gameplay/Camera/TimelineManager.cs +++ b/Assets/Scripts/Gameplay/Camera/TimelineManager.cs @@ -1,4 +1,4 @@ -using Cinemachine; +using Unity.Cinemachine; using Unity.Mathematics; using UnityEngine; using UnityEngine.Playables; @@ -12,7 +12,7 @@ public class TimelineManager : MonoBehaviour { public static TimelineManager Instance; public PlayableDirector CountdownDirector; - public CinemachineVirtualCamera[] FinishCameras; + public CinemachineCamera[] FinishCameras; public PlayableDirector LeaderboardDirector; private int m_CurrentCameraIndex; diff --git a/Assets/Scripts/Gameplay/Camera/UpdateCameraTargetSystem.cs b/Assets/Scripts/Gameplay/Camera/UpdateCameraTargetSystem.cs index cf3f0cdf6..9f8cca830 100644 --- a/Assets/Scripts/Gameplay/Camera/UpdateCameraTargetSystem.cs +++ b/Assets/Scripts/Gameplay/Camera/UpdateCameraTargetSystem.cs @@ -1,4 +1,5 @@ using Unity.Entities.Racing.Common; +using Unity.Mathematics; using Unity.Transforms; using UnityEngine; using static Unity.Entities.SystemAPI; @@ -27,14 +28,17 @@ protected override void OnStartRunning() protected override void OnUpdate() { - foreach (var localPlayer in Query()) + foreach (var (transform, localToWorld) + in Query, RefRO>().WithAll()) { - if (!localPlayer.HasValidPosition()) + var isFinite = math.isfinite(transform.ValueRO.Position); + var hasValidPosition = isFinite.x && isFinite.y && isFinite.z; + if (!hasValidPosition) { return; } - m_CameraTarget.position = localPlayer.LocalToWorld.Position; - m_CameraTarget.rotation = localPlayer.LocalToWorld.Rotation; + m_CameraTarget.position = localToWorld.ValueRO.Position; + m_CameraTarget.rotation = localToWorld.ValueRO.Rotation; } } } diff --git a/Assets/Scripts/Gameplay/Camera/UpdateEndRaceCameraSystem.cs b/Assets/Scripts/Gameplay/Camera/UpdateEndRaceCameraSystem.cs index c83d4d715..c8747b748 100644 --- a/Assets/Scripts/Gameplay/Camera/UpdateEndRaceCameraSystem.cs +++ b/Assets/Scripts/Gameplay/Camera/UpdateEndRaceCameraSystem.cs @@ -1,4 +1,5 @@ using Unity.Entities.Racing.Common; +using Unity.NetCode; using Unity.Transforms; using UnityEngine; using static Unity.Entities.SystemAPI; @@ -44,9 +45,9 @@ protected override void OnUpdate() } var playerHasFinished = false; - foreach (var player in Query()) + foreach (var player in Query>().WithAll()) { - if (player.Player.HasFinished) + if (player.ValueRO.HasFinished) { playerHasFinished = true; } @@ -55,11 +56,13 @@ protected override void OnUpdate() if (playerHasFinished) { // Search the next car in the Rank - foreach (var car in Query()) + foreach (var (rank, entity) in Query>() + .WithAll() + .WithAll().WithEntityAccess()) { - if (car.Rank == race.PlayersFinished + 1) + if (rank.ValueRO.Value == race.PlayersFinished + 1) { - m_CurrentTarget = car.Self; + m_CurrentTarget = entity; break; } } diff --git a/Assets/Scripts/Gameplay/Connection/GoInGameSystem.cs b/Assets/Scripts/Gameplay/Connection/GoInGameSystem.cs index 865753b57..676ca4468 100644 --- a/Assets/Scripts/Gameplay/Connection/GoInGameSystem.cs +++ b/Assets/Scripts/Gameplay/Connection/GoInGameSystem.cs @@ -26,10 +26,11 @@ public void OnUpdate(ref SystemState state) FixedString32Bytes worldName = state.World.Name; // Go in game as soon as we have a connection set up (connection network ID has been set) - foreach (var networkId in Query().WithNone()) + foreach (var (networkId, entity) + in Query>().WithNone().WithEntityAccess()) { - Debug.Log($"[{worldName}] Go in game connection {networkId.Id}"); - commandBuffer.AddComponent(networkId.Self); + Debug.Log($"[{worldName}] Go in game connection {networkId.ValueRO.Value}"); + commandBuffer.AddComponent(entity); } commandBuffer.Playback(state.EntityManager); diff --git a/Assets/Scripts/Gameplay/Lobby/LobbyController.cs b/Assets/Scripts/Gameplay/Lobby/LobbyController.cs index b53995ee7..6ccaf8b9b 100644 --- a/Assets/Scripts/Gameplay/Lobby/LobbyController.cs +++ b/Assets/Scripts/Gameplay/Lobby/LobbyController.cs @@ -141,13 +141,16 @@ public void OnUpdate(ref SystemState state) var spawnPointBuffer = GetSingletonBuffer(); var index = 0; - foreach (var car in Query()) + foreach (var (car, reset) + in Query, RefRW>() + .WithAll() + .WithAll() + .WithAll()) { - if (car.Player.HasFinished) + if (car.ValueRO.HasFinished) { - car.ResetVehicle(); - car.SetTargetTransform(spawnPointBuffer[index].LobbyPosition, - spawnPointBuffer[index].LobbyRotation); + reset.ValueRW.ResetVehicle(); + reset.ValueRW.SetTargetTransform(spawnPointBuffer[index].LobbyPosition, spawnPointBuffer[index].LobbyRotation); } index++; } diff --git a/Assets/Scripts/Gameplay/Player/Leaderboard.cs b/Assets/Scripts/Gameplay/Player/Leaderboard.cs index 1ca3a0c09..dec446776 100644 --- a/Assets/Scripts/Gameplay/Player/Leaderboard.cs +++ b/Assets/Scripts/Gameplay/Player/Leaderboard.cs @@ -2,6 +2,7 @@ using Unity.Burst; using Unity.Collections; using Unity.Entities.Racing.Common; +using Unity.NetCode; using static Unity.Entities.SystemAPI; namespace Unity.Entities.Racing.Gameplay @@ -42,9 +43,6 @@ public void OnUpdate(ref SystemState state) // Reset Players in Race race.SetRaceState(RaceState.NotStarted); race.ResetRace(); - - var resetWheelsJob = new ResetWheelsJob(); - state.Dependency = resetWheelsJob.ScheduleParallel(state.Dependency); } SetSingleton(race); @@ -76,51 +74,58 @@ public void OnUpdate(ref SystemState state) var leaderboard = GetSingletonBuffer(); - foreach (var player in Query()) + foreach (var (playerName, rank, player, lapProgress, ghostOwner) + in Query, + RefRO, + RefRO, + RefRW, + RefRO>()) { var ping = 0; - if (player.HasArrived && !player.LapProgress.AddedToLeaderboard) + var hasArrived = (player.ValueRO.IsCelebrating || player.ValueRO.HasFinished) && lapProgress.ValueRO.HasArrived; + if (hasArrived && !lapProgress.ValueRO.AddedToLeaderboard) { - var time = player.LapProgress.ArrivalTime - race.InitialTime; - foreach (var networkId in Query()) + var time = lapProgress.ValueRO.ArrivalTime - race.InitialTime; + foreach (var (networkId, networkSnapshotAck) + in Query, RefRO>()) { - if (player.NetworkId == networkId.Id) + if (ghostOwner.ValueRO.NetworkId == networkId.ValueRO.Value) { - ping = networkId.EstimatedRTT; + ping = (int) networkSnapshotAck.ValueRO.EstimatedRTT; } } leaderboard.Add(new LeaderboardData { - Name = player.Name, - Rank = player.Rank, + Name = playerName.ValueRO.Name, + Rank = rank.ValueRO.Value, Time = (float) time, Ping = ping }); - player.AddedToLeaderboard(); + lapProgress.ValueRW.AddedToLeaderboard = true; } - if (player.Player.HasFinished && !player.LapProgress.HasArrived && !player.LapProgress.AddedToLeaderboard) + if (player.ValueRO.HasFinished && !lapProgress.ValueRO.HasArrived && !lapProgress.ValueRO.AddedToLeaderboard) { - foreach (var networkId in Query()) + foreach (var (networkId, networkSnapshotAck) in Query, RefRO>()) { - if (player.NetworkId == networkId.Id) + if (ghostOwner.ValueRO.NetworkId == networkId.ValueRO.Value) { - ping = networkId.EstimatedRTT; + ping = (int) networkSnapshotAck.ValueRO.EstimatedRTT; } } leaderboard.Add(new LeaderboardData { - Name = player.Name, - Rank = player.Rank, + Name = playerName.ValueRO.Name, + Rank = rank.ValueRO.Value, Time = 0, Ping = ping }); - player.AddedToLeaderboard(); + lapProgress.ValueRW.AddedToLeaderboard = true; } } diff --git a/Assets/Scripts/Gameplay/Player/LocalUserAssignmentSystem.cs b/Assets/Scripts/Gameplay/Player/LocalUserAssignmentSystem.cs index 61254be5b..9e8c7e089 100644 --- a/Assets/Scripts/Gameplay/Player/LocalUserAssignmentSystem.cs +++ b/Assets/Scripts/Gameplay/Player/LocalUserAssignmentSystem.cs @@ -24,11 +24,15 @@ public void OnUpdate(ref SystemState state) { var id = GetSingleton(); var ecb = new EntityCommandBuffer(Allocator.TempJob); - foreach (var player in Query().WithNone()) + foreach (var (ghostOwner, entity) in + Query>() + .WithAll() + .WithAll() + .WithNone().WithEntityAccess()) { - if (player.NetworkId == id.Value) + if (ghostOwner.ValueRO.NetworkId == id.Value) { - ecb.AddComponent(player.Self); + ecb.AddComponent(entity); } } diff --git a/Assets/Scripts/Gameplay/Player/PlayerSpawnSystem.cs b/Assets/Scripts/Gameplay/Player/PlayerSpawnSystem.cs index 14eff5a1f..e54658e0c 100644 --- a/Assets/Scripts/Gameplay/Player/PlayerSpawnSystem.cs +++ b/Assets/Scripts/Gameplay/Player/PlayerSpawnSystem.cs @@ -58,21 +58,22 @@ public void OnUpdate(ref SystemState state) var commandBuffer = new EntityCommandBuffer(Allocator.TempJob); var spawnPointBuffer = GetSingletonBuffer(true); var skinBuffer = GetSingletonBuffer(true); - foreach (var request in Query()) + foreach (var (request,receiveRpcCommandRequest, entity) + in Query, RefRO>().WithEntityAccess()) { - commandBuffer.DestroyEntity(request.Self); + commandBuffer.DestroyEntity(entity); - var entityNetwork = request.SourceConnection; + var entityNetwork = receiveRpcCommandRequest.ValueRO.SourceConnection; var networkId = state.EntityManager.GetComponentData(entityNetwork); Debug.Log($"Spawning player for connection {networkId.Value}"); // Instantiate the Car Base for this skin - var player = commandBuffer.Instantiate(skinBuffer[request.Id].BaseType); + var player = commandBuffer.Instantiate(skinBuffer[request.ValueRO.Id].BaseType); // The network ID owner must be set on the ghost owner component on the players // this is used internally for example to set up the CommandTarget properly commandBuffer.SetComponent(player, new GhostOwner {NetworkId = networkId.Value}); - var name = request.Name; + var name = request.ValueRO.Name; name = name == "" ? $"Player{networkId.Value}" : name; commandBuffer.SetComponent(player, new PlayerName {Name = name}); commandBuffer.SetComponent(player, new Player {State = PlayerState.Lobby}); @@ -102,7 +103,7 @@ public void OnUpdate(ref SystemState state) }); commandBuffer.SetComponent(player, new Skin { - Id = request.Id + Id = request.ValueRO.Id }); // Add the player to the linked entity group on the connection so it is destroyed diff --git a/Assets/Scripts/Gameplay/Player/PlayerTeleport.cs b/Assets/Scripts/Gameplay/Player/PlayerTeleport.cs index 8b3b3ff7a..cb1d5b23f 100644 --- a/Assets/Scripts/Gameplay/Player/PlayerTeleport.cs +++ b/Assets/Scripts/Gameplay/Player/PlayerTeleport.cs @@ -1,7 +1,9 @@ using Unity.Burst; using Unity.Collections; using Unity.Entities.Racing.Common; +using Unity.Mathematics; using Unity.NetCode; +using Unity.Physics; using Unity.Physics.GraphicsIntegration; using Unity.Transforms; using static Unity.Entities.SystemAPI; @@ -14,72 +16,43 @@ namespace Unity.Entities.Racing.Gameplay [BurstCompile] [WithAll(typeof(Simulate))] [WithAll(typeof(VehicleChassis))] + [WithAll(typeof(GhostOwner))] + [WithAll(typeof(Player))] + [WithAll(typeof(Rank))] public partial struct DisableSmoothingJob : IJobEntity { - private void Execute(ref PhysicsGraphicalSmoothing physicsGraphicalSmoothing, PlayerAspect playerAspect) + private void Execute(ref PhysicsGraphicalSmoothing physicsGraphicalSmoothing, in Reset reset) { - if (playerAspect.Reset.Transform) + if (reset.Transform) physicsGraphicalSmoothing.ApplySmoothing = 0; } } [BurstCompile] [WithAll(typeof(Simulate))] + [WithAll(typeof(GhostOwner))] + [WithAll(typeof(Player))] + [WithAll(typeof(Rank))] public partial struct TeleportPlayersJob : IJobEntity { - private void Execute(PlayerAspect player) + private void Execute(ref LocalTransform localTransform, + ref PhysicsVelocity velocity, + ref Reset reset) { - if (!player.Reset.Transform) + if (!reset.Transform) { return; } - - player.ResetPlayer(); - } - } - - [BurstCompile] - [WithAll(typeof(Simulate))] - public partial struct ResetWheelsJob : IJobEntity - { - public Entity Target; - - private void Execute(in ChassisReference chassisReference, ref Wheel wheel, ref Suspension suspension, - ref WheelHitData wheelHitData) - { - if (Target != Entity.Null && chassisReference.Value != Target) - { - return; - } - - wheel.Reset(); - suspension.Reset(); - wheelHitData.Reset(); + + localTransform.Position = reset.TargetPosition; + localTransform.Rotation = reset.TargetRotation; + + velocity.Linear = float3.zero; + velocity.Angular = float3.zero; + reset.Transform = false; } } - [UpdateAfter(typeof(TeleportCarSystem))] - public partial struct ResetWheelsSystem : ISystem - { - [BurstCompile] - public void OnUpdate(ref SystemState state) - { - // Change state of the players and count players in race - foreach (var playerAspect in Query()) - { - if (playerAspect.Reset.Wheels) - { - var resetWheelsJob = new ResetWheelsJob - { - Target = playerAspect.Self - }; - - state.Dependency = resetWheelsJob.ScheduleParallel(state.Dependency); - playerAspect.SetPlayerWheelsReady(); - } - } - } - } [UpdateInGroup(typeof(TransformSystemGroup))] public partial struct DisableSmoothingSystem : ISystem @@ -128,11 +101,14 @@ public void OnUpdate(ref SystemState state) var requests = m_ResetCarQuery.ToComponentDataArray(Allocator.Temp); foreach (var request in requests) { - foreach (var car in Query()) + foreach (var (ghostOwner, reset) in + Query,RefRW>() + .WithAll() + .WithAll()) { - if (car.NetworkId == request.Id) + if (ghostOwner.ValueRO.NetworkId == request.Id) { - car.ResetVehicle(); + reset.ValueRW.ResetVehicle(); } } } diff --git a/Assets/Scripts/Gameplay/Player/UpdateCarSkin.cs b/Assets/Scripts/Gameplay/Player/UpdateCarSkin.cs index 8061adcc4..471aa7519 100644 --- a/Assets/Scripts/Gameplay/Player/UpdateCarSkin.cs +++ b/Assets/Scripts/Gameplay/Player/UpdateCarSkin.cs @@ -1,6 +1,8 @@ using Unity.Burst; using Unity.Collections; using Unity.Entities.Racing.Common; +using Unity.Jobs; +using Unity.NetCode; using Unity.Transforms; using static Unity.Entities.SystemAPI; @@ -16,38 +18,50 @@ public partial struct SetPlayerSkinSystem : ISystem public void OnCreate(ref SystemState state) { + state.RequireForUpdate(); state.RequireForUpdate(); - m_CarWithoutSkinQuery = state.GetEntityQuery(new EntityQueryDesc - { - All = new ComponentType[] - { - typeof(LapProgress) - }, - None = new ComponentType[] - { - typeof(HasVisual) - } - }); + m_CarWithoutSkinQuery = state.GetEntityQuery(ComponentType.Exclude(), ComponentType.ReadOnly()); state.RequireForUpdate(m_CarWithoutSkinQuery); } [BurstCompile] public void OnUpdate(ref SystemState state) { - var commandBuffer = new EntityCommandBuffer(Allocator.Temp); + var commandBuffer = GetSingleton(). + CreateCommandBuffer(state.WorldUnmanaged); var skinBuffer = GetSingletonBuffer(true); - - foreach (var player in Query().WithNone()) + + foreach (var (skin, entity) in Query>() + .WithAll() + .WithAll() + .WithAll().WithEntityAccess() + .WithNone()) { - var visual = commandBuffer.Instantiate(skinBuffer[player.Skin.Id].VisualEntity); - commandBuffer.AddComponent(visual, new Parent { Value = player.Self }); - commandBuffer.AddComponent(player.Self, - new Skin { Id = player.Skin.Id, NeedUpdate = true, VisualCar = visual }); - commandBuffer.AddComponent(player.Self); + var visual = commandBuffer.Instantiate(skinBuffer[skin.ValueRO.Id].VisualEntity); + commandBuffer.AddComponent(visual, new Parent { Value = entity }); + commandBuffer.AddComponent(entity); + commandBuffer.AddComponent(entity, + new Skin + { + Id = skin.ValueRO.Id, + NeedUpdate = true, + VisualCar = visual + }); } + } + } - commandBuffer.Playback(state.EntityManager); - commandBuffer.Dispose(); + public struct HideVisualSkinWheelsJob : IJobParallelFor + { + public NativeArray Wheels; + [ReadOnly] + public ComponentLookup LocalToWorldLookup; + public EntityCommandBuffer.ParallelWriter ECB; + public void Execute(int index) + { + var entity = Wheels[index]; + var localToWorld = LocalToWorldLookup[entity]; + ECB.SetComponent(index, entity, LocalTransform.FromPositionRotationScale(localToWorld.Position, localToWorld.Rotation, 0)); } } @@ -62,6 +76,7 @@ public partial struct SetWheelVisualSystem : ISystem [BurstCompile] public void OnCreate(ref SystemState state) { + state.RequireForUpdate(); m_VisualWheelsLookup = state.GetComponentLookup(); state.RequireForUpdate(); } @@ -70,45 +85,50 @@ public void OnCreate(ref SystemState state) public void OnUpdate(ref SystemState state) { m_VisualWheelsLookup.Update(ref state); - var commandBuffer = new EntityCommandBuffer(Allocator.Temp); - - foreach (var player in Query()) + var commandBuffer = GetSingleton(). + CreateCommandBuffer(state.WorldUnmanaged); + + foreach (var (skin, entity) in Query>() + .WithAll() + .WithAll() + .WithAll().WithEntityAccess()) { - if (!player.Skin.NeedUpdate) + if (!skin.ValueRO.NeedUpdate) { - return; + continue; } - if (m_VisualWheelsLookup.TryGetComponent(player.Skin.VisualCar, out var visual)) + if (m_VisualWheelsLookup.TryGetComponent(skin.ValueRO.VisualCar, out var visual)) { - player.UpdateSkin(); - - foreach (var wheel in Query()) - { - if (wheel.ChassisReference == player.Self) - { - switch (wheel.Wheel.Placement) - { - case WheelPlacement.FrontRight: - wheel.SetVisualMesh(visual.WheelFR); - break; - case WheelPlacement.FrontLeft: - wheel.SetVisualMesh(visual.WheelFL); - break; - case WheelPlacement.RearRight: - wheel.SetVisualMesh(visual.WheelRR); - break; - case WheelPlacement.RearLeft: - wheel.SetVisualMesh(visual.WheelRL); - break; - } - } - } + skin.ValueRW.NeedUpdate = false; } } + + var wheels = new NativeList(Allocator.Temp); + foreach (var (visualWheels, entity) in Query>().WithNone().WithEntityAccess()) + { + commandBuffer.AddComponent(entity); + var visuals = visualWheels.ValueRO; + wheels.Add(visuals.WheelFL); + wheels.Add(visuals.WheelFR); + wheels.Add(visuals.WheelRL); + wheels.Add(visuals.WheelRR); + } + + if (!wheels.IsEmpty) + { + UnityEngine.Debug.Log($"The number of vehicles this frame:{wheels.Length} has been updated."); + + // The skin visuals should be hidden because they’re already present in the vehicle ghost. + var hideVisualWheelsJob = new HideVisualSkinWheelsJob + { + Wheels = wheels.ToArray(Allocator.TempJob), + LocalToWorldLookup = GetComponentLookup(true), + ECB = commandBuffer.AsParallelWriter() + }; - commandBuffer.Playback(state.EntityManager); - commandBuffer.Dispose(); + state.Dependency = hideVisualWheelsJob.Schedule(wheels.Length, 64, state.Dependency); + } } } } \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/Race/PlayerCheckPointSystem.cs b/Assets/Scripts/Gameplay/Race/PlayerCheckPointSystem.cs index 612c18ccd..569582d34 100644 --- a/Assets/Scripts/Gameplay/Race/PlayerCheckPointSystem.cs +++ b/Assets/Scripts/Gameplay/Race/PlayerCheckPointSystem.cs @@ -1,6 +1,7 @@ using Unity.Entities.Racing.Common; using Unity.Burst; using Unity.Mathematics; +using Unity.Transforms; using UnityEngine; using static Unity.Entities.SystemAPI; @@ -29,35 +30,40 @@ public void OnUpdate(ref SystemState state) if (race.HasFinished) { - foreach (var checkPointLocator in Query()) + foreach (var (transform, checkPointLocator) + in Query, RefRO>()) { - checkPointLocator.SetLocalTransform(checkPointLocator.GetResetPosition, quaternion.identity); + transform.ValueRW.Rotation = quaternion.identity; + transform.ValueRW.Position = checkPointLocator.ValueRO.ResetPosition; } } if (!race.IsInProgress) return; - foreach (var player in Query()) + foreach (var (player, lapProgress) + in Query, RefRO>().WithAll()) { - if (!player.Player.InRace) + if (!player.ValueRO.InRace) return; var currentPosition = float3.zero; var currentRotation = quaternion.identity; - foreach (var checkPoint in Query()) + foreach (var (checkPoint, localTransform) in + Query, RefRO>()) { - if (checkPoint.CheckPointId == player.LapProgress.NextPointId) + if (checkPoint.ValueRO.Id == lapProgress.ValueRO.NextPointId) { - currentPosition = checkPoint.LocalPosition; - currentRotation = checkPoint.LocalRotation; + currentPosition = localTransform.ValueRO.Position; + currentRotation = localTransform.ValueRO.Rotation; break; } } - foreach (var checkPointLocator in Query()) + foreach (var transform in Query>().WithAll()) { - checkPointLocator.SetLocalTransform(currentPosition, currentRotation); + transform.ValueRW.Rotation = currentRotation; + transform.ValueRW.Position = currentPosition; } } } diff --git a/Assets/Scripts/Gameplay/Race/PlayerProgressSystem.cs b/Assets/Scripts/Gameplay/Race/PlayerProgressSystem.cs index 34181f896..67f8cf9a3 100644 --- a/Assets/Scripts/Gameplay/Race/PlayerProgressSystem.cs +++ b/Assets/Scripts/Gameplay/Race/PlayerProgressSystem.cs @@ -3,6 +3,7 @@ using Unity.Entities.Racing.Common; using Unity.Jobs; using Unity.Mathematics; +using Unity.NetCode; using Unity.Transforms; using static Unity.Entities.SystemAPI; @@ -79,6 +80,8 @@ private void Execute(Entity entity, ref Rank rank) /// [BurstCompile] [WithAll(typeof(Simulate))] + [WithAll(typeof(GhostOwner))] + [WithAll(typeof(Rank))] public partial struct CheckPlayerFinishedJob : IJobEntity { public int TotalCheckPoints; @@ -86,28 +89,31 @@ public partial struct CheckPlayerFinishedJob : IJobEntity public float CelebrationIdleTimer; public double ElapseTime; - private void Execute(PlayerAspect player) + private void Execute(ref Player player, ref LapProgress lapProgress) { - if (player.LapProgress.CurrentCheckPoint != TotalCheckPoints || player.Player.State != PlayerState.Race) + if (lapProgress.CurrentCheckPoint != TotalCheckPoints || player.State != PlayerState.Race) { return; } // Completes the lastlap - if (player.LapProgress.CurrentLap < LapsCount) + if (lapProgress.CurrentLap < LapsCount) { - player.IncreaseLapCount(); + lapProgress.CurrentLap++; } // Finish Lap - if (player.LapProgress.CurrentLap < LapsCount) + if (lapProgress.CurrentLap < LapsCount) { - player.ResetCheckpoint(); + lapProgress.CurrentCheckPoint = 0; } // Finish the race else { - player.SetCelebration(CelebrationIdleTimer, ElapseTime); + // set celebration + player.State = PlayerState.CelebrationIdle; + lapProgress.CelebrationIdleDelay = CelebrationIdleTimer; + lapProgress.ArrivalTime = ElapseTime; } } } diff --git a/Assets/Scripts/Gameplay/Race/RaceStateSystems.cs b/Assets/Scripts/Gameplay/Race/RaceStateSystems.cs index abab8a4b7..f0a964d0c 100644 --- a/Assets/Scripts/Gameplay/Race/RaceStateSystems.cs +++ b/Assets/Scripts/Gameplay/Race/RaceStateSystems.cs @@ -1,5 +1,6 @@ using Unity.Burst; using Unity.Entities.Racing.Common; +using Unity.NetCode; using UnityEngine; using static Unity.Entities.SystemAPI; @@ -32,12 +33,16 @@ public void OnUpdate(ref SystemState state) // we move the cars to the starting point var spawnPointBuffer = GetSingletonBuffer(); var index = 0; - foreach (var player in Query()) + foreach (var (reset, lapProgress) + in Query, RefRW>() + .WithAll() + .WithAll() + .WithAll()) { - player.SetTargetTransform(spawnPointBuffer[index].TrackPosition, spawnPointBuffer[index].TrackRotation); + reset.ValueRW.SetTargetTransform(spawnPointBuffer[index].TrackPosition, spawnPointBuffer[index].TrackRotation); index++; - player.ResetVehicle(); - player.ResetLapProgress(); + reset.ValueRW.ResetVehicle(); + lapProgress.ValueRW.Reset(); } if (race.TimerFinished) @@ -130,9 +135,11 @@ public void OnUpdate(ref SystemState state) } var playersFinished = 0; - foreach (var car in Query()) + foreach (var player in Query>() + .WithAll() + .WithAll()) { - if (car.Player.HasFinished) + if (player.ValueRO.HasFinished) { playersFinished++; } @@ -208,15 +215,19 @@ public void OnUpdate(ref SystemState state) return; } - foreach (var player in Query()) + foreach (var (player, lapProgress) + in Query, RefRW>() + .WithAll() + .WithAll() + .WithAll()) { - if (player.FinishedCelebration) + if (player.ValueRO.IsCelebrating && lapProgress.ValueRO.CelebrationIdleDelay <= 0) { - player.SetFinishedRace(); + player.ValueRW.State = PlayerState.Finished; } - else if (player.IsCelebrating) + else if (player.ValueRO.IsCelebrating && lapProgress.ValueRO.CelebrationIdleDelay > 0) { - player.ReduceCelebrationTimer(state.WorldUnmanaged.Time.DeltaTime); + lapProgress.ValueRW.CelebrationIdleDelay -= state.WorldUnmanaged.Time.DeltaTime; } } } diff --git a/Assets/Scripts/Gameplay/Test/TestStartRaceSystem.cs b/Assets/Scripts/Gameplay/Test/TestStartRaceSystem.cs index 2528c0d2d..dd3f2c6fb 100644 --- a/Assets/Scripts/Gameplay/Test/TestStartRaceSystem.cs +++ b/Assets/Scripts/Gameplay/Test/TestStartRaceSystem.cs @@ -23,9 +23,12 @@ public void OnUpdate(ref SystemState state) { if (TryGetSingleton(out var carNetworkId)) { - foreach (var car in Query()) + foreach (var ghostOwner in Query>() + .WithAll() + .WithAll() + .WithAll()) { - if (car.NetworkId == carNetworkId.Value) + if (ghostOwner.ValueRO.NetworkId == carNetworkId.Value) { state.Enabled = false; state.EntityManager.CreateEntity(typeof(PlayersReadyRPC), diff --git a/Assets/Scripts/Gameplay/UI/CarSelection/CarSelectionUI.cs b/Assets/Scripts/Gameplay/UI/CarSelection/CarSelectionUI.cs index 6af05d8a4..b4d7b076b 100644 --- a/Assets/Scripts/Gameplay/UI/CarSelection/CarSelectionUI.cs +++ b/Assets/Scripts/Gameplay/UI/CarSelection/CarSelectionUI.cs @@ -88,7 +88,7 @@ private void OnStartButtonClicked(ClickEvent evt) ShowCarSelection(false); #if AUTH_PACKAGE_PRESENT - VivoxManager.Instance.Login(PlayerInfoController.Instance.LocalPlayerName); + VivoxManager.Instance?.Session?.Login(PlayerInfoController.Instance.LocalPlayerName); #endif // Connect to Server of Create Client & Server diff --git a/Assets/Scripts/Gameplay/UI/LoadingScreen/LoadingScreen.cs b/Assets/Scripts/Gameplay/UI/LoadingScreen/LoadingScreen.cs index abec198a9..fe9b497ad 100644 --- a/Assets/Scripts/Gameplay/UI/LoadingScreen/LoadingScreen.cs +++ b/Assets/Scripts/Gameplay/UI/LoadingScreen/LoadingScreen.cs @@ -1,6 +1,8 @@ using UnityEngine; using UnityEngine.UIElements; +#if !UNITY_SERVER using UnityEngine.UIElements.Experimental; +#endif namespace Unity.Entities.Racing.Gameplay { @@ -37,18 +39,22 @@ private void OnEnable() public void ShowLoadingScreen(bool value, string label = "LOADING...") { +#if !UNITY_SERVER m_TextLabel.text = label; m_Container.style.display = value ? DisplayStyle.Flex : DisplayStyle.None; +#endif } private void RotateLoading() { +#if !UNITY_SERVER m_LoadingCircle.experimental.animation.Rotation(Quaternion.Euler(0f, 0, -180f), 500).Ease(Easing.Linear) .OnCompleted(() => { m_LoadingCircle.experimental.animation.Rotation(Quaternion.Euler(0f, 0f, -360f), 500) .Ease(Easing.Linear).OnCompleted(RotateLoading); }); +#endif } } } \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/UI/MainMenu/MainMenu.cs b/Assets/Scripts/Gameplay/UI/MainMenu/MainMenu.cs index c2539f507..6107f25a3 100644 --- a/Assets/Scripts/Gameplay/UI/MainMenu/MainMenu.cs +++ b/Assets/Scripts/Gameplay/UI/MainMenu/MainMenu.cs @@ -56,6 +56,7 @@ private void Start() // Set the focus ring manually m_FocusRing = new VisualElement[] {m_NameField, m_JoinButton}; + m_NameField.AddToClassList("text-align-center"); } diff --git a/Assets/Scripts/Gameplay/UI/Race/RaceCountdownUISystem.cs b/Assets/Scripts/Gameplay/UI/Race/RaceCountdownUISystem.cs index 4d1ca0d61..eb7cb3bdc 100644 --- a/Assets/Scripts/Gameplay/UI/Race/RaceCountdownUISystem.cs +++ b/Assets/Scripts/Gameplay/UI/Race/RaceCountdownUISystem.cs @@ -15,16 +15,16 @@ public partial struct RaceCountdownUISystem : ISystem public void OnUpdate(ref SystemState state) { - foreach (var localPlayer in Query()) + foreach (var localPlayer in Query>().WithAll()) { - if (localPlayer.Player.State == m_LastState) + if (localPlayer.ValueRO.State == m_LastState) { return; } - if (!localPlayer.Player.StartingRace) + if (!localPlayer.ValueRO.StartingRace) { - m_LastState = localPlayer.Player.State; + m_LastState = localPlayer.ValueRO.State; return; } @@ -38,7 +38,7 @@ public void OnUpdate(ref SystemState state) TimelineManager.Instance.PlayCountdownTimeline(); } - m_LastState = localPlayer.Player.State; + m_LastState = localPlayer.ValueRO.State; } } } diff --git a/Assets/Scripts/Gameplay/UI/Race/UpdateFinishTimer.cs b/Assets/Scripts/Gameplay/UI/Race/UpdateFinishTimer.cs index a600b6cd8..138f5cd2b 100644 --- a/Assets/Scripts/Gameplay/UI/Race/UpdateFinishTimer.cs +++ b/Assets/Scripts/Gameplay/UI/Race/UpdateFinishTimer.cs @@ -25,9 +25,9 @@ public void OnUpdate(ref SystemState state) if (!race.IsFinishing) return; - foreach (var localPlayer in Query()) + foreach (var localPlayer in Query>().WithAll()) { - if (localPlayer.Player.InRace || localPlayer.Player.IsCelebrating || localPlayer.Player.HasFinished) + if (localPlayer.ValueRO.InRace || localPlayer.ValueRO.IsCelebrating || localPlayer.ValueRO.HasFinished) { var currentTimer = (int)race.CurrentTimer; if (HUDController.Instance != null) diff --git a/Assets/Scripts/Gameplay/UI/Race/UpdateUISystem.cs b/Assets/Scripts/Gameplay/UI/Race/UpdateUISystem.cs index 5f1dbd9df..d753e618c 100644 --- a/Assets/Scripts/Gameplay/UI/Race/UpdateUISystem.cs +++ b/Assets/Scripts/Gameplay/UI/Race/UpdateUISystem.cs @@ -1,5 +1,6 @@ using Unity.Entities.Racing.Common; using Unity.Burst; +using Unity.NetCode; using static Unity.Entities.SystemAPI; namespace Unity.Entities.Racing.Gameplay @@ -141,12 +142,15 @@ public void OnUpdate(ref SystemState state) if (!race.IsInProgress) return; - foreach (var player in Query().WithAll()) + foreach (var (player, rank, lapProgress) + in Query,RefRO,RefRO>() + .WithAll() + .WithAll()) { - HUDController.Instance.SetPosition(player.Rank, race.PlayersInRace); - HUDController.Instance.SetLap(player.LapProgress.CurrentLap, player.LapProgress.LapCount); - if (player.Player.IsCelebrating) - HUDController.Instance.Finish(true, player.Rank); + HUDController.Instance.SetPosition(rank.ValueRO.Value, race.PlayersInRace); + HUDController.Instance.SetLap(lapProgress.ValueRO.CurrentLap, lapProgress.ValueRO.LapCount); + if (player.ValueRO.IsCelebrating) + HUDController.Instance.Finish(true, rank.ValueRO.Value); } } } diff --git a/Assets/Scripts/Gameplay/UI/Systems/PlayersNameUIUpdater.cs b/Assets/Scripts/Gameplay/UI/Systems/PlayersNameUIUpdater.cs index a6312b57f..5bd560c8d 100644 --- a/Assets/Scripts/Gameplay/UI/Systems/PlayersNameUIUpdater.cs +++ b/Assets/Scripts/Gameplay/UI/Systems/PlayersNameUIUpdater.cs @@ -1,6 +1,8 @@ using Unity.Entities.Racing.Common; using Unity.Burst; using Unity.Collections; +using Unity.NetCode; +using Unity.Transforms; using static Unity.Entities.SystemAPI; namespace Unity.Entities.Racing.Gameplay @@ -21,16 +23,20 @@ public void OnUpdate(ref SystemState state) return; var ecb = new EntityCommandBuffer(Allocator.TempJob); - foreach (var player in Query().WithNone()) + foreach (var (playerName, entity) in Query>() + .WithNone().WithEntityAccess()) { - var name = player.Name.ToString(); - PlayerInfoController.Instance.CreateNameTag(name, player.Self); - ecb.AddComponent(player.Self); + var name = playerName.ValueRO.Name.ToString(); + PlayerInfoController.Instance.CreateNameTag(name, entity); + ecb.AddComponent(entity); } - foreach (var car in Query()) + foreach (var (localToWorld, entity) in Query>() + .WithAll() + .WithAll() + .WithAll().WithEntityAccess()) { - PlayerInfoController.Instance.UpdateNamePosition(car.Self, car.LocalToWorld.Position); + PlayerInfoController.Instance.UpdateNamePosition(entity, localToWorld.ValueRO.Position); } PlayerInfoController.Instance.RefreshNameTags(state.EntityManager); diff --git a/Assets/Scripts/Gameplay/UI/Vivox/InitializedVivoxSystem.cs b/Assets/Scripts/Gameplay/UI/Vivox/InitializedVivoxSystem.cs new file mode 100644 index 000000000..8c432d198 --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/InitializedVivoxSystem.cs @@ -0,0 +1,57 @@ +using Unity.Burst; +using Unity.Collections; +using Unity.NetCode; +using static Unity.Entities.SystemAPI; + +namespace Unity.Entities.Racing.Gameplay +{ + /// + /// Component added to the player entity when the Vivox connection is established. + /// + public struct VivoxConnectionStatus : IComponentData + { + } + + /// + /// System that initializes the Vivox connection for the local player. + /// + [BurstCompile] + [WorldSystemFilter(WorldSystemFilterFlags.ClientSimulation | WorldSystemFilterFlags.ThinClientSimulation)] + public partial struct InitializedVivoxSystem : ISystem + { + private EntityQuery m_PlayerQuery; + + public void OnCreate(ref SystemState state) + { + state.RequireForUpdate(); + m_PlayerQuery = state.GetEntityQuery(ComponentType.ReadOnly(), + ComponentType.Exclude()); + state.RequireForUpdate(m_PlayerQuery); + } + + public void OnUpdate(ref SystemState state) + { + if (PlayerInfoController.Instance == null || + VivoxManager.Instance == null || + VivoxManager.Instance.Service == null) + return; + + var cmdBuffer = new EntityCommandBuffer(Allocator.Temp); + foreach (var (local, entity) in Query>() + .WithNone() + .WithEntityAccess()) + { + UnityEngine.Debug.Log($"[VIVOX] Player [{PlayerInfoController.Instance.LocalPlayerName}] is starting vivox"); + if (!string.IsNullOrEmpty(PlayerInfoController.Instance.LocalPlayerName)) + { + UnityEngine.Debug.Log("[VIVOX] Start login to vivox"); + VivoxManager.Instance.Session.Login(PlayerInfoController.Instance.LocalPlayerName); + cmdBuffer.AddComponent(entity); + } + } + + cmdBuffer.Playback(state.EntityManager); + cmdBuffer.Dispose(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/UI/Vivox/InitializedVivoxSystem.cs.meta b/Assets/Scripts/Gameplay/UI/Vivox/InitializedVivoxSystem.cs.meta new file mode 100644 index 000000000..da1b3e326 --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/InitializedVivoxSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1ba8fabcdf3d7ce468730b2d7eb0295a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours.meta b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours.meta new file mode 100644 index 000000000..c1954c6dc --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e34c3c318e163b43b3a305cfa2f8e94 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxChannel.cs b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxChannel.cs new file mode 100644 index 000000000..6309f9b07 --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxChannel.cs @@ -0,0 +1,62 @@ +using System.Threading.Tasks; +using Unity.Services.Vivox; +using UnityEngine; + +namespace Unity.Entities.Racing.Gameplay +{ + /// + /// Manages Vivox channels + /// + public class VivoxChannel : MonoBehaviour + { + public string Name => "MultipleUserChannel"; + + private Task JoinLobbyChannel() + { + if (VivoxService.Instance == null) return null; + VivoxService.Instance.LoggedOut += OnUserLoggedOut; + VivoxService.Instance.ConnectionRecovered += OnConnectionRecovered; + VivoxService.Instance.ConnectionRecovering += OnConnectionRecovering; + VivoxService.Instance.ConnectionFailedToRecover += OnConnectionFailedToRecover; + return VivoxService.Instance.JoinGroupChannelAsync(Name, ChatCapability.AudioOnly); + } + + void OnDestroy() + { + if(VivoxService.Instance == null) return; + VivoxService.Instance.ConnectionRecovered -= OnConnectionRecovered; + VivoxService.Instance.ConnectionRecovering -= OnConnectionRecovering; + VivoxService.Instance.ConnectionFailedToRecover -= OnConnectionFailedToRecover; + } + + private void OnUserLoggedOut() + { + + } + + private void OnConnectionRecovering() + { + //sets UI with .text = "Connection Recovering"; + } + + void OnConnectionRecovered() + { + //sets UI with .text = "Connection Recovered"; + } + + void OnConnectionFailedToRecover() + { + //sets UI with .text = "Connection Failed to Recover"; + } + + public async void JoinChannel() + { + await JoinLobbyChannel(); + } + + public void DisconnectAllChannels() + { + + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxChannel.cs.meta b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxChannel.cs.meta new file mode 100644 index 000000000..323c2408f --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxChannel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9116d070ce0e514cbc2be1697b2f73f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxDevicesVolume.cs b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxDevicesVolume.cs new file mode 100644 index 000000000..44aa267a5 --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxDevicesVolume.cs @@ -0,0 +1,69 @@ +using UnityEngine; + +namespace Unity.Entities.Racing.Gameplay +{ + /// + /// Manages Vivox devices volume + /// + public class VivoxDevicesVolume : MonoBehaviour + { + // vivox min value is -50 while max value is 50 + private const int k_VivoxVolumeRange = 50; + + public bool Muted + { + get + { + if (VivoxManager.Instance != null && VivoxManager.Instance.Service != null) + return VivoxManager.Instance.Service.IsInputDeviceMuted; + return true; + } + } + + public void SetMicrophoneVolume(int volume) + { + if (VivoxManager.Instance == null || VivoxManager.Instance.Service == null) + return; + + VivoxManager.Instance.Service.SetInputDeviceVolume(volume - k_VivoxVolumeRange); + } + + public void SetSpeakerVolume(int volume) + { + if (VivoxManager.Instance == null || VivoxManager.Instance.Service == null) + return; + + VivoxManager.Instance.Service.SetOutputDeviceVolume(volume - k_VivoxVolumeRange); + } + + public void SetMicrophoneMute(bool value) + { + if (VivoxManager.Instance == null || VivoxManager.Instance.Service == null) + return; + + if (value) + { + VivoxManager.Instance.Service.MuteInputDevice(); + } + else + { + VivoxManager.Instance.Service.UnmuteInputDevice(); + } + } + + public void SetMuteSpeaker(bool value) + { + if (VivoxManager.Instance == null || VivoxManager.Instance.Service == null) + return; + + if (value) + { + VivoxManager.Instance.Service.MuteOutputDevice(); + } + else + { + VivoxManager.Instance.Service.UnmuteOutputDevice(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxDevicesVolume.cs.meta b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxDevicesVolume.cs.meta new file mode 100644 index 000000000..2b789add5 --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxDevicesVolume.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f015244ed4bf9ca42b114c64d8592439 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxManager.cs b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxManager.cs new file mode 100644 index 000000000..78dbbb539 --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxManager.cs @@ -0,0 +1,155 @@ +using UnityEngine; +using Unity.Services.Core; +using Unity.Services.Vivox; +using System.Runtime.InteropServices; +using Unity.Services.Authentication; + +namespace Unity.Entities.Racing.Gameplay +{ + /// + /// Manages Vivox service + /// + [RequireComponent(typeof(VivoxSession))] + [RequireComponent(typeof(VivoxChannel))] + [RequireComponent(typeof(VivoxDevicesVolume))] + public class VivoxManager : MonoBehaviour + { + public const string k_MultipleVivoxComponentDetected = "Multiple VivoxVoiceManager detected in the scene. " + + "Only one VivoxVoiceManager can exist at a time. " + + "The duplicate VivoxVoiceManager will be destroyed."; + + public const string k_SetupProjectInTheCloud = "To use Unity's dashboard services, " + + "you need to link your Unity project to a project ID. " + + "To do this, go to Project Settings to select your organization, " + + "select your project and then link a project ID. " + + "You also need to make sure your organization has access to the required products. " + + "Visit https://dashboard.unity3d.com to sign up."; + + //These variables should be set to the projects Vivox credentials if the authentication package is not being used + //Credentials are available on the Vivox Developer Portal (developer.vivox.com) or the Unity Dashboard (dashboard.unity3d.com), depending on where the organization and project were made + [SerializeField] + string key; + [SerializeField] + string issuer; + [SerializeField] + string domain; + [SerializeField] + string server; + + public static VivoxManager Instance { get; private set; } + public VivoxDevicesVolume Devices { get; private set; } + public VivoxSession Session { get; private set; } + public VivoxChannel Channel { get; private set; } + private bool m_ServiceInitialized; + + public IVivoxService Service + { + get + { + if (!m_ServiceInitialized) + return null; + return VivoxService.Instance; + } + } + + + private bool m_IsReady; + + private void Awake() + { + if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64 && Application.platform == RuntimePlatform.OSXPlayer) + { + Destroy(gameObject); + return; + } + + if (Instance != this && Instance != null) + { + Debug.LogWarning(k_MultipleVivoxComponentDetected); + Destroy(gameObject); + return; + } + + if (string.IsNullOrEmpty(Application.cloudProjectId)) + { + Debug.LogWarning(k_SetupProjectInTheCloud); + Destroy(gameObject); + return; + } + + Instance = this; + m_IsReady = false; + Devices = GetComponent(); + Session = GetComponent(); + Channel = GetComponent(); + } + + private async void Start() + { + // if the Unity project is not linked to a Unity services project. + Debug.Log($"[VIVOX] Vivox application project {Application.cloudProjectId}"); + if (string.IsNullOrEmpty(Application.cloudProjectId)) + { + Debug.LogWarning(k_SetupProjectInTheCloud); + return; + } + + var options = new InitializationOptions(); + if (CheckManualCredentials()) + { + options.SetVivoxCredentials(server, domain, issuer, key); + } + + await UnityServices.InitializeAsync(options); + + if (!CheckManualCredentials() && AuthenticationService.Instance.SessionTokenExists) + { + AuthenticationService.Instance.ClearSessionToken(); + await AuthenticationService.Instance.SignInAnonymouslyAsync(); + } + + + if (UnityServices.State == ServicesInitializationState.Initialized && VivoxService.Instance != null) + { + try + { + m_IsReady = true; + await VivoxService.Instance.InitializeAsync(); + Debug.Log($"[VIVOX] starting Vivox service"); + m_ServiceInitialized = true; + } + finally + { + Debug.Log($"[VIVOX] cannot start Vivox service"); + m_ServiceInitialized = false; + m_IsReady = false; + } + } + else + { + Debug.Log($"[VIVOX] State {UnityServices.State} VivoxService Instance Is null: {VivoxService.Instance == null}"); + } + } + + public void Logout() + { + // Needed to add this to prevent some unsuccessful init, we can revisit to do better + if (m_IsReady) + { + Devices.SetMicrophoneMute(true); + Session.ClosingClientConnection(); + } + } + + private void OnApplicationQuit() + { + if (m_IsReady && Session != null) + Session.ClosingClientConnection(); + } + + bool CheckManualCredentials() + { + return !(string.IsNullOrEmpty(issuer) && string.IsNullOrEmpty(domain) && string.IsNullOrEmpty(server)); + } + } +} diff --git a/Assets/Scripts/Gameplay/Audio/VivoxManager.cs.meta b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxManager.cs.meta similarity index 83% rename from Assets/Scripts/Gameplay/Audio/VivoxManager.cs.meta rename to Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxManager.cs.meta index ec47c72d3..64643230e 100644 --- a/Assets/Scripts/Gameplay/Audio/VivoxManager.cs.meta +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c39f0722939566c45ad603ac81133383 +guid: 1a1a7a46715df7e45a59840490694588 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxPanel.cs b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxPanel.cs new file mode 100644 index 000000000..ee258af09 --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxPanel.cs @@ -0,0 +1,86 @@ +using UnityEngine; +using UnityEngine.UIElements; +using Unity.Services.Vivox; + +namespace Unity.Entities.Racing.Gameplay +{ + /// + /// Adds events to Vivox UI + /// + [RequireComponent(typeof(VivoxPlayerList))] + public class VivoxPanel : MonoBehaviour + { + private VivoxSession VivoxSession => VivoxManager.Instance.Session; + private VivoxChannel VivoxChannel => VivoxManager.Instance.Channel; + private VivoxDevicesVolume VivoxDevices => VivoxManager.Instance.Devices; + private VisualElement m_VoiceChat; + private bool m_HasStartedVivox = false; + private VivoxPlayerList m_PlayerList; + + private void Awake() + { + var root = GetComponent().rootVisualElement; + m_VoiceChat = root.Q("chat-voice-panel"); + m_VoiceChat.style.display = DisplayStyle.None; + m_PlayerList = GetComponent(); + } + + private void Update() + { + if(VivoxManager.Instance == null || VivoxSession == null || VivoxManager.Instance.Service == null || m_HasStartedVivox) + return; + + m_HasStartedVivox = true; + VivoxManager.Instance.Service.LoggedIn += ShowPanel; + VivoxManager.Instance.Service.LoggedIn += OnUserLoggedIn; + VivoxManager.Instance.Service.LoggedOut += OnUserLoggedOut; + VivoxManager.Instance.Service.LoggedOut += HidePanel; + + if (VivoxManager.Instance.Session.IsLogged) + { + OnUserLoggedIn(); + } + else + { + OnUserLoggedOut(); + } + } + + private void OnDestroy() + { + if (VivoxManager.Instance == null || VivoxSession == null) + return; + + VivoxManager.Instance.Service.LoggedIn -= OnUserLoggedIn; + VivoxManager.Instance.Service.LoggedOut -= OnUserLoggedOut; + VivoxManager.Instance.Service.LoggedOut -= HidePanel; + VivoxManager.Instance.Service.LoggedIn -= ShowPanel; + } + + private void ShowPanel() + { + Debug.Log("[VIVOX] ShowPanel has been triggered"); + m_VoiceChat.style.display = DisplayStyle.Flex; + VivoxDevices.SetMicrophoneMute(true); + } + + private void HidePanel() + { + Debug.Log("[VIVOX] HidePanel has been triggered"); + m_VoiceChat.style.display = DisplayStyle.None; + VivoxDevices.SetMicrophoneMute(true); + } + + private void OnUserLoggedIn() + { + Debug.Log("[VIVOX] OnUserLoggedIn has been triggered"); + m_PlayerList.Init(); + VivoxChannel.JoinChannel(); + } + + private void OnUserLoggedOut() + { + VivoxChannel.DisconnectAllChannels(); + } + } +} diff --git a/Assets/Scripts/Gameplay/UI/Vivox/VivoxPanel.cs.meta b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxPanel.cs.meta similarity index 100% rename from Assets/Scripts/Gameplay/UI/Vivox/VivoxPanel.cs.meta rename to Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxPanel.cs.meta diff --git a/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxPlayerList.cs b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxPlayerList.cs new file mode 100644 index 000000000..a98700266 --- /dev/null +++ b/Assets/Scripts/Gameplay/UI/Vivox/MonoBehaviours/VivoxPlayerList.cs @@ -0,0 +1,147 @@ +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UIElements; +using Unity.Services.Vivox; +using Random = Unity.Mathematics.Random; + +namespace Unity.Entities.Racing.Gameplay +{ + /// + /// Detects the talker and updates UI Vivox player's name. + /// + public class VivoxPlayerList : MonoBehaviour + { + [SerializeField] public Sprite m_MicrophoneOn; + [SerializeField] public Sprite m_MicrophoneOff; + [SerializeField] public Vector2 m_MinMaxScaleIndicatorSpeaker; + + private VivoxParticipant lastParticipant; + + private Button m_MicrophoneButton; + private VisualElement m_MicrophoneIcon; + private Random m_Random; + private Label m_SpeakerName; + private VisualElement m_SpeakerSignal; + private bool IsMicrophoneMuted = false; + private Dictionary m_Participants; + + private void Awake() + { + var root = GetComponent().rootVisualElement; + var container = root.Q("chat-voice-panel"); + m_Participants = new Dictionary(); + m_SpeakerName = container.Q