From a54cd46bc42cf7062fe80670ae2401a4f98f9a58 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 14 Sep 2021 11:37:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9B=9B=E8=B1=A1=E5=BF=83=E6=B3=95?= =?UTF-8?q?=E3=80=91=E6=B7=BB=E5=8A=A0=E6=8A=80=E8=83=BD=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8A=A0=E6=88=90=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View2/GeneralInfoPopup_fourQuadrant.lua | 4 ++-- .../~Lua/Modules/Practice/PracticeManager.lua | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) 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