Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

jiaoyangna 2020-09-18 18:34:14 +08:00
commit b202a02455
7 changed files with 4 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -67,7 +67,7 @@ function BagPanel:BindEvent()
Util.AddClick(tabs1[i], function() Util.AddClick(tabs1[i], function()
if this.isFristOpen == false then if this.isFristOpen == false then
-- 音效 -- 音效
SoundManager.PlaySound(SoundConfig.Sound_all_switch) PlaySoundWithoutClick(SoundConfig.Sound_all_switch)
if i == sortIndex then if i == sortIndex then
sortIndex = 0 sortIndex = 0
this:OnClickAllBtn() this:OnClickAllBtn()

View File

@ -190,7 +190,8 @@ function RewardItemPopup:OnOpen(...)
elseif #itemDataList > 25 then elseif #itemDataList > 25 then
self:SetItemShowMax(drop) self:SetItemShowMax(drop)
end end
SoundManager.PlaySound(SoundConfig.Sound_Reward) -- SoundManager.PlaySound(SoundConfig.Sound_Reward)
PlaySoundWithoutClick(SoundConfig.Sound_Reward)
this.ShowLvAndExp() this.ShowLvAndExp()
self:SelectCanPopUpBagMaxMessage() self:SelectCanPopUpBagMaxMessage()
end end

View File

@ -26,6 +26,7 @@ end
--绑定事件(用于子类重写) --绑定事件(用于子类重写)
function RankingListMainPanel:BindEvent() function RankingListMainPanel:BindEvent()
Util.AddClick(this.BackBtn, function() Util.AddClick(this.BackBtn, function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel() self:ClosePanel()
end) end)
end end