From d7276eae64cd382c71d55f888e6795a6d475854b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sun, 26 Sep 2021 15:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=8A=9B=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Likability/LikabilityManager.lua | 27 ++++++++++++------- .../~Lua/Modules/Net/NetManager.lua | 3 ++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua index 8e160b8518..81f372eff3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua @@ -124,6 +124,13 @@ function this.UpdatelBackData(heroId,value,isAdd) this.AllHeroDataLikAbility[heroId].value = this.AllHeroDataLikAbility[heroId].value + value end this.AllHeroDataLikAbility[heroId].likeLv = this.GetTotalHeroLikeLv(value) + local herodata = HeroManager.GetAllHeroList() + for k,v in pairs(herodata) do + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.LikeAbility) + if v.id == heroId then + HeroPropManager.SetDirtyByType(v.id, Hero_Prop_Type.LikeAbility) + end + end end function this.UpdatelSingleHeroData(heroId,itemId,itemNum) @@ -190,7 +197,7 @@ function this.GetProData(indexType,index,lv) end else for _,n in ipairs(list) do - if n.Property and #n.Property > 0 and lv <= n.lv then + if n.Property and #n.Property > 0 and lv >= n.lv then if n.Property and #n.Property > 0 then for i = 1,#n.Property do if not allPro[n.Property[i][1]] then @@ -229,7 +236,7 @@ function this.GetPrivilageProData(indexType,index,lv) end else for _,n in ipairs(list) do - if n.priPro and #n.priPro > 0 and lv <= n.lv then + if n.priPro and #n.priPro > 0 and lv >= n.lv then if n.priPro and #n.priPro > 0 then for i = 1,#n.priPro do if not allPro[n.priPro[i][1]] then @@ -249,19 +256,19 @@ function this.GetTotalForce(heroData) local AllHeroProVal = {} local lv,totalNum = 0,0 if heroData then - if this.AllHeroDataLikAbility[heroData.id] then - lv,totalNum = this.GetLv(2,this.AllHeroDataLikAbility[heroData.id].value) + if this.AllHeroDataLikAbility[heroData.tId] then + lv,totalNum = this.GetLv(2,this.AllHeroDataLikAbility[heroData.tId].value) SingleProVal = this.GetProData(2,-1,lv) end end local totalCurNum,totalLv,totalNum = this.GetTotalHeroLikeLv(-1) AllHeroProVal = this.GetProData(1,-1,totalLv) - for k,v in pairs(SingleProVal) do - LogGreen("SingleProVal k:"..k.." v:"..v) - end - for k,v in pairs(AllHeroProVal) do - LogGreen("AllHeroProVal k:"..k.." v:"..v) - end + -- for k,v in pairs(SingleProVal) do + -- LogGreen("SingleProVal k:"..k.." v:"..v) + -- end + -- for k,v in pairs(AllHeroProVal) do + -- LogGreen("AllHeroProVal k:"..k.." v:"..v) + -- end return SingleProVal, AllHeroProVal end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 2f99052013..af11456e3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5865,6 +5865,7 @@ function NetManager.GetLikeableDataRequest(func) local msg = HeroInfoProto_pb.GetLikableDataResponse() msg:ParseFromString(data) LikabilityManager.UpdateAllBackData(msg) + if func then func() end @@ -5883,7 +5884,7 @@ function NetManager.HeroUpLikableRequest(heroId,itemId,itemNum,func) for k,v in pairs(herodata) do HeroPropManager.SetFuncPropDirty(Func_Prop_Type.LikeAbility) if v.id == heroId then - HeroPropManager.SetDirtyByType(v.id, Hero_Prop_Type.LikeAbility) + HeroPropManager.SetDirtyByType(v.dynamicId, Hero_Prop_Type.LikeAbility) end end if func then