diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_fourQuadrant.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_fourQuadrant.lua index 408e7edbe4..d2e73dc404 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_fourQuadrant.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_fourQuadrant.lua @@ -34,18 +34,18 @@ function this:OnShow(_parent,...) local index=0 this.title.text=string.format("四象心法-%s",professionName) local fourQuadConfigArr = ConfigManager.GetConfig(ConfigName.FourQuadrantConfig) - LogRed("四象心法config:"..#fourQuadConfigArr) for i, configInfo in ConfigPairs(fourQuadConfigArr) do if configInfo.Star>0 then - local PassiveSkillId=configInfo.Skill[professionId] - local passiveSkillConfig= ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,PassiveSkillId) + local propId=configInfo.Skill[professionId][1] + local propAdd=configInfo.Skill[professionId][2]/100 + local propertyConfig= ConfigManager.GetConfigDataByKey(ConfigName.PropertyConfig,"PropertyId",propId) local textObj =this.addList.transform:GetChild(index) index=index+1 local skillText=textObj:GetComponent("Text") if configInfo.Star==professionLv then - skillText.text=string.format("%s级:%s",fourQuadConfigArr[i].Star,passiveSkillConfig.Desc) + skillText.text=string.format("%s级:全体神将%s+%s%%",fourQuadConfigArr[i].Star,propertyConfig.Info,propAdd) else - skillText.text=string.format("%s级:%s",fourQuadConfigArr[i].Star,passiveSkillConfig.Desc) + skillText.text=string.format("%s级:全体神将%s+%s%%",fourQuadConfigArr[i].Star,propertyConfig.Info,propAdd) end textObj.gameObject:SetActive(true) end