From 4bb6004ace3c254b81fe5a6d848df6e8633453f7 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 19 Apr 2021 18:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=8B=B1=E9=9B=84=E5=8D=87=E6=98=9F?= =?UTF-8?q?=E7=A5=AD=E5=93=81=E3=80=91=E6=8F=90=E4=BA=A4=E2=80=94=E2=80=94?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Hero/HeroManager.lua | 18 ++++++++++++++++-- .../~Lua/Modules/RoleInfo/RoleAwakeLayout.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleUpStarLayout.lua | 2 +- .../Modules/RoleInfo/RoleUpStarListPanel.lua | 2 ++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index adb4c46f12..a5538f9377 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -766,12 +766,26 @@ function this.GetUpStarHeroListData(heroRankUpGroupId, heroData) end end ) - local canSeleItemIds = {} --前边以前添加英雄代码不动 + local canSeleItemIds = {} + if heroRankUpGroup.ItemCamp and #heroRankUpGroup.ItemCamp > 0 then + for i = 1, #heroRankUpGroup.ItemCamp do + if heroData.heroConfig.PropertyName == heroRankUpGroup.ItemCamp[i][1] then + local itemId = heroRankUpGroup.ItemCamp[i][2] + local haveNum = BagManager.GetItemCountById(itemId) + if haveNum > 0 then + for i = 1, haveNum do + local v = {} + v.id = itemId + table.insert(canSeleItemIds,itemId) + end + end + end + end + end if heroRankUpGroup.Items and #heroRankUpGroup.Items > 0 then for i = 1, #heroRankUpGroup.Items do local itemId = heroRankUpGroup.Items[i] - LogYellow("itemId "..itemId) local haveNum = BagManager.GetItemCountById(itemId) if haveNum > 0 then for i = 1, haveNum do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua index f82478defe..8148a21c76 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua @@ -64,7 +64,7 @@ end --绑定事件(用于子类重写) function RoleAwakeLayout:BindEvent() --升星 - Util.AddClick(this.upStarBtn, function() + Util.AddOnceClick(this.upStarBtn, function() this.StarUpClick() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua index 3e00ac1778..a339a0d4b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua @@ -65,7 +65,7 @@ end --绑定事件(用于子类重写) function RoleUpStarLayout:BindEvent() --升星 - Util.AddClick(this.upStarBtn, function() + Util.AddOnceClick(this.upStarBtn, function() self:StarUpClick() end) --前往化虚坛 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 67d13bf9aa..8f833b6858 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -323,6 +323,8 @@ function this.HeroSortData(heroData) else return (a.isFormation == "" or (a.isFormation ~= "" and a.isFormation == Language[10410])) and (not b.dynamicId ~= "" and b.isFormation ~= Language[10410]) end + elseif a.type == b.type and a.type == RoleUpStarMatType.item and b.type == RoleUpStarMatType.item then + return a.id > b.id else return a.type > b.type end