装备=============套装属性 技能显示修改
parent
70a04e965a
commit
64d5426397
|
@ -479,6 +479,7 @@ Hero_Prop_Func = {
|
||||||
for i = 1, #dowerAllData do
|
for i = 1, #dowerAllData do
|
||||||
if dowerAllData[i].OpenSkillRules and _heroData.talismanLv >= dowerAllData[i].Level then
|
if dowerAllData[i].OpenSkillRules and _heroData.talismanLv >= dowerAllData[i].Level then
|
||||||
for k = 1, #dowerAllData[i].OpenSkillRules do
|
for k = 1, #dowerAllData[i].OpenSkillRules do
|
||||||
|
--LogError("dowerAllData[i].OpenSkillRules[k]================="..dowerAllData[i].OpenSkillRules[k].." dowerAllData[i].id=="..dowerAllData[i].Id)
|
||||||
table.insert(skillIds, dowerAllData[i].OpenSkillRules[k])
|
table.insert(skillIds, dowerAllData[i].OpenSkillRules[k])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -499,6 +500,9 @@ Hero_Prop_Func = {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
-- for k, v in pairs(addAllProVal) do
|
||||||
|
-- LogError("法宝 k==================="..k.." v==="..v)
|
||||||
|
-- end
|
||||||
return addAllProVal, conPropList, teamPropList, conTeamPropList, dePropList
|
return addAllProVal, conPropList, teamPropList, conTeamPropList, dePropList
|
||||||
end,
|
end,
|
||||||
|
|
||||||
|
|
|
@ -467,17 +467,21 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
if self.curHeroData and (self.openType == 2 or self.openType == 5) then
|
if self.curHeroData and (self.openType == 2 or self.openType == 5) then
|
||||||
equipSuite = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
|
equipSuite = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
|
||||||
end
|
end
|
||||||
|
--LogError("equipConfigData.Id======"..equipConfigData.Id)
|
||||||
local curProSuitConFig = suitConFig[equipConfigData.Star]
|
local curProSuitConFig = suitConFig[equipConfigData.Star]
|
||||||
if suitConFig[equipConfigData.Star] then
|
if suitConFig[equipConfigData.Star] then
|
||||||
self.suitPro:SetActive(true)
|
|
||||||
if curProSuitConFig then
|
|
||||||
local suiteValue = curProSuitConFig.SuiteValue
|
local suiteValue = curProSuitConFig.SuiteValue
|
||||||
|
if curProSuitConFig and #suiteValue>0 and tonumber(suiteValue[1][1])~=nil then
|
||||||
|
self.suitPro:SetActive(true)
|
||||||
for i = 1, math.max(#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
|
||||||
|
--LogError("suiteValue======================="..#suiteValue)
|
||||||
|
--PrintTable(suiteValue)
|
||||||
for i = 1, #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")
|
||||||
|
@ -486,14 +490,21 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
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]))
|
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=#00ff66>(%s)</color>",GetEquipSuitStr2(equipSuite[i][1],equipSuite[i][2][1]))
|
value.text = string.format("<color=#00ff66>(%s)</color>",GetEquipSuitStr2(equipSuite[i][1],equipSuite[i][2][1]))
|
||||||
else
|
else
|
||||||
|
--LogError("[suiteValue[i][2]==="..suiteValue[i][2])
|
||||||
|
--LogError("suiteValue[i][3]=================="..suiteValue[i][3])
|
||||||
|
if suiteValue[i][2] and suiteValue[i][3] then
|
||||||
name.text = string.format("<color=#FCEBCA>%s+ %s</color>",GetLanguageStrById(propertyConfig[suiteValue[i][2]].Info),GetPropertyFormatStr(propertyConfig[suiteValue[i][2]].Style,suiteValue[i][3]))
|
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>",GetEquipSuitStr2(equipConfigData.Star,suiteValue[i][1]))
|
value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr2(equipConfigData.Star,suiteValue[i][1]))
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
self.suitPro:SetActive(false)
|
self.suitPro:SetActive(false)
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
self.suitPro:SetActive(false)
|
||||||
|
end
|
||||||
|
|
||||||
--super白金套装属性
|
--super白金套装属性
|
||||||
--获取装备白金套装属性
|
--获取装备白金套装属性
|
||||||
|
@ -529,6 +540,7 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
self.superPro:SetActive(true)
|
self.superPro:SetActive(true)
|
||||||
if curGoldSuitConFig then
|
if curGoldSuitConFig then
|
||||||
local goldSuiteSkill = curGoldSuitConFig.SuiteSkill
|
local goldSuiteSkill = curGoldSuitConFig.SuiteSkill
|
||||||
|
--LogError("curGoldSuitConFig.id======"..curGoldSuitConFig.Id.." curGoldSuitConFig skill len=="..#curGoldSuitConFig.SuiteSkill)
|
||||||
for i = 1, #goldSuiteSkill do
|
for i = 1, #goldSuiteSkill do
|
||||||
num = num + 1
|
num = num + 1
|
||||||
if not _superProList[num] then
|
if not _superProList[num] then
|
||||||
|
@ -545,7 +557,7 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
go:GetComponent("Text").text = string.format("<color=#00ff66>%s</color>",GetLanguageStrById(passiveSkillConfig[equipGoldSuite[i][2][2]].Desc))
|
go:GetComponent("Text").text = string.format("<color=#00ff66>%s</color>",GetLanguageStrById(passiveSkillConfig[equipGoldSuite[i][2][2]].Desc))
|
||||||
else
|
else
|
||||||
value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr(curGoldSuitConFig.Id,goldSuiteSkill[i][1]))
|
value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr(curGoldSuitConFig.Id,goldSuiteSkill[i][1]))
|
||||||
--LogError("goldSuiteSkill[i][2]=="..goldSuiteSkill[i][2])
|
LogError("goldSuiteSkill[i][2]=="..goldSuiteSkill[i][2])
|
||||||
if goldSuiteSkill[i][2] then
|
if goldSuiteSkill[i][2] then
|
||||||
go:GetComponent("Text").text = string.format("<color=#FCEBCA>%s</color>",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc))
|
go:GetComponent("Text").text = string.format("<color=#FCEBCA>%s</color>",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc))
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue