【ID1011380】

装备和宝石属性修正

(cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae)
dev_chengFeng
jiaoyangna 2022-03-30 13:39:33 +08:00
parent e8e381fb98
commit 4252fde78f
2 changed files with 63 additions and 24 deletions

View File

@ -344,10 +344,10 @@ RectTransform:
m_Father: {fileID: 8569408221378906818}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 298, y: -25}
m_SizeDelta: {x: 250, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7321926799232025417
CanvasRenderer:
@ -384,7 +384,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 5
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -1754,7 +1754,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -20, y: 30}
m_SizeDelta: {x: 0, y: 50}
m_SizeDelta: {x: 194, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &573654475003589758
CanvasRenderer:
@ -1825,7 +1825,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2536559242930971238}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -4902,7 +4902,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &338931501448661155
RectTransform:
m_ObjectHideFlags: 0
@ -4918,10 +4918,10 @@ RectTransform:
m_Father: {fileID: 8420829159650770875}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 462.9, y: 0}
m_SizeDelta: {x: 725.8, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 462.9, y: -79}
m_SizeDelta: {x: 725.8, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5631977101328081240
CanvasRenderer:

View File

@ -279,16 +279,18 @@ function RewardEquipSingleShowPopup2:OnShow()
for _, pro in ipairs(_BaseProList) do
pro:SetActive(false)
end
local num = 0
for index, prop in ipairs(equipConfigData.Property) do
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
if proConfigData then
num = num + 1
--基础属性
if not _BaseProList[index] then
_BaseProList[index] = newObjToParent(self.baseProPre, self.baseProGrid)
if not _BaseProList[num] then
_BaseProList[num] = newObjToParent(self.baseProPre, self.baseProGrid)
end
_BaseProList[index]:SetActive(true)
_BaseProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
local vText = Util.GetGameObject(_BaseProList[index], "curProVale"):GetComponent("Text")
_BaseProList[num]:SetActive(true)
_BaseProList[num]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
local vText = Util.GetGameObject(_BaseProList[num], "curProVale"):GetComponent("Text")
-- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
if prop[2] > 0 then
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
@ -297,6 +299,26 @@ function RewardEquipSingleShowPopup2:OnShow()
end
end
end
if equipConfigData.Quality == 6 then
local prop = equipConfigData.PropertyMin
local proConfigData = ConfigManager.TryGetConfigData(ConfigName.PropertyConfig, prop[1])
if proConfigData then
num = num + 1
--基础属性
if not _BaseProList[num] then
_BaseProList[num] = newObjToParent(self.baseProPre, self.baseProGrid)
end
_BaseProList[num]:SetActive(true)
_BaseProList[num]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
local vText = Util.GetGameObject(_BaseProList[num], "curProVale"):GetComponent("Text")
-- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
if prop[2] > 0 then
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2]).."<color=#00ff00>(提升至白金装备解锁)</color>"
else
vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2]).."<color=#00ff00>(提升至白金装备解锁)</color"
end
end
end
else
self.basePro:SetActive(false)
end
@ -369,18 +391,34 @@ function RewardEquipSingleShowPopup2:OnShow()
equipGoldSuite = HeroManager.GetCurHeroBaiJinEquipSuitPros(self.curHeroData.equipIdList)
end
local curGoldSuitConFig = suitConFig[equipConfigData.Star]
for k,v in ipairs(_superProList) do
v.gameObject:SetActive(false)
end
local num = 0
if equipConfigData.Quality == 6 then
curGoldSuitConFig = suitConFig[18]
num = num + 1
if not _superProList[num] then
_superProList[num] = newObjToParent(self.superProPre, self.superProGrid)
end
_superProList[num].gameObject:SetActive(true)
local name = Util.GetGameObject( _superProList[num], "Name"):GetComponent("Text")
local value = Util.GetGameObject( _superProList[num], "Name/vale"):GetComponent("Text")
name.text = "<color=#00ff00>不朽天赋:(提升至白金装备解锁)</color>"
value.text = ""
_superProList[num]:GetComponent("Text").enabled = false
end
if curGoldSuitConFig and curGoldSuitConFig.SuiteSkill then
self.superPro:SetActive(true)
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, #goldSuiteSkill do
local go = _superProList[i]
num = num + 1
if not _superProList[num] then
_superProList[num] = newObjToParent(self.superProPre, self.superProGrid)
end
_superProList[num].gameObject:SetActive(true)
local go = _superProList[num]
go.gameObject:SetActive(true)
local name = Util.GetGameObject(go.transform, "Name"):GetComponent("Text")
local value = Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text")
@ -392,6 +430,7 @@ function RewardEquipSingleShowPopup2:OnShow()
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
go:GetComponent("Text").enabled = true
end
end
else