【装备】装备界面套装属性显示不正确修改

dev_chengFeng
ZhangBiao 2022-01-08 17:49:04 +08:00
parent 129250110f
commit 244c8050e0
1 changed files with 35 additions and 20 deletions

View File

@ -5,6 +5,7 @@ local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig) local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig)
local EquipStrengthen = ConfigManager.GetConfig(ConfigName.EquipStrengthen) local EquipStrengthen = ConfigManager.GetConfig(ConfigName.EquipStrengthen)
local EquipRankUp = ConfigManager.GetConfig(ConfigName.EquipRankUp) local EquipRankUp = ConfigManager.GetConfig(ConfigName.EquipRankUp)
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
local _BaseProList = {}--基础属性对象 local _BaseProList = {}--基础属性对象
local _suitProList = {}--套装属性对象 local _suitProList = {}--套装属性对象
local _superProList = {}--白金属性对象 local _superProList = {}--白金属性对象
@ -291,28 +292,33 @@ function RewardEquipSingleShowPopup2:OnShow()
end end
--suitPro套装属性 --suitPro套装属性
local equipSuit = {} --获取装备套装属性
if self.curHeroData then local equipSuite = {}
equipSuit = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList) if self.curHeroData and self.openType == 2 then
equipSuite = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
end end
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig) local curProSuitConFig = suitConFig[equipConfigData.Star]
if suitConFig[equipConfigData.Star] then if suitConFig[equipConfigData.Star] then
self.suitPro:SetActive(true) self.suitPro:SetActive(true)
local curSuitConFig = suitConFig[equipConfigData.Star] if curProSuitConFig then
if curSuitConFig then local suiteValue = curProSuitConFig.SuiteValue
for i = 1, math.max(#curSuitConFig.SuiteValue, #_suitProList) do for i = 1, math.max(#suiteValue, #_suitProList) do
if not _suitProList[i] then if not _suitProList[i] then
_suitProList[i] = newObjToParent(self.suitProPre, self.suitProGrid) _suitProList[i] = newObjToParent(self.suitProPre, self.suitProGrid)
end end
_suitProList[i].gameObject:SetActive(true) _suitProList[i].gameObject:SetActive(true)
end end
for i = 1, #curSuitConFig.SuiteValue do for i = 1, #suiteValue do
_suitProList[i].gameObject:SetActive(true) _suitProList[i].gameObject:SetActive(true)
local name = Util.GetGameObject(_suitProList[i].transform, "proName"):GetComponent("Text") local name = Util.GetGameObject(_suitProList[i].transform, "proName"):GetComponent("Text")
local value = Util.GetGameObject(_suitProList[i].transform, "proVale"):GetComponent("Text") local value = Util.GetGameObject(_suitProList[i].transform, "proVale"):GetComponent("Text")
local color = #equipSuit >= i and "00ff66" or "FCEBCA" if equipSuite[i] then
name.text = string.format("<color=#%s>%s+ %s</color>",color,GetLanguageStrById(propertyConfig[curSuitConFig.SuiteValue[i][2]].Info),GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3])) name.text = string.format("<color=#00ff66>%s+ %s</color>",GetLanguageStrById(propertyConfig[equipSuite[i][2][2]].Info),GetPropertyFormatStr(propertyConfig[equipSuite[i][2][2]].Style,equipSuite[i][2][3]))
value.text = string.format("<color=#%s>(%s件激活)</color>",color,curSuitConFig.SuiteValue[i][1]) value.text = string.format("<color=#00ff66>(%s)</color>",GetEquipSuitStr(equipSuite[i][1],equipSuite[i][2][1]))
else
name.text = string.format("<color=#FCEBCA>%s+ %s</color>",GetLanguageStrById(propertyConfig[suiteValue[i][2]].Info),GetPropertyFormatStr(propertyConfig[suiteValue[i][2]].Style,suiteValue[i][3]))
value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr(equipConfigData.Star,suiteValue[i][1]))
end
end end
end end
else else
@ -320,26 +326,35 @@ function RewardEquipSingleShowPopup2:OnShow()
end end
--super白金套装属性 --super白金套装属性
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig) --获取装备白金套装属性
local curSuitConFig = suitConFig[equipConfigData.Star] local equipGoldSuite = {}
if curSuitConFig and curSuitConFig.SuiteSkill then if self.curHeroData and self.openType == 2 then
equipGoldSuite = HeroManager.GetCurHeroBaiJinEquipSuitPros(self.curHeroData.equipIdList)
end
local curGoldSuitConFig = suitConFig[equipConfigData.Star]
if curGoldSuitConFig and curGoldSuitConFig.SuiteSkill then
self.superPro:SetActive(true) self.superPro:SetActive(true)
if curSuitConFig then if curGoldSuitConFig then
for i = 1, math.max(#curSuitConFig.SuiteSkill, #_superProList) do local goldSuiteSkill = curGoldSuitConFig.SuiteSkill
for i = 1, math.max(#goldSuiteSkill, #_superProList) do
if not _superProList[i] then if not _superProList[i] then
_superProList[i] = newObjToParent(self.superProPre, self.superProGrid) _superProList[i] = newObjToParent(self.superProPre, self.superProGrid)
end end
_superProList[i].gameObject:SetActive(true) _superProList[i].gameObject:SetActive(true)
end end
for i = 1, #curSuitConFig.SuiteSkill do for i = 1, #goldSuiteSkill do
local go = _superProList[i] local go = _superProList[i]
go.gameObject:SetActive(true) go.gameObject:SetActive(true)
local name = Util.GetGameObject(go.transform, "Name"):GetComponent("Text") local name = Util.GetGameObject(go.transform, "Name"):GetComponent("Text")
local value = Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text") local value = Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text")
local color = #equipSuit >= i and "00ff66" or "FCEBCA"
name.text = string.format("不朽天赋%s",i) name.text = string.format("不朽天赋%s",i)
go:GetComponent("Text").text = string.format("<color=#%s>%s</color>",color,GetLanguageStrById(passiveSkillConfig[curSuitConFig.SuiteSkill[i][2]].Desc)) if equipGoldSuite[i] then
value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr(curSuitConFig.Id,curSuitConFig.SuiteSkill[i][1])) value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr(equipGoldSuite[i][1],equipGoldSuite[i][2][1]))
go:GetComponent("Text").text = string.format("<color=#00ff66>%s</color>",GetLanguageStrById(passiveSkillConfig[equipGoldSuite[i][2][2]].Desc))
else
value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr(curGoldSuitConFig.Id,goldSuiteSkill[i][1]))
go:GetComponent("Text").text = string.format("<color=#FCEBCA>%s</color>",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc))
end
end end
end end
else else