From b0c69c81a88553a869baf06360d816d25b5babde Mon Sep 17 00:00:00 2001
From: yuanshuai <243578945@qq.com>
Date: Fri, 17 Sep 2021 15:18:50 +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=8A=80=E8=83=BD=E5=8A=A0=E6=88=90bug=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../View2/GeneralInfoPopup_fourQuadrant.lua | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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