diff --git a/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab b/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab index 95de865279..132e0685ce 100644 --- a/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab @@ -685,8 +685,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: 19.6, y: 3.9} - m_SizeDelta: {x: 144.4, y: 106.1} + m_AnchoredPosition: {x: 27.1, y: 3.9} + m_SizeDelta: {x: 159.3, y: 106.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4730262258658408852 CanvasRenderer: @@ -720,8 +720,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 41 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 41 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1079,7 +1079,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: @@ -1158,7 +1158,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: @@ -1237,7 +1237,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: @@ -1316,7 +1316,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: @@ -1908,8 +1908,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5956\u52B1\u9884\u89C8" LanguageIndex: 0 @@ -2056,8 +2056,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -2142,7 +2142,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: @@ -2221,8 +2221,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 20 --- !u!1 &2207365603588950997 @@ -3975,8 +3975,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -4643,7 +4643,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 3.9} - m_SizeDelta: {x: 206.9, y: 100} + m_SizeDelta: {x: 206.9, y: 61.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4837862994202001598 CanvasRenderer: @@ -4677,9 +4677,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 39 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 53 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 39 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -4940,8 +4940,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6D3B\u52A8\u5012\u8BA1\u65F6:3\u59295\u65F625\u5206" LanguageIndex: 0 @@ -5399,8 +5399,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -6750,8 +6750,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -7571,7 +7571,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab index 6bb0d40915..0d0470295f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab @@ -75,8 +75,8 @@ MonoBehaviour: m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &425530590043619121 @@ -229,8 +229,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u9053\u7384\u5956\u6C60" LanguageIndex: 0 @@ -309,8 +309,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &750510188822240697 @@ -462,8 +462,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E8C\u661F\u795E\u5C06" LanguageIndex: 0 @@ -957,8 +957,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &1403378512407323460 @@ -1128,8 +1128,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E94\u661F\u795E\u5C06" LanguageIndex: 0 @@ -1208,8 +1208,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5996\u7075\u5956\u6C60" LanguageIndex: 0 @@ -1625,8 +1625,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u56DB\u661F\u795E\u5C06" LanguageIndex: 0 @@ -2153,8 +2153,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E94\u661F\u795E\u5C06" LanguageIndex: 0 @@ -2284,7 +2284,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -0.3, y: 0.000018678631} - m_SizeDelta: {x: 832.7, y: 200} + m_SizeDelta: {x: 832.7, y: 274} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8255834773767746989 MonoBehaviour: @@ -2426,8 +2426,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &3587008495333502477 @@ -3089,8 +3089,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4EBA\u6770\u5956\u6C60" LanguageIndex: 0 @@ -3169,8 +3169,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &4473055681841871222 @@ -3397,8 +3397,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &4836788898525728699 @@ -3476,8 +3476,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E09\u661F\u795E\u5C06" LanguageIndex: 0 @@ -3556,8 +3556,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &5199722446348450247 @@ -3680,9 +3680,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 52 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -5119,8 +5119,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &7626500194415362908 @@ -5140,7 +5140,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6799911238574588945 RectTransform: m_ObjectHideFlags: 0 @@ -5349,8 +5349,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4F5B\u7985\u5956\u6C60" LanguageIndex: 0 @@ -5657,8 +5657,8 @@ MonoBehaviour: m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &8387164834893678890 @@ -5736,8 +5736,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E00\u661F\u795E\u5C06" LanguageIndex: 0 @@ -5890,8 +5890,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &8561939430791759713 @@ -6204,8 +6204,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5956\u6C60\u9884\u89C8" LanguageIndex: 0