From 2f31dad427cf03e0fbf9eee53ae96b00fabede8f Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 12 Oct 2020 13:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=20=20=20vi?= =?UTF-8?q?p=20=E6=88=98=E5=8A=9B=E8=AE=A1=E7=AE=97=E6=89=93=E5=BC=80=20?= =?UTF-8?q?=20=E5=8F=AA=E6=98=AF=E8=A1=A8=E7=9A=84=20pvp=20=E8=AF=84?= =?UTF-8?q?=E5=88=86=E9=85=8D=E6=88=900?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 50ad6962c0..347ef6b4a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -1686,7 +1686,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt -- end --end -- Vip加成 暂时注释 - -- local vipAddPro = VipManager.GetAddPro() + local vipAddPro = VipManager.GetAddPro() --if vipAddPro and LengthOfTable(vipAddPro) > 0 then -- for i, v in pairs(vipAddPro) do -- if v > 0 then @@ -1703,7 +1703,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt this.DoubleTableCompound(allAddProVal, playerDcorateAdd) this.DoubleTableCompound(allAddProVal, heroSkillSingleHeroProVal) this.DoubleTableCompound(allAddProVal, equipTreasureAddPro) - -- this.DoubleTableCompound(allAddProVal, vipAddPro) + this.DoubleTableCompound(allAddProVal, vipAddPro) --100等级所有属性合并 this.DoubleTableCompound(lvProVal, falismanLvProVal) this.DoubleTableCompound(lvProVal,lvSoulPrintProVal)