diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index f7b07a646c..ca85ad383b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -1754,13 +1754,10 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt local guildSkillAllProAdd = GuildSkillManager.HeroCalculateGuildSkillWarForce(curHeroData.heroConfig.Profession) LogRed_Prop("公会技能加成") LogRedTable_Prop(guildSkillAllProAdd) - --for i, v in pairs(guildSkillAllProAdd) do - -- if v > 0 then - -- LogError("公会技能加成 "..i.." "..v) - -- end - --end --四象心法加成 local fourQuaderAllProAdd = PracticeManager.HeroCalculateFourQuaWarForce(curHeroData.heroConfig.Profession) + LogRed_Prop("四象心法加成") + LogRedTable_Prop(fourQuaderAllProAdd) --英雄被动技能属性加成 local heroSkillSingleHeroProVal, heroSkillLvProVal, heroSkillAllHeroProVal, heroSkillSpecialProVal = {}, {}, {}, {} diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropFunc.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropFunc.lua index bef1985237..6be6540c14 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/PropFunc.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropFunc.lua @@ -11,6 +11,7 @@ Func_Prop_Type = { Practice = 8, -- 修行 PlayerExtra = 9, -- 玩家称号 皮肤 坐骑 TechTree = 10, -- 神树 + FourQua = 11, -- 四象心法 } -- 计算需要缓存数据的方法 @@ -70,6 +71,14 @@ Func_Prop_Func = { end return profPropList end, + -- 四象心法 + [Func_Prop_Type.FourQua] = function() + local profPropList = {} + for _, prof in pairs(Hero_Profession_Type) do + profPropList[prof] = PracticeManager.HeroCalculateFourQuaWarForce(prof) + end + return profPropList + end, } @@ -123,4 +132,9 @@ Func_Prop_Filter = { local config = HeroConfig[heroData.tId] return funcData[config.Profession] end, + -- 四象心法 + [Func_Prop_Type.FourQua] = function(funcData, heroData) + local config = HeroConfig[heroData.tId] + return funcData[config.Profession] + end, } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index bbf8f43b6a..d2c0caa314 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -424,6 +424,8 @@ function this.InitFourQuadrantData(_dataList) end this.UpdateUpStarProperty() + -- 设置四象心法脏数据 + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.FourQua) end --更新进阶属性数据 @@ -472,12 +474,16 @@ function this.UpdateFourQuadrantProperty(_professionId,_propertyList) professionInfo.propertyList=_propertyList this.FourQuadrantData[_professionId]=professionInfo end + -- 设置四象心法脏数据 + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.FourQua) end --进阶刷新本地数据 function this.UpStarUpdateFourQuadrantData(_professionId,_msg) this.FourQuadrantData[_professionId].level=_msg.starLv this.FourQuadrantData[_professionId].propertyList=_msg.infoList this.UpdateUpStarProperty() + -- 设置四象心法脏数据 + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.FourQua) end --四象心法计算指定职业的属性加成