diff --git a/Assets/ManagedResources/Audio/BGM/BGM-Battle06.wav b/Assets/ManagedResources/Audio/BGM/BGM-Battle06.wav new file mode 100644 index 0000000000..cf5eb7802d Binary files /dev/null and b/Assets/ManagedResources/Audio/BGM/BGM-Battle06.wav differ diff --git a/Assets/ManagedResources/Audio/BGM/BGM-Battle06.wav.meta b/Assets/ManagedResources/Audio/BGM/BGM-Battle06.wav.meta new file mode 100644 index 0000000000..6a071b3503 --- /dev/null +++ b/Assets/ManagedResources/Audio/BGM/BGM-Battle06.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f1255e8b1698bfa409b56e04666c5147 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Data/SoundData.lua b/Assets/ManagedResources/~Lua/Data/SoundData.lua index ec537bc4ac..160b6891bb 100644 --- a/Assets/ManagedResources/~Lua/Data/SoundData.lua +++ b/Assets/ManagedResources/~Lua/Data/SoundData.lua @@ -5,7 +5,7 @@ SoundConfig = { BGM_MainMenu = "BGM_004", BGM_WorkShop = "BGM_002", BGM_Login = "BGM_024", - BGM_Battle_2 = "BGM_019", + BGM_Battle_2 = "BGM-Battle06", BGM_DiffMonster = "BGM_023", BGM_Recruit = "BGM_024", BGM_Rank = "BGM_025", diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index da79c371f2..117d945346 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -576,7 +576,7 @@ function this.ShowBattleResult(result, msg) if result == 0 then this.resultSoundAudio = SoundManager.PlaySound(SoundConfig.Sound_BattleLose) else - this.resultSoundAudio = SoundManager.PlaySound(SoundConfig.Sound_BattleWin) + --this.resultSoundAudio = SoundManager.PlaySound(SoundConfig.Sound_BattleWin) end -- 公会boss结算界面 if fightType == BATTLE_TYPE.GUILD_BOSS then