diff --git a/Assets/Resources/AudioData/AudioObject.bytes b/Assets/Resources/AudioData/AudioObject.bytes index 59bfffb..9d84c74 100644 Binary files a/Assets/Resources/AudioData/AudioObject.bytes and b/Assets/Resources/AudioData/AudioObject.bytes differ diff --git a/Assets/Resources/AudioData/MusicContainer.bytes b/Assets/Resources/AudioData/MusicContainer.bytes index 1e7525a..0daf0bd 100644 Binary files a/Assets/Resources/AudioData/MusicContainer.bytes and b/Assets/Resources/AudioData/MusicContainer.bytes differ diff --git a/Assets/Resources/AudioData/MusicPath.bytes b/Assets/Resources/AudioData/MusicPath.bytes index e32b95b..7d6c812 100644 Binary files a/Assets/Resources/AudioData/MusicPath.bytes and b/Assets/Resources/AudioData/MusicPath.bytes differ diff --git a/Assets/Resources/AudioData/MusicSegment.bytes b/Assets/Resources/AudioData/MusicSegment.bytes index e973365..b1767f8 100644 Binary files a/Assets/Resources/AudioData/MusicSegment.bytes and b/Assets/Resources/AudioData/MusicSegment.bytes differ diff --git a/Assets/Resources/AudioData/MusicTransition.bytes b/Assets/Resources/AudioData/MusicTransition.bytes index 68f1c4c..16b13d2 100644 Binary files a/Assets/Resources/AudioData/MusicTransition.bytes and b/Assets/Resources/AudioData/MusicTransition.bytes differ diff --git a/Assets/Scripts/OCES/Audio/Generated/AudioObject.cs b/Assets/Scripts/OCES/Audio/Generated/AudioObject.cs index dcc6696..9989e95 100644 --- a/Assets/Scripts/OCES/Audio/Generated/AudioObject.cs +++ b/Assets/Scripts/OCES/Audio/Generated/AudioObject.cs @@ -108,18 +108,6 @@ public partial class AudioObject : IBinarySerializable /// public bool ContainerPlayMode { get; set; } - /// - /// 按段落配置每段响应范围,用|分隔不同段落 - /// - public string BlendRanges { get; set; } - - /// - /// 0 = 指数 - /// 1 = 线形 - /// 2 = 对数 - /// - public BlendCrossFadeType BlendCrossFadeType { get; set; } - /// /// 指定避免重复的次数 /// @@ -190,8 +178,6 @@ public partial class AudioObject : IBinarySerializable Haptic = reader.ReadUInt32(); ContainerType = (ContainerType)reader.ReadByte(); ContainerPlayMode = reader.ReadBoolean(); - BlendRanges = reader.ReadString(); - BlendCrossFadeType = (BlendCrossFadeType)reader.ReadByte(); LimitRepetition = reader.ReadByte(); RandomType = reader.ReadBoolean(); VolumeStepThreshold = reader.ReadUInt32(); @@ -231,8 +217,6 @@ public partial class AudioObject : IBinarySerializable writer.Write(Haptic); writer.Write((byte)ContainerType); writer.Write(ContainerPlayMode); - writer.Write(BlendRanges); - writer.Write((byte)BlendCrossFadeType); writer.Write(LimitRepetition); writer.Write(RandomType); writer.Write(VolumeStepThreshold); diff --git a/Assets/Scripts/OCES/Audio/Generated/MusicContainer.cs b/Assets/Scripts/OCES/Audio/Generated/MusicContainer.cs index 894b252..4b4417c 100644 --- a/Assets/Scripts/OCES/Audio/Generated/MusicContainer.cs +++ b/Assets/Scripts/OCES/Audio/Generated/MusicContainer.cs @@ -25,7 +25,8 @@ public partial class MusicContainer : IBinarySerializable /// /// 0 = 随机播放 /// 1 = 顺序播放 - /// 2 = 同时播放 + /// 2 = 混合播放 + /// 3 = 切换播放 /// public ContainerType ContainerType { get; set; } diff --git a/Assets/Scripts/OCES/Audio/Generated/MusicTransition.cs b/Assets/Scripts/OCES/Audio/Generated/MusicTransition.cs index 1eba725..ee54cc9 100644 --- a/Assets/Scripts/OCES/Audio/Generated/MusicTransition.cs +++ b/Assets/Scripts/OCES/Audio/Generated/MusicTransition.cs @@ -45,9 +45,20 @@ public partial class MusicTransition : IBinarySerializable public AlignMode AlignMode { get; set; } /// - /// + /// 0 = Start + /// 1 = Same Time /// - public uint Segment { get; set; } + public SyncPoint SyncPoint { get; set; } + + /// + /// samples + /// + public uint StartOffset { get; set; } + + /// + /// samples + /// + public uint EndOffset { get; set; } public void DeSerialize(BinaryReader reader) @@ -58,7 +69,9 @@ public partial class MusicTransition : IBinarySerializable FadeInTime = reader.ReadSingle(); FadeInOffset = reader.ReadSingle(); AlignMode = (AlignMode)reader.ReadByte(); - Segment = reader.ReadUInt32(); + SyncPoint = (SyncPoint)reader.ReadByte(); + StartOffset = reader.ReadUInt32(); + EndOffset = reader.ReadUInt32(); } public void Serialize(BinaryWriter writer) @@ -69,7 +82,9 @@ public partial class MusicTransition : IBinarySerializable writer.Write(FadeInTime); writer.Write(FadeInOffset); writer.Write((byte)AlignMode); - writer.Write(Segment); + writer.Write((byte)SyncPoint); + writer.Write(StartOffset); + writer.Write(EndOffset); } } diff --git a/Assets/Scripts/OCES/Audio/HandWritten/AudioSystem.cs b/Assets/Scripts/OCES/Audio/HandWritten/AudioSystem.cs index 0088bca..4bb3330 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/AudioSystem.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/AudioSystem.cs @@ -244,7 +244,7 @@ namespace OCES.Audio { // ── 启动默认音乐与环境音 ── // 触发一次初始状态,让音乐系统从默认状态开始匹配 - SetState(GameState.Home); + //SetState(GameState.Home); } AudioObject ResolveSwitchContainer(AudioObject switchContainer) diff --git a/Assets/Scripts/OCES/Audio/HandWritten/HandWrittenDefinitions.cs b/Assets/Scripts/OCES/Audio/HandWritten/HandWrittenDefinitions.cs index dd7e3be..2caa092 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/HandWrittenDefinitions.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/HandWrittenDefinitions.cs @@ -52,6 +52,12 @@ namespace OCES.Audio Playing, // 已经开始播放 Finished, } + + public enum SyncPoint + { + Start, + SameAsCurrentSegment, + } public interface IBinarySerializable { diff --git a/Assets/Scripts/OCES/SetStateBind.cs b/Assets/Scripts/OCES/SetStateBind.cs index 5d50705..9b87d82 100644 --- a/Assets/Scripts/OCES/SetStateBind.cs +++ b/Assets/Scripts/OCES/SetStateBind.cs @@ -7,7 +7,7 @@ namespace OCES { public class SetStateBind : MonoBehaviour { - public GameState targetGameState; + public TileMaterial targetGameState; public bool enableLowpass; public Text buttonText;