From efd3ab9216c78a63ccd5f4f1529c354d9e341f99 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 27 Feb 2021 14:47:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B6=8A=E5=8D=97=E5=8C=85=E3=80=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExpeditionHeroListResurgencePopup.prefab | 10 ++++----- .../UI/HandBook/HandBookEquipInfoPanel.prefab | 6 ++--- .../UI/HandBook/HandBookHeroInfoPanel.prefab | 22 +++++++++---------- .../ExpeditionHeroListResurgencePopup.lua | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab index 71d95623a9..c0b236ba0a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab @@ -1223,8 +1223,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: 0, y: 71.849976} - m_SizeDelta: {x: 927.5, y: 997.3} + m_AnchoredPosition: {x: 0, y: 87.52498} + m_SizeDelta: {x: 927.5, y: 965.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3406226350511288493 GameObject: @@ -1340,7 +1340,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.07028198, y: 272} + m_AnchoredPosition: {x: 0.07028198, y: 316} m_SizeDelta: {x: -21.689972, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3194938316108132509 @@ -1555,8 +1555,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 434.66, y: 758.2198} - m_SizeDelta: {x: 6, y: 912.84} + m_AnchoredPosition: {x: 434.66, y: 771.68} + m_SizeDelta: {x: 6, y: 885.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3194659800225542763 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab index 235be208b9..e0f31f6569 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab @@ -8048,8 +8048,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: 193.80049, y: 73.500015} - m_SizeDelta: {x: 433.9, y: 74.9} + m_AnchoredPosition: {x: 355.98, y: 73.500015} + m_SizeDelta: {x: 758.25, y: 74.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1258301722616716070 CanvasRenderer: @@ -8089,7 +8089,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u201C\u8EAB\u968F\u5FC3\u52A8\uFF0C\u77AC\u606F\u5343\u91CC\u201D" diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 7d7a428696..5cc6ccd15a 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -2591,7 +2591,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 52 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -2599,7 +2599,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6750\u6599" @@ -2687,7 +2687,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 52 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -2695,7 +2695,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u60C5\u62A5" @@ -4166,7 +4166,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 155.3, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976861364944621614 @@ -5467,7 +5467,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 52 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -5475,7 +5475,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6EE1\u661F" @@ -6329,7 +6329,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 52 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -6337,7 +6337,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u76AE\u80A4" @@ -8148,7 +8148,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 52 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -8156,7 +8156,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4F20\u8BF4" diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua index a1f2cec6d3..0569f4915e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua @@ -24,7 +24,7 @@ function ExpeditionHeroListResurgencePopup:InitComponent() this.ScrollBar = Util.GetGameObject(self.gameObject, "bg/Scrollbar"):GetComponent("Scrollbar") this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "scroll").transform, - this.cardPre, this.ScrollBar, Vector2.New(927.5, 997.3), 1, 5, Vector2.New(19.32, 40)) + this.cardPre, this.ScrollBar, Vector2.New(927.5, 965.95), 1, 5, Vector2.New(19.32, 40)) this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, 0) this.ScrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) this.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)