From 15f220a4c7319ca2552ea1f80a47b1ce95430e0e Mon Sep 17 00:00:00 2001 From: Oliver Wong Date: Tue, 21 Apr 2026 10:40:36 +0800 Subject: [PATCH] fix: change crossfade curve --- Assets/Resources/AudioData/MusicSegment.bytes | Bin 541 -> 551 bytes .../Resources/AudioData/MusicTransition.bytes | Bin 34 -> 34 bytes Assets/Resources/Audios/music_game_loop.wav | 3 +++ ...ther.wav.meta => music_game_loop.wav.meta} | 6 ++--- Assets/Resources/Audios/music_home_loop.wav | 3 +++ .../Resources/Audios/music_home_loop.wav.meta | 23 ++++++++++++++++++ Assets/Resources/Audios/music_home_other.wav | 3 --- Assets/Scenes/SampleScene.unity | 2 +- .../HandWritten/LongAudio/ChannelFader.cs | 4 +-- 9 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 Assets/Resources/Audios/music_game_loop.wav rename Assets/Resources/Audios/{music_home_other.wav.meta => music_game_loop.wav.meta} (83%) create mode 100644 Assets/Resources/Audios/music_home_loop.wav create mode 100644 Assets/Resources/Audios/music_home_loop.wav.meta delete mode 100644 Assets/Resources/Audios/music_home_other.wav diff --git a/Assets/Resources/AudioData/MusicSegment.bytes b/Assets/Resources/AudioData/MusicSegment.bytes index b1767f8e7ba470d201cb733445a70dc6391dc1d1..a00a00cbc0a4ba9b23f704a4eaa1649c29115358 100644 GIT binary patch delta 44 pcmbQsvYcfDGm{E`ZfS95a(qU9Zfbl^etv-{0|Nt8EIkn_1^_<=4$c4o delta 34 kcmZ3^GM8loGm{ioZfS95a(qU9ZmK8)0|S(so|u~o0J0$phyVZp diff --git a/Assets/Resources/AudioData/MusicTransition.bytes b/Assets/Resources/AudioData/MusicTransition.bytes index 3f1fb8234d1279381540dd9c1c59303894852710..794109c0a3d5f090deabbbc7a58c863aa8c4bf99 100644 GIT binary patch literal 34 ccmZQ%U|_I!;s=rp_80g(Uz diff --git a/Assets/Resources/Audios/music_game_loop.wav b/Assets/Resources/Audios/music_game_loop.wav new file mode 100644 index 0000000..281b538 --- /dev/null +++ b/Assets/Resources/Audios/music_game_loop.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eb3f8abc9a4e6ffd82e4da84b9581d076d2538818b54bf4bd7104cd7e6318af +size 11081544 diff --git a/Assets/Resources/Audios/music_home_other.wav.meta b/Assets/Resources/Audios/music_game_loop.wav.meta similarity index 83% rename from Assets/Resources/Audios/music_home_other.wav.meta rename to Assets/Resources/Audios/music_game_loop.wav.meta index fcc0e36..5fb423f 100644 --- a/Assets/Resources/Audios/music_home_other.wav.meta +++ b/Assets/Resources/Audios/music_game_loop.wav.meta @@ -1,17 +1,17 @@ fileFormatVersion: 2 -guid: 6bb3e45fc3d534bf9ad4842eb3b2cfdd +guid: c084ace48a6004923bb9d762a2a31908 AudioImporter: externalObjects: {} serializedVersion: 7 defaultSettings: serializedVersion: 2 - loadType: 2 + loadType: 0 sampleRateSetting: 2 sampleRateOverride: 44100 compressionFormat: 1 quality: 0.13 conversionMode: 0 - preloadAudioData: 1 + preloadAudioData: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 diff --git a/Assets/Resources/Audios/music_home_loop.wav b/Assets/Resources/Audios/music_home_loop.wav new file mode 100644 index 0000000..2b07758 --- /dev/null +++ b/Assets/Resources/Audios/music_home_loop.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2cabcc5318b0f04d6386e9da27808b53685cb37a3756831433e26898c2b9f25 +size 11081544 diff --git a/Assets/Resources/Audios/music_home_loop.wav.meta b/Assets/Resources/Audios/music_home_loop.wav.meta new file mode 100644 index 0000000..41aba6f --- /dev/null +++ b/Assets/Resources/Audios/music_home_loop.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 6f16847f355c146d4a93c6199bae1e22 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.13 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/music_home_other.wav b/Assets/Resources/Audios/music_home_other.wav deleted file mode 100644 index 7cb9825..0000000 --- a/Assets/Resources/Audios/music_home_other.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9bad374f269f62fbb656bc22601e3d398ea4746e851693e6a1d609d9955164e -size 5277314 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 81632fc..6cd4bf6 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2827,7 +2827,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ce1f814dd5d46d48bc33c18ba11c44c, type: 3} m_Name: m_EditorClassIdentifier: - startWithMusic: 0 + startWithMusic: 1 logLevel: 0 --- !u!4 &2093584671 Transform: diff --git a/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/ChannelFader.cs b/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/ChannelFader.cs index 14b88aa..60260a2 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/ChannelFader.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/ChannelFader.cs @@ -164,7 +164,7 @@ namespace OCES.Audio continue; src.volume = fromVolume; - src.DOFade(0f, duration - elapsed).SetEase(Ease.Linear); + src.DOFade(0f, duration - elapsed).SetEase(Ease.InSine); //TODO 支持读表 } yield return null; } @@ -203,7 +203,7 @@ namespace OCES.Audio if (DOTween.IsTweening(src)) continue; src.volume = 0f; - src.DOFade(1f, duration - elapsed).SetEase(Ease.Linear); + src.DOFade(1f, duration - elapsed).SetEase(Ease.OutSine); //TODO 支持读表 } yield return null;