Oliver/AudioSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/MusicCallback

Browse Source
This commit is contained in:
Oliver Wong
2026-04-16 11:06:23 +08:00
parent f38a4e5863 19faccd312
commit c3b69f48f6
257 changed files with 6616 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicStateRouter.cs
+9 -6
View File
@@ -9,8 +9,10 @@ namespace OCES.Audio
/// </summary>
public class MusicStateRouter
{
// key: StateGroup enum Type，value: 当前激活的 enum 整数值
readonly Dictionary<Type, int> m_activeStates = new();
// key: StateGroup enum Type，value: 当前激活的 enum 值
readonly Dictionary<Type, Enum> m_activeStates = new();
readonly MusicPathConfig m_musicPaths;
readonly AmbiencePathConfig m_ambiencePaths;
@@ -18,6 +20,7 @@ namespace OCES.Audio
// 上一次匹配到的 PathId，用于 Transition 表的 FromPathId 查询
public uint LastMusicPathId { get; private set; }
public uint LastAmbiencePathId { get; private set; }
internal IReadOnlyDictionary<Type, Enum> ActiveStates { get { return this.m_activeStates; }}
public MusicStateRouter(MusicPathConfig musicPaths, AmbiencePathConfig ambiencePaths)
{
@@ -31,8 +34,8 @@ namespace OCES.Audio
public void SetState<TEnum>(TEnum state, out uint musicContainerId, out uint ambienceContainerId)
where TEnum : Enum
{
// Dictionary<Type, int> 天然保证同一 StateGroup 只保留最新值，直接覆盖即可
this.m_activeStates[typeof(TEnum)] = Convert.ToInt32(state);
// Dictionary<Type, Enum> 天然保证同一 StateGroup 只保留最新值，直接覆盖即可
this.m_activeStates[typeof(TEnum)] = state;
musicContainerId = MatchBestPath(this.m_musicPaths.MusicPathList(), out uint musicPathId);
ambienceContainerId = MatchBestPath(this.m_ambiencePaths.AmbiencePathList(), out uint ambiencePathId);
@@ -99,9 +102,9 @@ namespace OCES.Audio
}
bool conditionMet = false;
foreach (KeyValuePair<Type, int> kv in this.m_activeStates)
foreach (KeyValuePair<Type, Enum> kv in this.m_activeStates)
{
if (StateGroupRegistry.GetTypeId(kv.Key) != typeId || kv.Value != stateValue)
if (StateGroupRegistry.GetTypeId(kv.Key) != typeId || Convert.ToInt32(kv.Value) != stateValue)
continue;
conditionMet = true;
break;
Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicSystem.cs
+6
View File
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace OCES.Audio
@@ -20,6 +21,11 @@ namespace OCES.Audio
// 记录上一次两个通道各自匹配到的 PathId，用于查 Transition 表
uint m_lastMusicPathId;
uint m_lastAmbiencePathId;
internal IReadOnlyDictionary<Type, Enum> ActiveStates
{
get { return this.m_stateRouter.ActiveStates; }
}
internal void Initialize(
MusicSegmentConfig segments,