diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx index 85d0b65b..1acf127e 100644 Binary files a/Configs/GameConfig/Datas/GiftConfig.xlsx and b/Configs/GameConfig/Datas/GiftConfig.xlsx differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_02.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_02.MP3 new file mode 100644 index 00000000..18fdc489 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_02.MP3 differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_02.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_02.MP3.meta new file mode 100644 index 00000000..917826c7 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_02.MP3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 90707674774c2ee45a374e4d601ec076 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_03.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_03.MP3 new file mode 100644 index 00000000..18fdc489 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_03.MP3 differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_03.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_03.MP3.meta new file mode 100644 index 00000000..be936b54 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_03.MP3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d459f80e1d91ab148b5a152754b5eb43 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_04.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_04.MP3 new file mode 100644 index 00000000..18fdc489 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_04.MP3 differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_04.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_04.MP3.meta new file mode 100644 index 00000000..0cf9c0c2 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_04.MP3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e7b9ae7a3149673449904d003521fd68 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_05.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_05.MP3 new file mode 100644 index 00000000..18fdc489 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_05.MP3 differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_05.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_05.MP3.meta new file mode 100644 index 00000000..d2b316dd --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_05.MP3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 812ac0f5c086cb148a3a0fafc832ef33 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_06.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_06.MP3 new file mode 100644 index 00000000..18fdc489 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_06.MP3 differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_06.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_06.MP3.meta new file mode 100644 index 00000000..0adb3f63 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_06.MP3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a1b8cce826e8e974e961c5acb590fad3 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_07.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_07.MP3 new file mode 100644 index 00000000..18fdc489 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_07.MP3 differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_07.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_07.MP3.meta new file mode 100644 index 00000000..f0c7ae0a --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_07.MP3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b442db6ea180b7142a6f1cc94d7149fb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_08.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_08.MP3 new file mode 100644 index 00000000..18fdc489 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_08.MP3 differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_08.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_08.MP3.meta new file mode 100644 index 00000000..699bcbc8 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_08.MP3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0ad8787cd87db4a449787d8c960d5601 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_09.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_09.MP3 new file mode 100644 index 00000000..18fdc489 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_09.MP3 differ diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_09.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_09.MP3.meta new file mode 100644 index 00000000..02feee7c --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift_Effect_09.MP3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8ad45806eca44c249965832780e54909 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes index 391c53ca..f42a7840 100644 Binary files a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes and b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes differ diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 6a9b419f..715b8540 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -341,6 +341,9 @@ namespace GameLogic //Log.Debug("当前送礼礼物ID:" + giftConfig.Id); + // 统一在这里处理播放音频 + GameModule.Audio.Play(TEngine.AudioType.Sound, giftConfig.EffectAudioName, false, 1); + // 整个Buff系统看看如何重构一下,部分礼物效果并不好实现 if (giftConfig.Id == 1) { diff --git a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/giftConfig/GiftConfig.cs b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/giftConfig/GiftConfig.cs index 4f71d50f..a7c9d1c2 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/giftConfig/GiftConfig.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/giftConfig/GiftConfig.cs @@ -23,6 +23,7 @@ public sealed partial class GiftConfig : Luban.BeanBase TimerLen = _buf.ReadInt(); EffectName = _buf.ReadString(); EffectScale = _buf.ReadFloat(); + EffectAudioName = _buf.ReadString(); DyGiftId = _buf.ReadString(); KsGiftId = _buf.ReadString(); TkGiftId = _buf.ReadString(); @@ -64,6 +65,10 @@ public sealed partial class GiftConfig : Luban.BeanBase /// public readonly float EffectScale; /// + /// 音频名称 + /// + public readonly string EffectAudioName; + /// /// 抖音礼物Id /// public readonly string DyGiftId; @@ -101,6 +106,7 @@ public sealed partial class GiftConfig : Luban.BeanBase + "TimerLen:" + TimerLen + "," + "EffectName:" + EffectName + "," + "EffectScale:" + EffectScale + "," + + "EffectAudioName:" + EffectAudioName + "," + "DyGiftId:" + DyGiftId + "," + "KsGiftId:" + KsGiftId + "," + "TkGiftId:" + TkGiftId + ","