Merge branch 'china/dev' into china/dev-c

# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
dev_chengFeng
gaoxin 2021-04-26 17:55:43 +08:00
commit 7df1514da8
5 changed files with 1995 additions and 1832 deletions

View File

@ -72,6 +72,9 @@ function HandBookHeroInfoPanel:InitComponent()
this.btnList = Util.GetGameObject(self.transform,"btnList") this.btnList = Util.GetGameObject(self.transform,"btnList")
this.btnPre = Util.GetGameObject(self.transform,"btnInfo") this.btnPre = Util.GetGameObject(self.transform,"btnInfo")
this.select = Util.GetGameObject(self.transform, "selectBtn") this.select = Util.GetGameObject(self.transform, "selectBtn")
this.btnMask = Util.GetGameObject(self.transform, "btnMask")
this.btnMask.gameObject:SetActive(false)
end end
--绑定事件(用于子类重写) --绑定事件(用于子类重写)
@ -331,6 +334,7 @@ function HandBookHeroInfoPanel:RightBtnOnClick()
if isClickLeftOrRightBtn == false then if isClickLeftOrRightBtn == false then
return return
end end
this.btnMask.gameObject:SetActive(true)
isClickLeftOrRightBtn = false isClickLeftOrRightBtn = false
self.rightBtn:GetComponent("Button").enabled = false self.rightBtn:GetComponent("Button").enabled = false
local oldIndexConfigData = heroDatas[index] local oldIndexConfigData = heroDatas[index]
@ -362,6 +366,7 @@ function HandBookHeroInfoPanel:RightBtnOnClick()
this.rightBtn:GetComponent("Button").enabled = true this.rightBtn:GetComponent("Button").enabled = true
isClickLeftOrRightBtn = true isClickLeftOrRightBtn = true
this:UpdateHeroInfoData() this:UpdateHeroInfoData()
this.btnMask.gameObject:SetActive(false)
end):SetEase(Ease.Linear) end):SetEase(Ease.Linear)
end end
@ -370,6 +375,7 @@ function HandBookHeroInfoPanel:LeftBtnOnClick()
if isClickLeftOrRightBtn == false then if isClickLeftOrRightBtn == false then
return return
end end
this.btnMask.gameObject:SetActive(true)
isClickLeftOrRightBtn = false isClickLeftOrRightBtn = false
self.leftBtn:GetComponent("Button").enabled = false self.leftBtn:GetComponent("Button").enabled = false
local oldIndexConfigData = heroDatas[index] local oldIndexConfigData = heroDatas[index]
@ -401,6 +407,7 @@ function HandBookHeroInfoPanel:LeftBtnOnClick()
this.leftBtn:GetComponent("Button").enabled = true this.leftBtn:GetComponent("Button").enabled = true
isClickLeftOrRightBtn = true isClickLeftOrRightBtn = true
this:UpdateHeroInfoData() this:UpdateHeroInfoData()
this.btnMask.gameObject:SetActive(false)
end):SetEase(Ease.Linear) end):SetEase(Ease.Linear)
end end

View File

@ -773,15 +773,14 @@ function this:TabBtnAction(id,actType,data)
JumpManager.GoJump(75001) JumpManager.GoJump(75001)
elseif id == FUNCTION_OPEN_TYPE.ARENA then elseif id == FUNCTION_OPEN_TYPE.ARENA then
UIManager.OpenPanel(UIName.ArenaTopMatchPanel) UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
end elseif id == 93 then
else
if id == 666 then
UIManager.OpenPanel(UIName.UpGradePackagePanel) UIManager.OpenPanel(UIName.UpGradePackagePanel)
elseif id == 668 then elseif id == 94 then
UIManager.OpenPanel(UIName.ActivityMainPanel,id) UIManager.OpenPanel(UIName.ActivityMainPanel,668)
elseif id == 667 then elseif id == 95 then
UIManager.OpenPanel(UIName.TimeLimitSkinPanel) UIManager.OpenPanel(UIName.TimeLimitSkinPanel)
end end
else
end end
end end

View File

@ -118,6 +118,9 @@ function RoleInfoPanel:InitComponent()
this.rightBtn = Util.GetGameObject(self.transform, "rightBtn/GameObject") this.rightBtn = Util.GetGameObject(self.transform, "rightBtn/GameObject")
-- 上部货币显示 -- 上部货币显示
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft}) this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
this.btnMask = Util.GetGameObject(self.transform, "rolePanel/btnMask")
this.btnMask.gameObject:SetActive(false)
end end
--绑定事件(用于子类重写) --绑定事件(用于子类重写)
@ -310,6 +313,7 @@ function this:RightBtnOnClick()
return return
end end
isClickLeftOrRightBtn = false isClickLeftOrRightBtn = false
this.btnMask.gameObject:SetActive(true)
local oldIndexConfigData = heroDatas[index] local oldIndexConfigData = heroDatas[index]
index = (index + 1 <= #heroDatas and index + 1 or 1) index = (index + 1 <= #heroDatas and index + 1 or 1)
curHeroData = heroDatas[index] curHeroData = heroDatas[index]
@ -335,6 +339,7 @@ function this:RightBtnOnClick()
this.rightBtn:GetComponent("Button").enabled = true this.rightBtn:GetComponent("Button").enabled = true
isClickLeftOrRightBtn = true isClickLeftOrRightBtn = true
this:UpdateHeroInfoData() this:UpdateHeroInfoData()
this.btnMask.gameObject:SetActive(false)
end):SetEase(Ease.Linear) end):SetEase(Ease.Linear)
this:SetPanelBg(curHeroData.heroConfig) this:SetPanelBg(curHeroData.heroConfig)
@ -345,6 +350,7 @@ function this:LeftBtnOnClick()
if isClickLeftOrRightBtn == false then if isClickLeftOrRightBtn == false then
return return
end end
this.btnMask.gameObject:SetActive(true)
isClickLeftOrRightBtn = false isClickLeftOrRightBtn = false
this.leftBtn:GetComponent("Button").enabled = false this.leftBtn:GetComponent("Button").enabled = false
local oldIndexConfigData = heroDatas[index] local oldIndexConfigData = heroDatas[index]
@ -372,6 +378,7 @@ function this:LeftBtnOnClick()
this.leftBtn:GetComponent("Button").enabled = true this.leftBtn:GetComponent("Button").enabled = true
isClickLeftOrRightBtn = true isClickLeftOrRightBtn = true
this:UpdateHeroInfoData() this:UpdateHeroInfoData()
this.btnMask.gameObject:SetActive(false)
end):SetEase(Ease.Linear) end):SetEase(Ease.Linear)
this:SetPanelBg(curHeroData.heroConfig) this:SetPanelBg(curHeroData.heroConfig)