From 5139cd7033441ef3863aad6ec1400e9340fc8379 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 13 Jan 2022 15:34:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E5=A5=97=E8=A3=85?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E3=80=91=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=B8=8A?= =?UTF-8?q?=E5=A5=97=E8=A3=85=E5=B1=9E=E6=80=A7=E6=98=BE=E7=A4=BA=E6=9C=AA?= =?UTF-8?q?=E6=BF=80=E6=B4=BB?= 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 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index 2d97539842..640c696098 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -191,9 +191,10 @@ function RewardEquipSingleShowPopup2:OnOpen(_parent,_equipData,_openType,_isShow end self.parent = _parent --父界面 self.equipData = _equipData --当前装备数据 - self.openType = _openType --0不显示按钮、1背包、2已穿戴(显示卸下)、3未穿戴(显示穿戴)、4未穿戴(显示替换) + self.isOpenBtn = _openType > 0 -- 负数不打开操作按钮 + self.openType = math.abs(_openType) -- 绝对值 0不显示按钮、1背包、2已穿戴(显示卸下)、3未穿戴(显示穿戴)、4未穿戴(显示替换) self.howGet:SetActive(_isShowGet and true or false)--是否显示获取途径 - self.btnGrid:SetActive(self.openType ~= 0) + self.btnGrid:SetActive(self.isOpenBtn) self.curHeroData = _curHeroData --装备了该装备的英雄数据 self.position = _position --装备的位置 self.nextEquip = _targetEquipData--要替换的目标装备 @@ -308,6 +309,7 @@ function RewardEquipSingleShowPopup2:OnShow() end _suitProList[i].gameObject:SetActive(true) end + for i = 1, #suiteValue do _suitProList[i].gameObject:SetActive(true) local name = Util.GetGameObject(_suitProList[i].transform, "proName"):GetComponent("Text") diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 1b9cd26bf1..0176986d2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -422,7 +422,7 @@ function this.EquipInfo() 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], -2, false,false,curHeroData) end end) end