diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_fourQuadrant.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_fourQuadrant.lua index a9fed5f418..408e7edbe4 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_fourQuadrant.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_fourQuadrant.lua @@ -43,9 +43,9 @@ function this:OnShow(_parent,...) index=index+1 local skillText=textObj:GetComponent("Text") if configInfo.Star==professionLv then - skillText.text=string.format("%s级:所有%s神将%s",fourQuadConfigArr[i].Star,professionName,passiveSkillConfig.Desc) + skillText.text=string.format("%s级:%s",fourQuadConfigArr[i].Star,passiveSkillConfig.Desc) else - skillText.text=string.format("%s级:所有%s神将%s",fourQuadConfigArr[i].Star,professionName,passiveSkillConfig.Desc) + skillText.text=string.format("%s级:%s",fourQuadConfigArr[i].Star,passiveSkillConfig.Desc) end textObj.gameObject:SetActive(true) end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index 96a2eda702..f15e85d1ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -502,6 +502,7 @@ function this.HeroCalculateFourQuaWarForce(_professionId) end end end + --计算共鸣属性加成 if this.GetFourQuadrantGongmingLv()>0 then local fourQuadConfig = ConfigManager.GetConfigDataByKey(ConfigName.FourQuadrantConfig,"Star",this.GetFourQuadrantGongmingLv()) for i = 1, #fourQuadConfig.PropResonance do @@ -513,6 +514,15 @@ function this.HeroCalculateFourQuaWarForce(_professionId) end end end + -- 计算技能属性加成 + for key,value in pairs(this.FourQuadrantData) do + if value.level>0 then + local fourQuadConfig = ConfigManager.GetConfigDataByKey(ConfigName.FourQuadrantConfig,"Star",value.level) + local professionSkillAdd=fourQuadConfig.Skill[key] + addAllProVal[professionSkillAdd[1]]=professionSkillAdd[2] + end + end + return addAllProVal end