diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua index 8148a21c76..f26512bb60 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua @@ -257,7 +257,7 @@ function this.AutoSelectUpStarHeroList(_curUpStarData) table.insert(curSelectHeroList,upStarHeroListData.heroList[i]) end end - this:UpdateUpStarPosHeroData(curSelectHeroList) + this.UpdateUpStarPosHeroData(curSelectHeroList) end end end @@ -309,7 +309,7 @@ function this.SetShowHeroListData(upStarConsumeMaterial,curHeroList)--1 消耗 for _, v in pairs(curEndShowHeroListData) do if v.type == RoleUpStarMatType.hero and v.dynamicId==upStarConsumeMaterial[j][k].dynamicId then v.isSelect=1 - elseif v.type == RoleUpStarMatType.item and v.index==upStarConsumeMaterial[j][k].index then + elseif v.type == RoleUpStarMatType.item and v.id==upStarConsumeMaterial[j][k].id and v.index==upStarConsumeMaterial[j][k].index then v.isSelect=1 end end @@ -317,7 +317,7 @@ function this.SetShowHeroListData(upStarConsumeMaterial,curHeroList)--1 消耗 for i, v in pairs(curEndShowHeroListData) do if v.type == RoleUpStarMatType.hero and v.dynamicId==upStarConsumeMaterial[j][k].dynamicId then curEndShowHeroListData[i] = nil - elseif v.type == RoleUpStarMatType.item and v.index==upStarConsumeMaterial[j][k].index then + elseif v.type == RoleUpStarMatType.item and v.id==upStarConsumeMaterial[j][k].id and v.index==upStarConsumeMaterial[j][k].index then curEndShowHeroListData[i] = nil end end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua index a339a0d4b8..089641c8b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua @@ -359,7 +359,7 @@ function RoleUpStarLayout:SetShowHeroListData(upStarConsumeMaterial,curHeroList) for _, v in pairs(curEndShowHeroListData) do if v.type == RoleUpStarMatType.hero and v.dynamicId==upStarConsumeMaterial[j][k].dynamicId then v.isSelect=1 - elseif v.type == RoleUpStarMatType.item and v.index==upStarConsumeMaterial[j][k].index then + elseif v.type == RoleUpStarMatType.item and v.id==upStarConsumeMaterial[j][k].id and v.index==upStarConsumeMaterial[j][k].index then v.isSelect=1 end end @@ -367,7 +367,7 @@ function RoleUpStarLayout:SetShowHeroListData(upStarConsumeMaterial,curHeroList) for i, v in pairs(curEndShowHeroListData) do if v.type == RoleUpStarMatType.hero and v.dynamicId==upStarConsumeMaterial[j][k].dynamicId then curEndShowHeroListData[i] = nil - elseif v.type == RoleUpStarMatType.item and v.index==upStarConsumeMaterial[j][k].index then + elseif v.type == RoleUpStarMatType.item and v.id==upStarConsumeMaterial[j][k].id and v.index==upStarConsumeMaterial[j][k].index then curEndShowHeroListData[i] = nil end end