diff --git a/Assets/Scenes/graybox.unity b/Assets/Scenes/graybox.unity index f8781185..fcc2d04f 100644 --- a/Assets/Scenes/graybox.unity +++ b/Assets/Scenes/graybox.unity @@ -23967,6 +23967,51 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1093026610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1093026611} + - component: {fileID: 1093026612} + m_Layer: 0 + m_Name: SoundFXManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1093026611 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093026610} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1093026612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093026610} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 643642ee8579d7c59aede3f93f7f1831, type: 3} + m_Name: + m_EditorClassIdentifier: + soundFXObject: {fileID: 4796329978814215510, guid: 36974cbfacb00f929b0f52646919bd83, type: 3} --- !u!43 &1100830940 Mesh: m_ObjectHideFlags: 0 @@ -37243,6 +37288,226 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ea0853a3b2545524481b0c984f27afd1, type: 3} +--- !u!1 &1736371135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1736371139} + - component: {fileID: 1736371138} + - component: {fileID: 1736371137} + - component: {fileID: 1736371136} + - component: {fileID: 1736371141} + - component: {fileID: 1736371140} + m_Layer: 0 + m_Name: AudioTriggerObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1736371136 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736371135} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1736371137 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736371135} + m_Enabled: 0 + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1736371138 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736371135} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1736371139 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736371135} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.765, y: 0.831, z: -8.865} + m_LocalScale: {x: 3.9475, y: 3.0935, z: 2.7436} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1736371140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736371135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 165d769066fa8f050905deac3ccf18cf, type: 3} + m_Name: + m_EditorClassIdentifier: + soundClip: {fileID: 8300000, guid: a38e078a92ccd8deb944d859b74fa901, type: 3} +--- !u!82 &1736371141 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736371135} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!43 &1737070379 Mesh: m_ObjectHideFlags: 0 @@ -48847,3 +49112,5 @@ SceneRoots: - {fileID: 975292036} - {fileID: 196715952} - {fileID: 70478617} + - {fileID: 1736371139} + - {fileID: 1093026611} diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index 518ed8f4..650d4b11 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -25,7 +25,7 @@ MonoBehaviour: m_SupportsTerrainHoles: 1 m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 - m_MSAA: 8 + m_MSAA: 2 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 0af89661..1e48e0ed 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 3419686016893059317 - - rid: 3419686016893059318 + - rid: 4726762358393536594 + - rid: 4726762358393536595 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 3419686016893059319 - - rid: 3419686016893059320 + - rid: 4726762358393536596 + - rid: 4726762358393536597 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 3419686016893059321 - - rid: 3419686016893059322 - - rid: 3419686016893059323 - - rid: 3419686016893059324 - - rid: 3419686016893059325 - - rid: 3419686016893059326 + - rid: 4726762358393536598 + - rid: 4726762358393536599 + - rid: 4726762358393536600 + - rid: 4726762358393536601 + - rid: 4726762358393536602 + - rid: 4726762358393536603 - rid: 6852985685364965392 - - rid: 3419686016893059327 + - rid: 4726762358393536604 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 4726762159971237888 - - rid: 3419686016893059328 + - rid: 4726762358393536605 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,14 +97,20 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 3419686016893059317 + - rid: 4726762159971237888 + type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} + m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} + m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} + - rid: 4726762358393536594 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 3419686016893059318 + - rid: 4726762358393536595 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -116,7 +122,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 3419686016893059319 + - rid: 4726762358393536596 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -131,7 +137,7 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 3419686016893059320 + - rid: 4726762358393536597 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -140,7 +146,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 3419686016893059321 + - rid: 4726762358393536598 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -153,13 +159,13 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 3419686016893059322 + - rid: 4726762358393536599 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 3419686016893059323 + - rid: 4726762358393536600 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -172,12 +178,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 3419686016893059324 + - rid: 4726762358393536601 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 3419686016893059325 + - rid: 4726762358393536602 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -187,30 +193,24 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 3419686016893059326 + - rid: 4726762358393536603 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 3419686016893059327 + - rid: 4726762358393536604 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 3419686016893059328 + - rid: 4726762358393536605 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - - rid: 4726762159971237888 - type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} - m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} - m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} - rid: 6852985685364965378 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta new file mode 100644 index 00000000..33227c05 --- /dev/null +++ b/Assets/Sounds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 28a138aae65bca0e496c10a511b01054 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Clips.meta b/Assets/Sounds/Clips.meta new file mode 100644 index 00000000..0dcf5611 --- /dev/null +++ b/Assets/Sounds/Clips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9033512f4ef77df1492661cf14c3954e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Clips/01_1.wav b/Assets/Sounds/Clips/01_1.wav new file mode 100644 index 00000000..c789e69e Binary files /dev/null and b/Assets/Sounds/Clips/01_1.wav differ diff --git a/Assets/Sounds/Clips/01_1.wav.meta b/Assets/Sounds/Clips/01_1.wav.meta new file mode 100644 index 00000000..cf73f62e --- /dev/null +++ b/Assets/Sounds/Clips/01_1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a38e078a92ccd8deb944d859b74fa901 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Prefabs.meta b/Assets/Sounds/Prefabs.meta new file mode 100644 index 00000000..4cb9af4f --- /dev/null +++ b/Assets/Sounds/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 893afd774e3cb738aad6dadc4a9517a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Prefabs/SoundFXObject.prefab b/Assets/Sounds/Prefabs/SoundFXObject.prefab new file mode 100644 index 00000000..f3838f0a --- /dev/null +++ b/Assets/Sounds/Prefabs/SoundFXObject.prefab @@ -0,0 +1,131 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &812887405216665436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2327353618322865946} + - component: {fileID: 4796329978814215510} + m_Layer: 0 + m_Name: SoundFXObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2327353618322865946 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812887405216665436} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &4796329978814215510 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812887405216665436} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Sounds/Prefabs/SoundFXObject.prefab.meta b/Assets/Sounds/Prefabs/SoundFXObject.prefab.meta new file mode 100644 index 00000000..ae1febd9 --- /dev/null +++ b/Assets/Sounds/Prefabs/SoundFXObject.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 36974cbfacb00f929b0f52646919bd83 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Scripts.meta b/Assets/Sounds/Scripts.meta new file mode 100644 index 00000000..a4e51013 --- /dev/null +++ b/Assets/Sounds/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b33b151f630dfc08db38eddc086608c0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Scripts/PlaySoundEvent.cs b/Assets/Sounds/Scripts/PlaySoundEvent.cs new file mode 100644 index 00000000..906b20e5 --- /dev/null +++ b/Assets/Sounds/Scripts/PlaySoundEvent.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +[RequireComponent(typeof(AudioSource))] +public class PlaySoundEvent : MonoBehaviour +{ + [SerializeField] private AudioClip soundClip; // Assign the sound clip in the inspector + + + void OnTriggerEnter(Collider other) + { + if (other.CompareTag("Player")) // Assuming the player has the tag "Player" + { + PlaySound(); + Destroy(gameObject); // Remove the trigger + } + } + + void PlaySound() + { + if (soundClip != null) + { + SoundFXManager.instance.PlaySound(soundClip, transform, 1f); + } + } +} diff --git a/Assets/Sounds/Scripts/PlaySoundEvent.cs.meta b/Assets/Sounds/Scripts/PlaySoundEvent.cs.meta new file mode 100644 index 00000000..d8e95696 --- /dev/null +++ b/Assets/Sounds/Scripts/PlaySoundEvent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 165d769066fa8f050905deac3ccf18cf \ No newline at end of file diff --git a/Assets/Sounds/Scripts/SoundFXManager.cs b/Assets/Sounds/Scripts/SoundFXManager.cs new file mode 100644 index 00000000..082d5a12 --- /dev/null +++ b/Assets/Sounds/Scripts/SoundFXManager.cs @@ -0,0 +1,40 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +public class SoundFXManager : MonoBehaviour +{ + public static SoundFXManager instance; + + [SerializeField] private AudioSource soundFXObject; + + private void Awake() + { + if (instance == null) + { + instance = this; + } + } + + public void PlaySound(AudioClip clip, Transform spawnPosition, float volume) + { + // spawn gameobject + AudioSource audioSource = Instantiate(soundFXObject, spawnPosition.position, Quaternion.identity); + + // assign the audio clip + audioSource.clip = clip; + + // set the volume + audioSource.volume = volume; + + // play the sound + audioSource.Play(); + + // get the length of the clip + float clipLength = audioSource.clip.length; + + // destroy the gameobject after the clip has finished playing + Destroy(audioSource.gameObject, clipLength); + + } +} diff --git a/Assets/Sounds/Scripts/SoundFXManager.cs.meta b/Assets/Sounds/Scripts/SoundFXManager.cs.meta new file mode 100644 index 00000000..26c48145 --- /dev/null +++ b/Assets/Sounds/Scripts/SoundFXManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 643642ee8579d7c59aede3f93f7f1831 \ No newline at end of file diff --git a/Assets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab b/Assets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab index 2cae8872..60679ca7 100644 --- a/Assets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab +++ b/Assets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab @@ -23,12 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4135013735270702863} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.375, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8997996947095583982} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5393215578589016642 GameObject: @@ -56,12 +57,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5393215578589016642} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8997996947095583982} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5393215578589016654 MeshFilter: @@ -82,11 +84,15 @@ MeshRenderer: 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_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -120,8 +126,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5393215578589016642} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.5 m_Height: 2 m_Direction: 1 @@ -154,14 +169,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8616685848737228372} + 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: 4135013735270702856} - {fileID: 5393215578589016641} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!143 &8616685848737228382 CharacterController: @@ -171,9 +187,16 @@ CharacterController: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8616685848737228372} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Height: 2 m_Radius: 0.5 m_SlopeLimit: 45 @@ -206,7 +229,7 @@ MonoBehaviour: GroundedRadius: 0.5 GroundLayers: serializedVersion: 2 - m_Bits: 513 + m_Bits: 1 CinemachineCameraTarget: {fileID: 4135013735270702863} TopClamp: 89 BottomClamp: -89 @@ -258,8 +281,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 4419d82f33d36e848b3ed5af4c8da37e, - type: 3} + m_Actions: {fileID: -944628639613478452, guid: 4419d82f33d36e848b3ed5af4c8da37e, type: 3} m_NotificationBehavior: 0 m_UIInputModule: {fileID: 0} m_DeviceLostEvent: @@ -287,7 +309,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_ActionId: 6bc1aaf4-b110-4ff7-891e-5b9fe6f32c4d - m_ActionName: Player/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow,/XInputControllerWindows/leftStick] + m_ActionName: 'Player/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow,/XInputControllerWindows/leftStick]' - m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} @@ -303,7 +325,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_ActionId: 2690c379-f54d-45be-a724-414123833eb4 - m_ActionName: Player/Look[/Mouse/delta,/XInputControllerWindows/rightStick] + m_ActionName: 'Player/Look[/Mouse/delta,/XInputControllerWindows/rightStick]' - m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} @@ -319,7 +341,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_ActionId: 8c4abdf8-4099-493a-aa1a-129acec7c3df - m_ActionName: Player/Jump[/Keyboard/space,/XInputControllerWindows/buttonSouth] + m_ActionName: 'Player/Jump[/Keyboard/space,/XInputControllerWindows/buttonSouth]' - m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} @@ -335,7 +357,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_ActionId: 980e881e-182c-404c-8cbf-3d09fdb48fef - m_ActionName: Player/Sprint[/Keyboard/leftShift,/XInputControllerWindows/leftTrigger] + m_ActionName: 'Player/Sprint[/Keyboard/leftShift,/XInputControllerWindows/leftTrigger]' - m_PersistentCalls: m_Calls: [] m_ActionId: e4ce1614-c754-48c1-9103-33130441661f diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 2908cf63..a45d2be7 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -75,7 +75,7 @@ QualitySettings: globalTextureMipmapLimit: 0 textureMipmapLimitSettings: [] anisotropicTextures: 2 - antiAliasing: 8 + antiAliasing: 2 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 0 diff --git a/mono_crash.mem.65495.1.blob b/mono_crash.mem.65495.1.blob new file mode 100644 index 00000000..b4452d03 Binary files /dev/null and b/mono_crash.mem.65495.1.blob differ