From 1d134fb6cc536275b5b870aed9b084038298d76a Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 28 Dec 2023 18:38:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=B1=9E=E6=80=A7=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 15851d8bc313c9f2ab095dbcfaa89834d36000a2) --- .../~Lua/Modules/Hero/PropHero.lua | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua index 8e172edbce..f3abd1a6c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua @@ -191,23 +191,36 @@ Hero_Prop_Func = { --LogError("equip id============================ id=="..id.." value=="..value) if id~=0 and id~=nil then if addAllProVal[id] then - addAllProVal[id] = addAllProVal[id] + value + if potencyAdd>0 and propertyConfig[id].Style == 1 then + addAllProVal[id] = addAllProVal[id] + math.floor(value*(1+potencyAdd)+0.5) + else + addAllProVal[id] = addAllProVal[id] + value + end + else - addAllProVal[id] = value - end - if propertyConfig[id].Style == 1 then--摘星阁加持 - --摘星阁加成先注释 - --addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) - --英雄潜能加成 - --LogError("addAllProVal[id]================================"..addAllProVal[id].." curEquip.potencyAdd=="..potencyAdd) - addAllProVal[id] = math.floor(addAllProVal[id]*(1+potencyAdd)+0.5) --+ math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) - --LogError("addAllProVal[id]后 ================================"..addAllProVal[id]) + if potencyAdd>0 and propertyConfig[id].Style == 1 then + addAllProVal[id] = math.floor(value*(1+potencyAdd)+0.5) + else + addAllProVal[id] = value + end + end + -- if propertyConfig[id].Style == 1 then--摘星阁加持 + -- --摘星阁加成先注释 + -- --addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) + -- --英雄潜能加成 + -- --LogError("addAllProVal[id]================================"..addAllProVal[id].." curEquip.potencyAdd=="..potencyAdd) + -- addAllProVal[id] = math.floor(value*(1+potencyAdd)+0.5) --+ math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) + -- --LogError("addAllProVal[id]后 ================================"..addAllProVal[id]) + -- end end end end end + -- for k, v in pairs(addAllProVal) do + -- LogError("k==============="..k.." v=========="..v) + -- end --屏蔽装备套装属性 -- if equipSuit and #equipSuit > 0 then -- for i, v in ipairs(equipSuit) do From 9eefea21c67793b4f08e10c6f0f58eb446d6e908 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 29 Dec 2023 14:06:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E8=8B=B1=E9=9B=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E3=80=91=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=E8=A3=85=E5=A4=87=E5=A5=97=E8=A3=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7=20=E5=AE=9D=E7=89=A9=E5=85=B1?= =?UTF-8?q?=E9=B8=A3=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=B1=9E=E6=80=A7=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Hero/HeroManager.lua | 43 +++++++++++++------ .../~Lua/Modules/Net/NetManager.lua | 2 +- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 456a0ebe65..e83b3c3417 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -1360,18 +1360,26 @@ local function CalculateHeroUpEquipsProAddVal(_heroId) 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] - -- LogError("套装激活 curProId "..curProId .." "..curProVal) - if addAllProVal[curProId] then - addAllProVal[curProId] = addAllProVal[curProId] + curProVal - else - addAllProVal[curProId] = curProVal + local curProId + if equipSuit[i] and equipSuit[i][2] and equipSuit[i][2][2] then + curProId = equipSuit[i][2][2] end + local curProVal + if equipSuit[i] and equipSuit[i][2] and equipSuit[i][2][3] then + curProVal = equipSuit[i][2][3] + end + if curProId and curProVal then + if addAllProVal[curProId] then + addAllProVal[curProId] = addAllProVal[curProId] + curProVal + else + addAllProVal[curProId] = curProVal + end + end + end end end @@ -1585,10 +1593,12 @@ end --英雄身上宝器属性计算 local function CalculateEquipTreaSureAddVal(_heroId) local addAllProVal = {} - local minLv - local mainRefineLv + local minLv=0 + local mainRefineLv=0 local curHeroData = HeroManager.GetSingleHeroData(_heroId) + LogError("_heroId===========================".._heroId) if curHeroData then + LogError("#curHeroData.jewels > 0=="..#curHeroData.jewels) if #curHeroData.jewels > 0 then for i = 1, #curHeroData.jewels do local did = curHeroData.jewels[i] @@ -1596,6 +1606,9 @@ local function CalculateEquipTreaSureAddVal(_heroId) EquipTreasureManager.GetSingleTreasureByIdDyn(did) or ExpeditionManager.GetSingleTreasureByIdDyn(did) or MonsterCampManager.GetSingleTreasureByIdDyn(did) + if curEuipTreaSureData==nil then + LogError("curEuipTreaSureData==nil") + end if curEuipTreaSureData then local curEuipTreaSureConfig = jewelConfig[curEuipTreaSureData.id] for _, configInfo in ConfigPairs(jewelRankupConfig) do @@ -1644,8 +1657,10 @@ local function CalculateEquipTreaSureAddVal(_heroId) -- end -- end end + if #curHeroData.jewels > 1 then --取 强化 精炼 最小值 + LogError("curEuipTreaSureData.lv=="..curEuipTreaSureData.lv) if minLv then if curEuipTreaSureData.lv < minLv then minLv = curEuipTreaSureData.lv @@ -1660,6 +1675,7 @@ local function CalculateEquipTreaSureAddVal(_heroId) else mainRefineLv = curEuipTreaSureData.refineLv end + LogError("curEuipTreaSureData.refineLv=="..curEuipTreaSureData.refineLv) end end end @@ -1696,6 +1712,7 @@ local function CalculateEquipTreaSureAddVal(_heroId) end -- if lvjewelResonanceConfig then + LogError("lvjewelResonanceConfig") for j = 1, #lvjewelResonanceConfig.Property do if addAllProVal[lvjewelResonanceConfig.Property[j][1]] then addAllProVal[lvjewelResonanceConfig.Property[j][1]] = @@ -1707,6 +1724,7 @@ local function CalculateEquipTreaSureAddVal(_heroId) end end if refineLvjewelResonanceConfig then + LogError("refineLvjewelResonanceConfig") for j = 1, #refineLvjewelResonanceConfig.Property do if addAllProVal[refineLvjewelResonanceConfig.Property[j][1]] then addAllProVal[refineLvjewelResonanceConfig.Property[j][1]] = @@ -1721,10 +1739,7 @@ local function CalculateEquipTreaSureAddVal(_heroId) end end end - -- LogError("11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111") - -- for k, v in pairs(addAllProVal) do - -- LogError("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111宝物 k====="..k.." v=="..v) - -- end + return addAllProVal end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 7809b35f25..f5325d7516 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -196,7 +196,7 @@ function this.PlayerInfoRequest(func) -- 当前波次 MonsterCampManager.SetMonsterCampCurWave(msg.monsterAttackTime) MonsterCampManager.SetRewardWave(msg.DemonsTrialRewardInfo) - MonsterCampManager. SetFriendHelpHero(msg.helpFightList) + MonsterCampManager.SetFriendHelpHero(msg.helpFightList) OperatingManager.SetSignInData(msg.SignInInfo) -- 月卡初始化数据