tschesky
0aa2270e1a
## ManagedBehaviour System Refactor - **Sealed `Awake()`** to prevent override mistakes that break singleton registration - **Added `OnManagedAwake()`** for early initialization (fires during registration) - **Renamed lifecycle hook:** `OnManagedAwake()` → `OnManagedStart()` (fires after boot, mirrors Unity's Awake→Start) - **40 files migrated** to new pattern (2 core, 38 components) - Eliminated all fragile `private new void Awake()` patterns - Zero breaking changes - backward compatible ## Centralized Logging System - **Automatic tagging** via `CallerMemberName` and `CallerFilePath` - logs auto-tagged as `[ClassName][MethodName] message` - **Unified API:** Single `Logging.Debug/Info/Warning/Error()` replaces custom `LogDebugMessage()` implementations - **~90 logging call sites** migrated across 10 files - **10 redundant helper methods** removed - All logs broadcast via `Logging.OnLogEntryAdded` event for real-time monitoring ## Custom Log Console (Editor Window) - **Persistent filter popups** for multi-selection (classes, methods, log levels) - windows stay open during selection - **Search** across class names, methods, and message content - **Time range filter** with MinMaxSlider - **Export** filtered logs to timestamped `.txt` files - **Right-click context menu** for quick filtering and copy actions - **Visual improvements:** White text, alternating row backgrounds, color-coded log levels - **Multiple instances** supported for simultaneous system monitoring - Open via `AppleHills > Custom Log Console` Co-authored-by: Michal Pikulski <michal@foolhardyhorizons.com> Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com> Reviewed-on: #56
99 lines
2.9 KiB
C#
99 lines
2.9 KiB
C#
using AudioSourceEvents;
|
|
using System;
|
|
using System.Diagnostics.Tracing;
|
|
using UnityEngine;
|
|
using UnityEngine.Audio;
|
|
using Core;
|
|
using Core.Lifecycle;
|
|
|
|
/// <summary>
|
|
/// We automatically add the AudioSource component here so we can control it. Do not add it manually!
|
|
/// </summary>
|
|
[RequireComponent(typeof(AudioSource))]
|
|
public class AppleAudioSource : ManagedBehaviour
|
|
{
|
|
public enum AudioSourceType{CriticalVO,VO,Ambience,SFX,Music}
|
|
public AudioSourceType audioSourceType;
|
|
[HideInInspector] public AudioSource audioSource;
|
|
private AudioMixer _audioMixer;
|
|
[HideInInspector ] public int clipPriority;
|
|
public int sourcePriority;
|
|
|
|
|
|
internal override void OnManagedAwake()
|
|
{
|
|
audioSource = GetComponent<AudioSource>();
|
|
}
|
|
|
|
internal override void OnManagedStart()
|
|
{
|
|
AudioManager.Instance.RegisterNewAudioSource(this);
|
|
_audioMixer = AudioManager.Instance.audioMixer;
|
|
InitializeAudioSource();
|
|
audioSource.playOnAwake = false;
|
|
}
|
|
|
|
|
|
public void InitializeAudioSource()
|
|
{
|
|
// Route the audio to the correct bus depending on type
|
|
switch (audioSourceType)
|
|
{
|
|
case AppleAudioSource.AudioSourceType.CriticalVO:
|
|
audioSource.outputAudioMixerGroup = _audioMixer.FindMatchingGroups("Critical VO")[0];
|
|
break;
|
|
case AppleAudioSource.AudioSourceType.VO:
|
|
audioSource.outputAudioMixerGroup = _audioMixer.FindMatchingGroups("Flavor VO")[0];
|
|
break;
|
|
case AppleAudioSource.AudioSourceType.SFX:
|
|
audioSource.outputAudioMixerGroup = _audioMixer.FindMatchingGroups("SFX")[0];
|
|
break;
|
|
case AppleAudioSource.AudioSourceType.Ambience:
|
|
audioSource.outputAudioMixerGroup = _audioMixer.FindMatchingGroups("Ambience")[0];
|
|
break;
|
|
case AppleAudioSource.AudioSourceType.Music:
|
|
audioSource.outputAudioMixerGroup = _audioMixer.FindMatchingGroups("Music")[0];
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
public void Play(int requestedClipPriority)
|
|
{
|
|
if (audioSource == null)
|
|
{
|
|
audioSource = GetComponent<AudioSource>();
|
|
}
|
|
clipPriority = requestedClipPriority;
|
|
if (audioSourceType == AudioSourceType.CriticalVO || audioSourceType == AudioSourceType.VO)
|
|
{
|
|
if (AudioManager.Instance.RequestPlayVO(this))
|
|
{
|
|
audioSource.Play();
|
|
}
|
|
else
|
|
{
|
|
Logging.Debug("[AUDIOMANAGER] AppleAudioSource " + name + " was suppressed because something more important is playing");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
audioSource.Play();
|
|
}
|
|
|
|
}
|
|
|
|
public void InterruptAudio(string nameOfInterruptingAudio)
|
|
{
|
|
Stop();
|
|
}
|
|
|
|
public void Stop()
|
|
{
|
|
clipPriority = 0;
|
|
audioSource.Stop();
|
|
}
|
|
|
|
|
|
}
|