From 6509e3c7067177cc734b78f4e3ce262797c7e819 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 25 Jan 2021 21:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E6=88=98=E5=8A=9B=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E3=80=91=E5=A5=97=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Hero/PropHero.lua | 67 ++++++++----------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua index 3ef6e81a81..295a27a833 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua @@ -158,52 +158,41 @@ Hero_Prop_Func = { -- 普通装备 [Hero_Prop_Type.Equip] = function(_heroData) + local equipIdList = {} local addAllProVal = {} for i, v in ConfigPairs(propertyConfig) do addAllProVal[i] = 0 end - local tData = heroConfig[_heroData.tId] - local equipSuit = {} - --[id] = 件数 - LogBlue("装备件数".. #_heroData.equipList) - for i = 1, #_heroData.equipList do - local curEquip = _heroData.equipList[i] - if curEquip then - for index, prop in ipairs(curEquip.mainAttribute) do - local id = prop.propertyId - local value = prop.propertyValue - if addAllProVal[id] then - addAllProVal[id] = addAllProVal[id] + value - else - addAllProVal[id] = value + local curHeroData = _heroData + if curHeroData then + for i = 1, #curHeroData.equipList do + table.insert(equipIdList,curHeroData.equipList[i].id) + end + local equipSuit = HeroManager.GetCurHeroEquipSuitPros(equipIdList) + --[id] = 件数 + for i = 1, #equipIdList do + local curEquip = _heroData.equipList[i] + if curEquip then + for index, prop in ipairs(curEquip.mainAttribute) do + local id = prop.propertyId + local value = prop.propertyValue + if addAllProVal[id] then + addAllProVal[id] = addAllProVal[id] + value + else + addAllProVal[id] = value + end end end - --套装加成 - if equipSuit[curEquip.equipConfig.SuiteID] then - equipSuit[curEquip.equipConfig.SuiteID] = equipSuit[curEquip.equipConfig.SuiteID] + 1 - else - equipSuit[curEquip.equipConfig.SuiteID] = 1 - end end - end - - if equipSuit and LengthOfTable(equipSuit) > 0 then - for i, v in pairs(equipSuit) do - local curSuitConfig = equipsuite[i] - if v > 1 then - if curSuitConfig and curSuitConfig.SuiteValue then - for j = 1, #curSuitConfig.SuiteValue do - if v >= curSuitConfig.SuiteValue[j][1] then - local curProId = curSuitConfig.SuiteValue[j][2] - local curProVal = curSuitConfig.SuiteValue[j][3] - --LogError("套装激活 "..i .." "..v.." curProId "..curProId .." "..curProVal) - if addAllProVal[curProId] then - addAllProVal[curProId] = addAllProVal[curProId] + curProVal - else - addAllProVal[curProId] = curProVal - end - end - end + if equipSuit and #equipSuit > 0 then + for i, v in ipairs(equipSuit) do + local curSuitConfig = equipsuite[i] + local curProId = equipSuit[i][2][2] + local curProVal = equipSuit[i][2][3] + if addAllProVal[curProId] then + addAllProVal[curProId] = addAllProVal[curProId] + curProVal + else + addAllProVal[curProId] = curProVal end end end