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