From 4252fde78f84bfa42e6d3f371c6aeadc07dbea92 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 30 Mar 2022 13:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1011380=E3=80=91=20=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E5=92=8C=E5=AE=9D=E7=9F=B3=E5=B1=9E=E6=80=A7=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae) --- .../Popup/RewardEquipSingleShowPopup2.prefab | 24 +++---- .../Popup/RewardEquipSingleShowPopup2.lua | 63 +++++++++++++++---- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab index ed85a74864..b0b518aeb2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab @@ -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: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index 95de5fe9b1..5d1fe243a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -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]).."(提升至白金装备解锁)" + else + vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2]).."(提升至白金装备解锁)(%s)",GetEquipSuitStr(curGoldSuitConFig.Id,goldSuiteSkill[i][1])) go:GetComponent("Text").text = string.format("%s",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc)) end + go:GetComponent("Text").enabled = true end end else