Merge branch 'main' into DamianBranch

Assets/AppleHillsAudioMix.mixer

@@ -0,0 +1,173 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!243 &-1208528772216134639
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Ambience
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 93449300145f3ff4c9f21b59e4c06cb8
+  m_Children: []
+  m_Volume: d8701439c43e6a44688e09303a1d1158
+  m_Pitch: 80d63bada2a480a49a4a5d966a01c10d
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 56341014057284530}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!241 &24100000
+AudioMixerController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: AppleHillsAudioMix
+  m_OutputGroup: {fileID: 0}
+  m_MasterGroup: {fileID: 24300002}
+  m_Snapshots:
+  - {fileID: 24500006}
+  m_StartSnapshot: {fileID: 24500006}
+  m_SuspendThreshold: -80
+  m_EnableSuspend: 1
+  m_UpdateMode: 0
+  m_ExposedParameters: []
+  m_AudioMixerGroupViews:
+  - guids:
+    - 36b2b23a36bbb2f44ac37f79edc0af70
+    - 18a903247b220fb47b8e743f756a2d19
+    - 7e41227c6d9a65c4898080710c015deb
+    - 93449300145f3ff4c9f21b59e4c06cb8
+    name: View
+  m_CurrentViewIndex: 0
+  m_TargetSnapshot: {fileID: 24500006}
+--- !u!243 &24300002
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Master
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 36b2b23a36bbb2f44ac37f79edc0af70
+  m_Children:
+  - {fileID: -1208528772216134639}
+  - {fileID: 1171626333864818265}
+  - {fileID: 3533147658878909314}
+  m_Volume: 59834639f5649d34cbb5ed8055029b93
+  m_Pitch: 2c79200ddd7bbf244bc5980d7fbb6e1c
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 24400004}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &24400004
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 03ed6a151c0af8c4195cbebf508edc77
+  m_EffectName: Attenuation
+  m_MixLevel: 896d2fcbe3318a445b45993178b85a45
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!245 &24500006
+AudioMixerSnapshotController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Snapshot
+  m_AudioMixer: {fileID: 24100000}
+  m_SnapshotID: 9386914617f382a40984c19c0b0f0980
+  m_FloatValues: {}
+  m_TransitionOverrides: {}
+--- !u!244 &56341014057284530
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 76d2db7ea2e149a41a68468b90cfaa4d
+  m_EffectName: Attenuation
+  m_MixLevel: 6c02daee662dcf749916e249648dcdef
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!243 &1171626333864818265
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SFX
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 18a903247b220fb47b8e743f756a2d19
+  m_Children: []
+  m_Volume: 1eae4aba90e5f564d9c321be5f8ca824
+  m_Pitch: 630d269d37097524bb25a5f95517b9b4
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 6612228481115079330}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!243 &3533147658878909314
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Voice Over
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 7e41227c6d9a65c4898080710c015deb
+  m_Children: []
+  m_Volume: f2db72fd62c62d74cb03d11a28b9ec8f
+  m_Pitch: f711bad694828024996b7a703eb57af7
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 8526405271564766912}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &6612228481115079330
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: f38c579686821d546afb92bab6e73423
+  m_EffectName: Attenuation
+  m_MixLevel: d2f81f6ade43c9e428ce1464b6fd1f2a
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!244 &8526405271564766912
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 1835e9113880bc2409204e2e91177517
+  m_EffectName: Attenuation
+  m_MixLevel: 52d5a3687d87f724cbe11ccd13a4fc4f
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0

Assets/AppleHillsAudioMix.mixer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 727a7e4b6df4b0d47897f7d8ee7fa323
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 24100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/PuzzleS/ObjectiveStepBehaviour.cs

@@ -298,6 +298,7 @@ namespace PuzzleS
             if (success)
             {
                 Logging.Debug($"[Puzzles] Step interacted: {stepData?.stepId} on {gameObject.name}");
+                Destroy(puzzleIndicator);
                 PuzzleManager.Instance?.MarkPuzzleStepCompleted(stepData);
             }
         }

Assets/Scripts/PuzzleS/PuzzleManager.cs

@@ -138,6 +138,7 @@ namespace PuzzleS
                     foreach (var kvp in _stepBehaviours)
                     {
                         if (kvp.Value == null) continue;
+                        if (IsPuzzleStepCompleted(kvp.Value.stepData.stepId)) continue;
                         
                         float distance = Vector3.Distance(_playerTransform.position, kvp.Value.transform.position);