From a24c1e201691cf99b863e35a44840c4bf4561da1 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 11 Sep 2020 21:53:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E7=A7=8D=E9=81=93=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardItemSingleShowPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 7f555c1a3d..b415503b70 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -203,7 +203,7 @@ function RewardItemSingleShowPopup:OnShow() end for i = 1, #jumpSortData do if jumpSortData[i].id > 0 then - if this.isRewardItemPop == true or itemConfigData.Id == 61 then--(24暂时关闭) + if this.isRewardItemPop == true or itemConfigData.Id == 61 or itemConfigData.Id == 19 then--(24暂时关闭) SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false) else SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true) From 8bc87ca492ffc0bff8acb30bfa6e69ea23b3b4b7 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 25 Jul 2020 17:08:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 37ccdbe097..935d4d5551 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -197,14 +197,14 @@ end --组合当前选项数据 function this:GetCurSortHeroListData() - local heros = {} - this:SetSelectBtn() + local heros = {} if proId ~= ProIdConst.All then heros = HeroManager.GetHeroDataByProperty(proId) else heros = tarHero end this:SetRoleList(heros) + this:SetSelectBtn() end --设置英雄列表数据 @@ -270,11 +270,8 @@ function this.SingleHeroDataShow(_go,_heroData) end) end function this:SetSelectBtn() - -- this.selectBtn:SetActive(proId ~= ProIdConst.All) - -- if proId ~= ProIdConst.All then - this.selectBtn.transform.localPosition = tabs[proId].transform.localPosition - --Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = HeroElementDef[proId] - -- end + this.selectBtn.transform:SetParent(tabs[proId].transform) + this.selectBtn:GetComponent("RectTransform").localPosition = Vector3.zero end function this:SortHeroDatas(_heroDatas) --上阵最优先,星级优先,同星级等级优先,同星级同等级按sortId排序。排序时降序排序。