Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
24365446a2
|
|
@ -103,6 +103,7 @@ function ArenaView:BindEvent()
|
|||
end)
|
||||
-- 刷新按钮
|
||||
Util.AddClick(this.RefreshBtn, function()
|
||||
PlaySoundWithoutClick("UI_refresh")
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
|
||||
PopupTipPanel.ShowTip(Language[10082])
|
||||
return
|
||||
|
|
|
|||
|
|
@ -162,7 +162,8 @@ function this:ChangeTab(index)
|
|||
|
||||
-- tab改变回调
|
||||
if self.ChangeTabCallBack then
|
||||
self.ChangeTabCallBack(index, lastIndex)
|
||||
PlaySoundWithoutClick("UI_all_switch")
|
||||
self.ChangeTabCallBack(index, lastIndex)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ end
|
|||
|
||||
function this:BindEvent()
|
||||
Util.AddClick(this.compoundBtn, function()
|
||||
PlaySoundWithoutClick("UI_wapapon_mixture_equip")
|
||||
this.Compound(curIndex)
|
||||
end)
|
||||
--
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ end
|
|||
|
||||
function this:BindEvent()
|
||||
Util.AddClick(this.compoundBtn, function()
|
||||
PlaySoundWithoutClick("UI_wapapon_mixture_soul")
|
||||
this.Compound()
|
||||
end)
|
||||
--
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ end
|
|||
|
||||
function this:BindEvent()
|
||||
Util.AddClick(this.compoundBtn, function()
|
||||
PlaySoundWithoutClick("UI_wapapon_mixture_amulet")
|
||||
this.Compound(curIndex)
|
||||
end)
|
||||
--
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ end
|
|||
|
||||
function this:BindEvent()
|
||||
Util.AddClick(this.compoundBtn, function()
|
||||
PlaySoundWithoutClick("UI_roles_mixture")
|
||||
this.Compound(curIndex)
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ end
|
|||
function this:BindEvent()
|
||||
--置换
|
||||
Util.AddClick(this.replaceBtn,function()
|
||||
PlaySoundWithoutClick("UI_roles_mixture_change")
|
||||
|
||||
if not curSelectHero.id then
|
||||
PopupTipPanel.ShowTip(Language[12315])
|
||||
|
|
|
|||
|
|
@ -112,6 +112,7 @@ function ExpertPanel:BindEvent()
|
|||
for i = 1, allActivityNum do
|
||||
Util.AddClick(tabBtns[i], function()
|
||||
if this.isPlayingLackCatAni == false then
|
||||
PlaySoundWithoutClick("UI_all_switch")
|
||||
self:ActivityRewardShow(i,true)
|
||||
end
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ function FindTreasureMainPanel:BindEvent()
|
|||
self.findTreasureVipBtnRedPoint:SetActive(FindTreasureManager.GetShowFindTreasureVipRedPoint())
|
||||
end)
|
||||
Util.AddClick(self.refreshBtn, function()
|
||||
PlaySoundWithoutClick("UI_refresh")
|
||||
if refreshIsMaterial then
|
||||
local isShowTwo = false
|
||||
for i = 1, #missionInfo do
|
||||
|
|
|
|||
|
|
@ -316,6 +316,7 @@ function this.SwitchTreasureType(treasureType)
|
|||
end)
|
||||
--刷新按钮
|
||||
Util.AddOnceClick(this.refreshBtn, function()
|
||||
PlaySoundWithoutClick("UI_refresh")
|
||||
LogBlue(tostring(BagManager.GetItemCountById(62)))
|
||||
if BagManager.GetItemCountById(62)>0 then--如果是免费刷新
|
||||
this.PlayItemListAnim()
|
||||
|
|
@ -434,6 +435,7 @@ function this.SwitchTreasureType(treasureType)
|
|||
end)
|
||||
--刷新按钮
|
||||
Util.AddOnceClick(this.refreshBtn, function()
|
||||
PlaySoundWithoutClick("UI_refresh")
|
||||
LogBlue(Language[12221]..BagManager.GetItemCountById(63))
|
||||
if BagManager.GetItemCountById(63)>0 then
|
||||
this.PlayItemListAnim()
|
||||
|
|
|
|||
|
|
@ -159,6 +159,7 @@ function OperatingPanel:OnTabClicked(index)
|
|||
end
|
||||
|
||||
function OperatingPanel:OnTabChanged(index)
|
||||
PlaySoundWithoutClick("UI_all_switch")
|
||||
for i, select in ipairs(self.selectTabs) do
|
||||
select:SetActive(i == index)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -85,7 +85,8 @@ function PrayMainPanel:BindEvent()
|
|||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(self.refreshBtn, function()
|
||||
self:RefreshBtnClick()
|
||||
PlaySoundWithoutClick("UI_refresh")
|
||||
self:RefreshBtnClick()
|
||||
end)
|
||||
Util.AddClick(self.yulanMaskBtn, function()
|
||||
self.previewRewardLayout:SetActive(false)
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ end
|
|||
function this:BindEvent()
|
||||
local localSelf = self
|
||||
Util.AddOnceClick(self.refreshBtn, function()
|
||||
PlaySoundWithoutClick("UI_refresh")
|
||||
isPlayShow = true
|
||||
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. localSelf.ShopType)
|
||||
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
|
||||
|
|
|
|||
Loading…
Reference in New Issue