From 9f8ee231acf9171cdec1c8f141f3e8f7a3d6d86b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 11 Jan 2022 17:51:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=95=B0=E6=8D=AE=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua | 6 +++--- .../ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index 2d97539842..e52d33dae9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -191,7 +191,7 @@ function RewardEquipSingleShowPopup2:OnOpen(_parent,_equipData,_openType,_isShow end self.parent = _parent --父界面 self.equipData = _equipData --当前装备数据 - self.openType = _openType --0不显示按钮、1背包、2已穿戴(显示卸下)、3未穿戴(显示穿戴)、4未穿戴(显示替换) + self.openType = _openType --0不显示按钮、1背包、2已穿戴(显示卸下)、3未穿戴(显示穿戴)、4未穿戴(显示替换)、5自己或其他人穿戴(非装备界面但需要显示套装属性) self.howGet:SetActive(_isShowGet and true or false)--是否显示获取途径 self.btnGrid:SetActive(self.openType ~= 0) self.curHeroData = _curHeroData --装备了该装备的英雄数据 @@ -294,7 +294,7 @@ function RewardEquipSingleShowPopup2:OnShow() --suitPro套装属性 --获取装备套装属性 local equipSuite = {} - if self.curHeroData and self.openType == 2 then + if self.curHeroData and (self.openType == 2 or self.openType == 5) then equipSuite = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList) end local curProSuitConFig = suitConFig[equipConfigData.Star] @@ -328,7 +328,7 @@ function RewardEquipSingleShowPopup2:OnShow() --super白金套装属性 --获取装备白金套装属性 local equipGoldSuite = {} - if self.curHeroData and self.openType == 2 then + if self.curHeroData and (self.openType == 2 or self.openType == 5) then equipGoldSuite = HeroManager.GetCurHeroBaiJinEquipSuitPros(self.curHeroData.equipIdList) end local curGoldSuitConFig = suitConFig[equipConfigData.Star] diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 1b9cd26bf1..59e15a72b9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -417,17 +417,16 @@ function this.EquipInfo() -- LogRed(tostring(curEquipData.homeEquipLv[1]).." "..tostring(curEquipData.homeEquipLv[2])) this.treasureDatas[pos]:OnOpen(false, {curEquipData.id,0}, 0.8, false, false, false, 0,nil,curEquipData) end - + local frameBtn = Util.GetGameObject(pos, "mask") Util.AddOnceClick(frameBtn, function() if curEquipData then -- UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i],0,nil,0) - UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, curHeroEquipDatas[i],0,false,false,curHeroData) + UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, curHeroEquipDatas[i],5,false,false,curHeroData) end end) end - - + --宝器 for m = 1, 2 do Util.GetGameObject(this.babyGrid,"Pre"..m.."/Text"):GetComponent("RectTransform").sizeDelta = GetCurLanguage() == 0 and Vector2.New(48, 95) or Vector2.New(95, 95)