diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab index 68f1cabeda..b913030aa1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab @@ -234,7 +234,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8238264444780451486 RectTransform: m_ObjectHideFlags: 0 @@ -635,8 +635,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: -14, y: 15.299999} - m_SizeDelta: {x: 229.5, y: 64.4} + m_AnchoredPosition: {x: -4.6, y: 11.7} + m_SizeDelta: {x: 311.9, y: 83.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4505027723465724455 CanvasRenderer: @@ -670,9 +670,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 35 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 51 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 35 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1069,7 +1069,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1000020802548592087 RectTransform: m_ObjectHideFlags: 0 @@ -1783,8 +1783,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: -1.44, y: -1.72} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -1.8, y: 0.000012398} + m_SizeDelta: {x: 208.1, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5356368417287253732 CanvasRenderer: @@ -1818,13 +1818,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u786E \u5B9A" diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab index 1e7de61cbc..26e83f4d25 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab @@ -1161,8 +1161,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: -1.44, y: -1.72} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 4.1, y: -1.72} + m_SizeDelta: {x: 190, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5619607032628973182 CanvasRenderer: @@ -1196,13 +1196,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u786E \u5B9A" @@ -1549,8 +1549,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: -14, y: 15.299999} - m_SizeDelta: {x: 229.5, y: 64.4} + m_AnchoredPosition: {x: -12, y: 12.3} + m_SizeDelta: {x: 310.1, y: 94.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1468637582366008717 CanvasRenderer: @@ -1590,8 +1590,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u65E0\u7B26\u5408\u8981\u6C42\u7684\u795E\u5C06\uFF01" LanguageIndex: 0 @@ -2863,8 +2863,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: "\u795E\u5C06" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab index 6ad59bb083..71d95623a9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab @@ -465,8 +465,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: -1.44, y: -1.72} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -0.2, y: -1.72} + m_SizeDelta: {x: 210.6, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4644599475042667972 CanvasRenderer: @@ -500,13 +500,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u53D6 \u6D88" @@ -1260,8 +1260,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: 3.1600037, y: -459} - m_SizeDelta: {x: 381, y: 64.4} + m_AnchoredPosition: {x: -0.000053406, y: -459} + m_SizeDelta: {x: 908.6, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3194945647635898351 CanvasRenderer: @@ -1301,8 +1301,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4F7F\u7528\u5224\u5B98\u7B14\u53EF\u5C06\u6240\u6709\u795E\u5C06\u590D\u6D3B\u5E76\u6062\u590D\u5168\u90E8\u8840\u91CF" LanguageIndex: 0 @@ -1880,8 +1880,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: "\u751F\u6B7B\u7C3F" LanguageIndex: 0 @@ -3030,8 +3030,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: -1.44, y: -1.72} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 0.9, y: -1.72} + m_SizeDelta: {x: 199, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &788541947008556071 CanvasRenderer: @@ -3065,13 +3065,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u76F4\u63A5\u901A\u8FC7" @@ -3455,8 +3455,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: -1.44, y: -1.72} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -1.5, y: -1.72} + m_SizeDelta: {x: 189.8, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7816536166646765634 CanvasRenderer: @@ -3490,13 +3490,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u786E \u5B9A" @@ -3535,8 +3535,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: -14, y: 15.299999} - m_SizeDelta: {x: 229.5, y: 64.4} + m_AnchoredPosition: {x: -8.2, y: 12.9} + m_SizeDelta: {x: 301.7, y: 101.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2322263755482966228 CanvasRenderer: @@ -3576,8 +3576,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5C1A\u65E0\u4F24\u4EA1\u7684\u795E\u5C06" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index 932e9d639a..8e93d4583e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -34,7 +34,7 @@ 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: 166.90002, y: 1.2001038} + m_AnchoredPosition: {x: 377.1, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8042439069031667320 @@ -108,7 +108,7 @@ 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: -172.60002, y: 1.2001038} + m_AnchoredPosition: {x: -375.3, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1017546208995465714 @@ -5777,8 +5777,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: 1.9, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -5.3, y: 0.00000095367} + m_SizeDelta: {x: 240.5, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &946185981763959045 CanvasRenderer: @@ -5812,9 +5812,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -11432,7 +11432,7 @@ 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: -172.60002, y: 1.2001038} + m_AnchoredPosition: {x: -375.7, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5063470612336979329 @@ -16835,7 +16835,7 @@ 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: 166.90002, y: 1.2001038} + m_AnchoredPosition: {x: 371.9, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5335553083383741568 @@ -17026,7 +17026,7 @@ 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: -172.60002, y: 1.2001038} + m_AnchoredPosition: {x: -371, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8275065733193469706 @@ -17141,8 +17141,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: "\u5929 \u5C06" LanguageIndex: 10420 @@ -18114,8 +18114,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.00000047684, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -0, y: 0.00000095367} + m_SizeDelta: {x: 201.1, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2933617803769828349 CanvasRenderer: @@ -18149,9 +18149,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -28496,8 +28496,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.3, y: -300.7} - m_SizeDelta: {x: 160, y: 52} + m_AnchoredPosition: {x: -25.625, y: -300.7} + m_SizeDelta: {x: 776.25, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1513019964666996309 CanvasRenderer: @@ -28538,7 +28538,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6218\u6597\u5956\u52B1" LanguageIndex: 10419 @@ -33319,7 +33319,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1a2ed3d281da42944b13b7a4c6a5d205, type: 3} + m_Sprite: {fileID: 21300000, guid: af35ae40293e26b41b46837f7ad59918, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -33362,8 +33362,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.00000047684, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 1, y: 0.00000095367} + m_SizeDelta: {x: 235, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1141700460325741430 CanvasRenderer: @@ -33397,9 +33397,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -33599,8 +33599,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: "\u5546 \u5E97" LanguageIndex: 10417 @@ -33686,8 +33686,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.00000047684, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -2.5, y: 0.00000095367} + m_SizeDelta: {x: 210.8, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &462189756861178538 CanvasRenderer: @@ -33721,14 +33721,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6311 \u6218" LanguageIndex: 10061 @@ -34053,8 +34053,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: 1, y: -418} - m_SizeDelta: {x: 160, y: 52} + m_AnchoredPosition: {x: -2.7, y: -429.2} + m_SizeDelta: {x: 920, y: 158.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &674739206777866542 CanvasRenderer: @@ -34094,8 +34094,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u51FB\u8D25\u654C\u4EBA\u540E\u53EF\u5C06\u5176\u4E34\u65F6\u62DB\u52DF\u81F3\u961F\u4F0D\u4E2D" LanguageIndex: 10421 @@ -35024,7 +35024,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7305dd25ffb0c7a45a745288ff547cc5, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e6dd4cae84f4dd46958013a6f282fc7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -35573,8 +35573,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.30000007, y: -297} - m_SizeDelta: {x: 160, y: 52} + m_AnchoredPosition: {x: -3, y: -297} + m_SizeDelta: {x: 821.5, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &752021663594526899 CanvasRenderer: @@ -35656,8 +35656,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.30000004, y: -312} - m_SizeDelta: {x: 160, y: 52} + m_AnchoredPosition: {x: 3.5, y: -312} + m_SizeDelta: {x: 608.6, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8535518672484951762 CanvasRenderer: @@ -46027,7 +46027,7 @@ 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: 166.90002, y: 1.2001038} + m_AnchoredPosition: {x: 376.6, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2542417945914328467 @@ -46371,8 +46371,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.00000047684, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 4.1, y: 0.00000095367} + m_SizeDelta: {x: 218.6, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4189157800401299044 CanvasRenderer: @@ -46406,9 +46406,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -47075,8 +47075,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: "\u62DB \u52DF" LanguageIndex: 10413 @@ -47284,7 +47284,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: cd2ca249349cd094d933065a76dd9f73, type: 3} + m_Sprite: {fileID: 21300000, guid: f088797d2a26ab24abe877e97eba98bd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -47622,7 +47622,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0f2cc64e40e26e645b9f4ab0e3f793b8, type: 3} + m_Sprite: {fileID: 21300000, guid: e5f390065e8d312419f17562e8250e91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -47696,7 +47696,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9f24cdeec6201014a8771ad4417a383e, type: 3} + m_Sprite: {fileID: 21300000, guid: b582673e3da23f44fbae9ec0521af1f1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -47780,8 +47780,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: "\u5929 \u5C06" LanguageIndex: 10420 diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab index 5c3b937b3c..4d787c5cbe 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab @@ -550,8 +550,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: -14, y: 15.299999} - m_SizeDelta: {x: 229.5, y: 64.4} + m_AnchoredPosition: {x: -14, y: 18.1} + m_SizeDelta: {x: 302.5, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1516250363395923351 CanvasRenderer: @@ -585,13 +585,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 35 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 51 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 35 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5C1A\u672A\u83B7\u5F97\u5723\u7269" @@ -2014,8 +2014,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: -1.44, y: -1.72} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -0, y: -1.72} + m_SizeDelta: {x: 188, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5356368417287253732 CanvasRenderer: @@ -2049,13 +2049,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u786E \u5B9A" diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index ec7c594352..c4c0d03ce3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -20423,8 +20423,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: "\u589E\u76CA\u6548\u679C" LanguageIndex: 11275 @@ -20887,8 +20887,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.00000047684, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 0, y: 0.00000095367} + m_SizeDelta: {x: 190.9, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7382507974697624850 CanvasRenderer: @@ -20922,9 +20922,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua index 6bbda2f898..69d96d92c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua @@ -121,7 +121,7 @@ function this:FormationAdapter(msg) Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon)) local heroConFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId) Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality, curData.hero.star)) - Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName) + Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = SubString2(GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName),6) SetHeroStars(starGrid, curData.hero.star) proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName)) --posImage.sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(demonData.Profession))