From 0e0d5ffdb03aa7dac19ed257dd4ac1b3833af3f6 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 10 Aug 2021 14:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5=E3=80=91?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=EF=BC=9A=E5=85=B1=E9=B8=A3=E6=95=88=E6=9E=9C?= =?UTF-8?q?100=E7=BA=A7=EF=BC=8C=E4=B8=8A=E9=98=B5=E5=85=B1=E9=B8=A3?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=EF=BC=8C=E5=9C=A8=E5=8C=96=E8=99=9A=E5=9D=9B?= =?UTF-8?q?=E4=B8=AD=E8=BF=9B=E9=98=B6=E8=AF=A5=E7=A5=9E=E5=B0=86=EF=BC=8C?= =?UTF-8?q?=E8=BF=9B=E9=98=B6=E5=90=8E=E5=9C=A8=E9=B8=BF=E8=92=99=E9=98=B5?= =?UTF-8?q?=E6=8A=8A=E8=AF=A5=E7=A5=9E=E5=B0=86=E5=8D=B8=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=9C=A8=E7=A5=9E=E5=B0=86=E6=83=85=E6=8A=A5=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=8D=87=E7=BA=A7=EF=BC=8C=E5=8D=87=E7=BA=A7=E5=90=8E?= =?UTF-8?q?=E9=87=8D=E7=99=BB=EF=BC=8C=E8=BF=98=E5=8E=9F=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=A4=A9=E8=B5=8B=EF=BC=8C=E4=BD=86=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/CompoundHero/view/CompoundHero_Compound.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 6 ++++-- .../~Lua/Modules/RoleInfo/RoleUpStarLayout.lua | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index c24a2bd330..9faf7ef898 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -521,7 +521,7 @@ function this.Compound() end --扣除升星 消耗的材料 更新英雄数据 function this.DeleteUpStarMaterials() - HeroManager.UpdateSingleHeroDatas(curSelectHero.dynamicId,curSelectHero.lv,curSelectHero.star+1,curSelectHero.breakId,upStarRankUpConfig.Id,true) + HeroManager.UpdateSingleHeroDatas(curSelectHero.dynamicId,nil,curSelectHero.star+1,nil,upStarRankUpConfig.Id,true) HeroManager.UpdateSingleHeroSkillData(curSelectHero.dynamicId) --本地数据删除材料英雄 for i = 1, #upStarConsumeMaterial do diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 6d5704c103..28ca640e2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -518,9 +518,11 @@ end --更新本地单个英雄基本信息 function this.UpdateSingleHeroDatas(heroDId, heroLv, heroStar, breakId, upStarId, isCallBackChangeWar) if heroDatas[heroDId] then - heroDatas[heroDId].lv = heroLv + if heroLv then--鸿蒙阵上阵的等级是虚等级 升星不必赋值传nil 即可 + heroDatas[heroDId].lv = heroLv + end heroDatas[heroDId].star = heroStar - if breakId then + if breakId then--鸿蒙阵上阵的突破等级是虚等级 升星不必赋值传nil 即可 heroDatas[heroDId].breakId = breakId end heroDatas[heroDId].upStarId = upStarId diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua index e4351cad81..d206ee9767 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua @@ -464,7 +464,7 @@ function RoleUpStarLayout:StarUpClick() end --扣除升星 消耗的材料 更新英雄数据 function RoleUpStarLayout:DeleteUpStarMaterials() - HeroManager.UpdateSingleHeroDatas(curHeroData.dynamicId,curHeroData.oriLv,curHeroData.star+1,nil,upStarRankUpConfig.Id,true) + HeroManager.UpdateSingleHeroDatas(curHeroData.dynamicId,nil,curHeroData.star+1,nil,upStarRankUpConfig.Id,true) HeroManager.UpdateSingleHeroSkillData(curHeroData.dynamicId) for i, v in pairs(heroDatas) do if curHeroData == v then