diff --git a/Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab index df2824f95f..f9dc6a851d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab @@ -530,14 +530,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 + m_BestFit: 1 + m_MinSize: 20 m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u8FDB\u884C" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab index 55951d3a5e..f30946d48e 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab @@ -4195,7 +4195,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 371.48, y: -169.7} + m_AnchoredPosition: {x: 371.48, y: -188} m_SizeDelta: {x: 742.96, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222050996512149782 @@ -7972,8 +7972,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 294, y: 15.65} - m_SizeDelta: {x: 160, y: 31.3} + m_AnchoredPosition: {x: 402.8, y: 15.65} + m_SizeDelta: {x: 377.5, y: 31.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5279542354912768318 CanvasRenderer: @@ -8008,9 +8008,9 @@ MonoBehaviour: m_FontSize: 32 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 26 + m_MinSize: 20 m_MaxSize: 32 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index 6c9f474d84..43d85e654a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -257,10 +257,11 @@ function this.ShowCurEquipData(index) local proVa = endProList[i][2][3] local suitNum = endProList[i][2][1] local Star = endProList[i][1] - Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "" .. propertyConfig[proId].Info .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "" + + Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "" .. GetLanguageStrById(propertyConfig[proId].Info) .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "" Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "(" .. GetEquipSuitStr(Star,suitNum) .. ")" if type == 2 and #equipSuit > 0 then--激活的要变颜色 - Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "" .. propertyConfig[proId].Info .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "" + Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "" .. GetLanguageStrById(propertyConfig[proId].Info) .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "" Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "(" .. GetEquipSuitStr(Star,suitNum) .. ")" end end