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

jiaoyangna 2020-09-10 14:44:56 +08:00
commit 24365446a2
13 changed files with 16 additions and 2 deletions

View File

@ -103,6 +103,7 @@ function ArenaView:BindEvent()
end) end)
-- 刷新按钮 -- 刷新按钮
Util.AddClick(this.RefreshBtn, function() Util.AddClick(this.RefreshBtn, function()
PlaySoundWithoutClick("UI_refresh")
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
PopupTipPanel.ShowTip(Language[10082]) PopupTipPanel.ShowTip(Language[10082])
return return

View File

@ -162,7 +162,8 @@ function this:ChangeTab(index)
-- tab改变回调 -- tab改变回调
if self.ChangeTabCallBack then if self.ChangeTabCallBack then
self.ChangeTabCallBack(index, lastIndex) PlaySoundWithoutClick("UI_all_switch")
self.ChangeTabCallBack(index, lastIndex)
end end
end end

View File

@ -52,6 +52,7 @@ end
function this:BindEvent() function this:BindEvent()
Util.AddClick(this.compoundBtn, function() Util.AddClick(this.compoundBtn, function()
PlaySoundWithoutClick("UI_wapapon_mixture_equip")
this.Compound(curIndex) this.Compound(curIndex)
end) end)
-- --

View File

@ -35,6 +35,7 @@ end
function this:BindEvent() function this:BindEvent()
Util.AddClick(this.compoundBtn, function() Util.AddClick(this.compoundBtn, function()
PlaySoundWithoutClick("UI_wapapon_mixture_soul")
this.Compound() this.Compound()
end) end)
-- --

View File

@ -44,6 +44,7 @@ end
function this:BindEvent() function this:BindEvent()
Util.AddClick(this.compoundBtn, function() Util.AddClick(this.compoundBtn, function()
PlaySoundWithoutClick("UI_wapapon_mixture_amulet")
this.Compound(curIndex) this.Compound(curIndex)
end) end)
-- --

View File

@ -53,6 +53,7 @@ end
function this:BindEvent() function this:BindEvent()
Util.AddClick(this.compoundBtn, function() Util.AddClick(this.compoundBtn, function()
PlaySoundWithoutClick("UI_roles_mixture")
this.Compound(curIndex) this.Compound(curIndex)
end) end)
end end

View File

@ -48,6 +48,7 @@ end
function this:BindEvent() function this:BindEvent()
--置换 --置换
Util.AddClick(this.replaceBtn,function() Util.AddClick(this.replaceBtn,function()
PlaySoundWithoutClick("UI_roles_mixture_change")
if not curSelectHero.id then if not curSelectHero.id then
PopupTipPanel.ShowTip(Language[12315]) PopupTipPanel.ShowTip(Language[12315])

View File

@ -112,6 +112,7 @@ function ExpertPanel:BindEvent()
for i = 1, allActivityNum do for i = 1, allActivityNum do
Util.AddClick(tabBtns[i], function() Util.AddClick(tabBtns[i], function()
if this.isPlayingLackCatAni == false then if this.isPlayingLackCatAni == false then
PlaySoundWithoutClick("UI_all_switch")
self:ActivityRewardShow(i,true) self:ActivityRewardShow(i,true)
end end
end) end)

View File

@ -71,6 +71,7 @@ function FindTreasureMainPanel:BindEvent()
self.findTreasureVipBtnRedPoint:SetActive(FindTreasureManager.GetShowFindTreasureVipRedPoint()) self.findTreasureVipBtnRedPoint:SetActive(FindTreasureManager.GetShowFindTreasureVipRedPoint())
end) end)
Util.AddClick(self.refreshBtn, function() Util.AddClick(self.refreshBtn, function()
PlaySoundWithoutClick("UI_refresh")
if refreshIsMaterial then if refreshIsMaterial then
local isShowTwo = false local isShowTwo = false
for i = 1, #missionInfo do for i = 1, #missionInfo do

View File

@ -316,6 +316,7 @@ function this.SwitchTreasureType(treasureType)
end) end)
--刷新按钮 --刷新按钮
Util.AddOnceClick(this.refreshBtn, function() Util.AddOnceClick(this.refreshBtn, function()
PlaySoundWithoutClick("UI_refresh")
LogBlue(tostring(BagManager.GetItemCountById(62))) LogBlue(tostring(BagManager.GetItemCountById(62)))
if BagManager.GetItemCountById(62)>0 then--如果是免费刷新 if BagManager.GetItemCountById(62)>0 then--如果是免费刷新
this.PlayItemListAnim() this.PlayItemListAnim()
@ -434,6 +435,7 @@ function this.SwitchTreasureType(treasureType)
end) end)
--刷新按钮 --刷新按钮
Util.AddOnceClick(this.refreshBtn, function() Util.AddOnceClick(this.refreshBtn, function()
PlaySoundWithoutClick("UI_refresh")
LogBlue(Language[12221]..BagManager.GetItemCountById(63)) LogBlue(Language[12221]..BagManager.GetItemCountById(63))
if BagManager.GetItemCountById(63)>0 then if BagManager.GetItemCountById(63)>0 then
this.PlayItemListAnim() this.PlayItemListAnim()

View File

@ -159,6 +159,7 @@ function OperatingPanel:OnTabClicked(index)
end end
function OperatingPanel:OnTabChanged(index) function OperatingPanel:OnTabChanged(index)
PlaySoundWithoutClick("UI_all_switch")
for i, select in ipairs(self.selectTabs) do for i, select in ipairs(self.selectTabs) do
select:SetActive(i == index) select:SetActive(i == index)
end end

View File

@ -85,7 +85,8 @@ function PrayMainPanel:BindEvent()
self:ClosePanel() self:ClosePanel()
end) end)
Util.AddClick(self.refreshBtn, function() Util.AddClick(self.refreshBtn, function()
self:RefreshBtnClick() PlaySoundWithoutClick("UI_refresh")
self:RefreshBtnClick()
end) end)
Util.AddClick(self.yulanMaskBtn, function() Util.AddClick(self.yulanMaskBtn, function()
self.previewRewardLayout:SetActive(false) self.previewRewardLayout:SetActive(false)

View File

@ -81,6 +81,7 @@ end
function this:BindEvent() function this:BindEvent()
local localSelf = self local localSelf = self
Util.AddOnceClick(self.refreshBtn, function() Util.AddOnceClick(self.refreshBtn, function()
PlaySoundWithoutClick("UI_refresh")
isPlayShow = true isPlayShow = true
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. localSelf.ShopType) local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. localSelf.ShopType)
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)