From 549d54871f80bd7dabf2c6963b46b9afab7e64af Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 21 Jan 2021 13:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9F=B3=E6=95=88=E3=80=91=E5=9C=A8?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E7=95=8C=E9=9D=A2=E5=BC=80=E5=85=B3=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=E6=A6=9C=EF=BC=8C=E8=83=8C=E6=99=AF=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E9=9A=8F=E7=9D=80=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/SoundManager.lua | 6 +++++- .../~Lua/Modules/Ranking/RankingSingleListPanel.lua | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua index 1bf0bf3b6c..bc44e29bce 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua @@ -44,6 +44,7 @@ local _amb_enabled = true local _backgroundSound = {} local _backgroundRes +local _backgroundResOld local _AmbientChannel = {} local _AmbientRes @@ -425,7 +426,7 @@ function SoundManager.PlayMusic(resName, isFade, callback) if not _backgroundSound then return end local audioUnit = _backgroundSound[1] if not audioUnit then return end - + _backgroundResOld = _backgroundRes _backgroundRes = resName local function _SetTimer() @@ -462,6 +463,9 @@ function SoundManager.StopMusic() _backgroundRes = nil end +function SoundManager.PlayOldMusic() + SoundManager.PlayMusic(_backgroundResOld) +end ---=============================环境音效============================================ function SoundManager.PlayAmbient(resName) if not resName then return end diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index d4dd642a2c..6b606bbbea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -77,6 +77,7 @@ end --界面关闭时调用(用于子类重写) function RankingSingleListPanel:OnClose() + SoundManager.PlayOldMusic() RankingManager.isRequest=0 this.noneImage:SetActive(false) -- if this.liveNode then