From f8a0a76d7599767baa98e60a58fa665bfc3a41c0 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 27 Oct 2021 09:54:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E7=81=B5=E5=85=BD=E6=8A=80=E8=83=BD=E3=80=81=E8=8B=B1?= =?UTF-8?q?=E9=9B=84=E4=BC=A0=E8=AF=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pokemon/PokemonAllSkillInfoPopup.prefab | 72 +++---- .../UI/Pokemon/PokemonSkillInfoPopup.prefab | 175 ++++++++++-------- .../UI/RoleInfo/RoleStoryLayout.prefab | 6 +- 3 files changed, 137 insertions(+), 116 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonAllSkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonAllSkillInfoPopup.prefab index 7c068252f3..c6b9d5f0ab 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonAllSkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonAllSkillInfoPopup.prefab @@ -77,7 +77,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1543, y: 419} - m_SizeDelta: {x: 662.6, y: 517} + m_SizeDelta: {x: 650, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1860555992772850798 CanvasRenderer: @@ -156,10 +156,10 @@ RectTransform: m_Father: {fileID: 9156005533501883574} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -509} - m_SizeDelta: {x: 100, y: 16} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3192265416151256662 CanvasRenderer: @@ -235,10 +235,10 @@ RectTransform: m_Father: {fileID: 9156005533501883574} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -8} - m_SizeDelta: {x: 100, y: 16} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5310039809723176018 CanvasRenderer: @@ -314,10 +314,10 @@ RectTransform: m_Father: {fileID: 9156005533501883574} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 362.5, y: -499} - m_SizeDelta: {x: 725, y: 4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 725, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &889785635772059856 CanvasRenderer: @@ -422,8 +422,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -434,7 +434,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.1 - m_Text: "\u4E00\u9636\u6BB5\u4E00\u9636\u6BB5" + m_Text: LanguageIndex: 0 --- !u!1 &4323202771301113729 GameObject: @@ -468,10 +468,10 @@ RectTransform: m_Father: {fileID: 9156005533501883574} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -284} - m_SizeDelta: {x: 640.8, y: 426} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 640.8, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &226332539532498445 CanvasRenderer: @@ -502,8 +502,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 31 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -513,8 +513,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1.1 - m_Text: "\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\n\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\n\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\n" + m_LineSpacing: 1.5 + m_Text: LanguageIndex: 0 --- !u!1 &4660864179550987656 GameObject: @@ -549,10 +549,10 @@ RectTransform: m_Father: {fileID: 9156005533501883574} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -35.5} - m_SizeDelta: {x: 108, y: 39} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 108, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5080369990316094698 CanvasRenderer: @@ -583,8 +583,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -594,8 +594,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 - m_LineSpacing: 1.1 - m_Text: "\u4E00\u9636\u6BB5\u4E00\u9636\u6BB5\u4E00\u9636\u6BB5" + m_LineSpacing: 1.5 + m_Text: LanguageIndex: 0 --- !u!1 &4684142525127782624 GameObject: @@ -903,10 +903,10 @@ RectTransform: m_Father: {fileID: 9156005533501883574} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -63} - m_SizeDelta: {x: 100, y: 16} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4939455479675911505 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab index 75a20dc1f7..c6d1a40e33 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab @@ -33,10 +33,10 @@ RectTransform: m_Father: {fileID: 4992170729401993570} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470.84998, y: -80} - m_SizeDelta: {x: 555.1, y: 154} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &6516281780208366694 CanvasRenderer: @@ -82,7 +82,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 955144663434192657} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -109,8 +109,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 28 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -120,7 +120,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 1.2 m_Text: "\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u9020\u6210\u4F24\u5BB3\u65F6\uFF0C\u6709100%\u7684\u6982\u7387\uFF08+\u6548\u679C\u547D\u4E2D\uFF0910\u79D2\u5185\u9644\u52A0\u6D41\u8840\u6548\u679C\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B\n" LanguageIndex: 0 --- !u!1 &831176862904348751 @@ -155,10 +155,10 @@ RectTransform: m_Father: {fileID: 4992170729401993570} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 426.60004, y: -12} - m_SizeDelta: {x: 466.6, y: 38} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 466.6, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &7897598215815499727 CanvasRenderer: @@ -235,10 +235,10 @@ RectTransform: m_Father: {fileID: 388215852812328058} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 466.6, y: -30} - m_SizeDelta: {x: 466.6, y: 92} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &403728868817563630 CanvasRenderer: @@ -269,8 +269,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 28 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -280,7 +280,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 1.2 m_Text: "\u5BF9\u751F\u547D\u503C\u6700\u4F4E\n\u5BF9\u751F\u547D\u503C\u6700\u4F4E\n" LanguageIndex: 0 --- !u!1 &1547415733843064294 @@ -320,10 +320,10 @@ RectTransform: m_Father: {fileID: 4199312890852100441} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 350, y: -158} - m_SizeDelta: {x: 466.6, y: 126} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 350, y: 0} + m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4223889078831659468 CanvasRenderer: @@ -369,9 +369,9 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 20 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -422,10 +422,10 @@ RectTransform: m_Father: {fileID: 2681911924583289171} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470.8, y: -50} - m_SizeDelta: {x: 555, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 555, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &3686764731293620100 CanvasRenderer: @@ -456,8 +456,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 28 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -467,7 +467,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 1.2 m_Text: "\u7B49\u7EA71" LanguageIndex: 0 --- !u!1 &1717597352635214414 @@ -581,10 +581,10 @@ RectTransform: m_Father: {fileID: 4992170729401993570} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470.84998, y: -50} - m_SizeDelta: {x: 555.1, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 555.1, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &1496520769140915758 CanvasRenderer: @@ -615,8 +615,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 28 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -626,7 +626,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 1.2 m_Text: "\u7B49\u7EA71" LanguageIndex: 0 --- !u!1 &2028124840197503639 @@ -662,10 +662,10 @@ RectTransform: m_Father: {fileID: 2681911924583289171} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470.8, y: -80} - m_SizeDelta: {x: 555, y: 154} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &734276332181323415 CanvasRenderer: @@ -711,7 +711,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 7037769641760349594} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -738,8 +738,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 28 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -749,7 +749,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 1.2 m_Text: "\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u9020\u6210\u4F24\u5BB3\u65F6\uFF0C\u6709100%\u7684\u6982\u7387\uFF08+\u6548\u679C\u547D\u4E2D\uFF0910\u79D2\u5185\u9644\u52A0\u6D41\u8840\u6548\u679C\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B\n" LanguageIndex: 0 --- !u!1 &2902167000410364647 @@ -784,10 +784,10 @@ RectTransform: m_Father: {fileID: 4992170729401993570} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 193.3, y: -236} - m_SizeDelta: {x: 725, y: 4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 725, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &922872341014384246 CanvasRenderer: @@ -858,10 +858,10 @@ RectTransform: m_Father: {fileID: 388215852812328058} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 466.6, y: 0} - m_SizeDelta: {x: 466.6, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &909516327724283881 CanvasRenderer: @@ -892,8 +892,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 28 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -943,10 +943,10 @@ RectTransform: m_Father: {fileID: 4199312890852100441} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 350, y: -576} - m_SizeDelta: {x: 466.6, y: 234} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 350, y: 0} + m_SizeDelta: {x: 466.6, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2152063546545743412 CanvasRenderer: @@ -994,7 +994,7 @@ MonoBehaviour: m_Top: 12 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1055,7 +1055,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 29, y: 0} - m_SizeDelta: {x: 600, y: 713} + m_SizeDelta: {x: 600, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4199312890852100444 CanvasRenderer: @@ -1505,10 +1505,10 @@ RectTransform: m_Father: {fileID: 4199312890852100441} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 350, y: -340} - m_SizeDelta: {x: 466.6, y: 238} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 350, y: 0} + m_SizeDelta: {x: 466.6, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4993566593057991600 CanvasRenderer: @@ -1556,7 +1556,7 @@ MonoBehaviour: m_Top: 12 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1612,7 +1612,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: 59.5, y: -140} + m_AnchoredPosition: {x: 75, y: -160} m_SizeDelta: {x: 90.28, y: 90.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4993373206789795048 @@ -1758,6 +1758,7 @@ GameObject: - component: {fileID: 3933820329740296671} - component: {fileID: 7114343251047875740} - component: {fileID: 6598117026593621326} + - component: {fileID: 6357573934077344708} m_Layer: 5 m_Name: Image (1) m_TagString: Untagged @@ -1779,10 +1780,10 @@ RectTransform: m_Father: {fileID: 388215852812328058} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 233.3, y: -124} - m_SizeDelta: {x: 725, y: 4} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 600, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7114343251047875740 CanvasRenderer: @@ -1821,6 +1822,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &6357573934077344708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5465576253348542693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &6962357210774367645 GameObject: m_ObjectHideFlags: 0 @@ -1970,10 +1991,10 @@ RectTransform: m_Father: {fileID: 2681911924583289171} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 426.60004, y: -12} - m_SizeDelta: {x: 466.6, y: 38} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 466.6, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &8922295556461203564 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleStoryLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleStoryLayout.prefab index e67b5e0801..5b58659cc8 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleStoryLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleStoryLayout.prefab @@ -35,7 +35,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: -2, y: 0} + m_AnchoredPosition: {x: -2, y: 0.00012198358} m_SizeDelta: {x: 911.7, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &8840374508037427462 @@ -82,7 +82,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -92,7 +92,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.08 + m_LineSpacing: 1.3 m_Text: "\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684" LanguageIndex: 10911 --- !u!1 &4677369722417585249