From 4ddfbe393bc0dc270230093d219728e4ad4e6c9b Mon Sep 17 00:00:00 2001 From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:53:06 +0100 Subject: [PATCH] Patch sound asset refs in prefabs --- Assets/Resources/Prefabs/Flipper.prefab | 19 ++++---- Assets/Resources/Prefabs/Plunger.prefab | 58 ++++++++++++++++------- Assets/Resources/Prefabs/Slingshot.prefab | 17 ++++--- Assets/Resources/Prefabs/Trough.prefab | 29 +++++++----- 4 files changed, 76 insertions(+), 47 deletions(-) diff --git a/Assets/Resources/Prefabs/Flipper.prefab b/Assets/Resources/Prefabs/Flipper.prefab index 6934155..6479bde 100644 --- a/Assets/Resources/Prefabs/Flipper.prefab +++ b/Assets/Resources/Prefabs/Flipper.prefab @@ -156,14 +156,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 545ad741f74d2444faf5d2882fba6b69, type: 3} m_Name: m_EditorClassIdentifier: - _isLocked: 0 _editorLayer: 0 _editorLayerName: _editorLayerVisibility: 1 - Position: {x: 0, y: 0} - _startAngle: 121 EndAngle: 70 - _surface: {fileID: 0} IsEnabled: 1 IsDualWound: 0 _height: 50 @@ -192,6 +188,7 @@ MonoBehaviour: ShowColliderMesh: 1 ShowColliderOctree: 0 ShowAabbs: 0 + _isKinematic: 0 Mass: 1 Strength: 2200 Elasticity: 0.8 @@ -232,9 +229,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} m_Name: m_EditorClassIdentifier: - _soundAsset: {fileID: 11400000, guid: e410f0a19022a1a49b7a2dd9226ae7d1, type: 2} - _interrupt: 0 - _volume: 1 - _startWhen: 0 - _stopWhen: 0 - _coilName: main_coil + SoundAsset: {fileID: 11400000, guid: e410f0a19022a1a49b7a2dd9226ae7d1, type: 2} + MultiPlayMode: 0 + Volume: 1 + Priority: 2 + CalloutMaxQueueTime: -1 + StartWhen: 0 + StopWhen: 0 + CoilName: main_coil diff --git a/Assets/Resources/Prefabs/Plunger.prefab b/Assets/Resources/Prefabs/Plunger.prefab index abedabe..166e31d 100644 --- a/Assets/Resources/Prefabs/Plunger.prefab +++ b/Assets/Resources/Prefabs/Plunger.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 4360165373544367127} - component: {fileID: 758323825446027854} - component: {fileID: 6875191637992584632} + - component: {fileID: 3432648891043494014} m_Layer: 0 m_Name: Plunger m_TagString: Untagged @@ -49,15 +50,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c1591b5a0bc15604fb622d417b509185, type: 3} m_Name: m_EditorClassIdentifier: - _isLocked: 0 _editorLayer: 0 _editorLayerName: _editorLayerVisibility: 1 - Position: {x: 0, y: 0} Width: 25 Height: 20 - ZAdjust: 0 - _surface: {fileID: 0} analogPlungerAction: {fileID: 0} --- !u!114 &4360165373544367127 MonoBehaviour: @@ -75,6 +72,7 @@ MonoBehaviour: ShowColliderMesh: 1 ShowColliderOctree: 0 ShowAabbs: 0 + _isKinematic: 0 SpeedPull: 0.5 SpeedFire: 80 Stroke: 80 @@ -96,12 +94,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} m_Name: m_EditorClassIdentifier: - _soundAsset: {fileID: 11400000, guid: 29e4e44178845b941a136cf944a6b484, type: 2} - _interrupt: 0 - _volume: 1 - _startWhen: 0 - _stopWhen: 0 - _coilName: c_pull + SoundAsset: {fileID: 11400000, guid: 1db86f03e09f46740a32096157585e5d, type: 2} + MultiPlayMode: 3 + Volume: 1 + Priority: 2 + CalloutMaxQueueTime: -1 + StartWhen: 0 + StopWhen: 0 + CoilName: c_autofire --- !u!114 &6875191637992584632 MonoBehaviour: m_ObjectHideFlags: 0 @@ -114,12 +114,34 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} m_Name: m_EditorClassIdentifier: - _soundAsset: {fileID: 11400000, guid: 1db86f03e09f46740a32096157585e5d, type: 2} - _interrupt: 0 - _volume: 1 - _startWhen: 1 - _stopWhen: 0 - _coilName: c_pull + SoundAsset: {fileID: 11400000, guid: 29e4e44178845b941a136cf944a6b484, type: 2} + MultiPlayMode: 3 + Volume: 1 + Priority: 2 + CalloutMaxQueueTime: -1 + StartWhen: 0 + StopWhen: 0 + CoilName: c_pull +--- !u!114 &3432648891043494014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3492958815385962431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} + m_Name: + m_EditorClassIdentifier: + SoundAsset: {fileID: 11400000, guid: 1db86f03e09f46740a32096157585e5d, type: 2} + MultiPlayMode: 3 + Volume: 1 + Priority: 2 + CalloutMaxQueueTime: -1 + StartWhen: 1 + StopWhen: 0 + CoilName: c_pull --- !u!1 &3501041183407321805 GameObject: m_ObjectHideFlags: 0 @@ -165,7 +187,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8506b0486aacff543b92dd7de914f936, type: 3} m_Name: m_EditorClassIdentifier: - _instanceID: 53948 + _instanceID: 104302 SpringDiam: 0.77 SpringGauge: 1.38 SpringLoops: 8 @@ -223,7 +245,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6e7622b4c6837354c8190ee471830c31, type: 3} m_Name: m_EditorClassIdentifier: - _instanceID: 53944 + _instanceID: 104298 RodDiam: 0.6 RingGap: 2 RingDiam: 0.94 diff --git a/Assets/Resources/Prefabs/Slingshot.prefab b/Assets/Resources/Prefabs/Slingshot.prefab index 8bf860c..515131a 100644 --- a/Assets/Resources/Prefabs/Slingshot.prefab +++ b/Assets/Resources/Prefabs/Slingshot.prefab @@ -114,6 +114,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 257 m_RendererPriority: 0 m_Materials: @@ -151,9 +154,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8636086609386b04ea0fb6c9091f243b, type: 3} m_Name: m_EditorClassIdentifier: - _soundAsset: {fileID: 11400000, guid: a13a0ebac95142a4d838dddbb8fbe85e, type: 2} - _interrupt: 0 - _volume: 1 - _startWhen: 0 - _stopWhen: 0 - _switchName: slingshot_switch + SoundAsset: {fileID: 11400000, guid: a13a0ebac95142a4d838dddbb8fbe85e, type: 2} + MultiPlayMode: 0 + Volume: 1 + Priority: 2 + CalloutMaxQueueTime: -1 + StartWhen: 0 + StopWhen: 0 + SwitchName: slingshot_switch diff --git a/Assets/Resources/Prefabs/Trough.prefab b/Assets/Resources/Prefabs/Trough.prefab index cf3fece..57d2324 100644 --- a/Assets/Resources/Prefabs/Trough.prefab +++ b/Assets/Resources/Prefabs/Trough.prefab @@ -46,7 +46,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 426f115d8fbd6914bb7c67e1cc410097, type: 3} m_Name: m_EditorClassIdentifier: - _isLocked: 0 _editorLayer: 0 _editorLayerName: _editorLayerVisibility: 1 @@ -74,12 +73,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8636086609386b04ea0fb6c9091f243b, type: 3} m_Name: m_EditorClassIdentifier: - _soundAsset: {fileID: 11400000, guid: 249faf8343847964c8a56371a8c737b1, type: 2} - _interrupt: 0 - _volume: 1 - _startWhen: 0 - _stopWhen: 0 - _switchName: ball_switch_6 + SoundAsset: {fileID: 11400000, guid: 249faf8343847964c8a56371a8c737b1, type: 2} + MultiPlayMode: 0 + Volume: 1 + Priority: 2 + CalloutMaxQueueTime: -1 + StartWhen: 0 + StopWhen: 0 + SwitchName: ball_switch_6 --- !u!114 &2596899900856616474 MonoBehaviour: m_ObjectHideFlags: 0 @@ -92,9 +93,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} m_Name: m_EditorClassIdentifier: - _soundAsset: {fileID: 11400000, guid: 793216df1889fdd4e93ea22639af1b78, type: 2} - _interrupt: 0 - _volume: 1 - _startWhen: 0 - _stopWhen: 0 - _coilName: eject_coil + SoundAsset: {fileID: 11400000, guid: 793216df1889fdd4e93ea22639af1b78, type: 2} + MultiPlayMode: 0 + Volume: 1 + Priority: 2 + CalloutMaxQueueTime: -1 + StartWhen: 0 + StopWhen: 0 + CoilName: eject_coil