From ee8a7216243dccf8d28c9e10a675b09bdb004266 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 24 Feb 2021 18:00:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=8A=BD=E5=8D=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pokemon/PokemonSingleResultPanel.prefab | 18 ++--- .../PokemonSummonOneResultPanel.prefab | 26 ++++---- .../UI/Pokemon/PokemonSummonPanel.prefab | 66 +++++++++---------- .../PokemonSummonTenResultPanel.prefab | 22 +++---- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 4 +- 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab index 590ac7ade5..646c957ae4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab @@ -24347,7 +24347,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 901.2, y: 141.2} + m_SizeDelta: {x: 901.2, y: 84.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1726476276234419736 CanvasRenderer: @@ -24384,13 +24384,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 87 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u6211\u65B9\u7EB5\u706B\u5F0F\u795E\u5C06\u91CA\u653E\u6280\u80FD\u540E\uFF0C\u6211\u65B9\u7EB5\u706B\u5F0F\u795E\u5C06\u91CA\u653E\u6280\u80FD\u540E\uFF0C\u6211\u65B9\u7EB5\u706B\u5F0F\u795E\u5C06\u91CA\u653E\u6280\u80FD\u540E\uFF0C" + m_Text: LanguageIndex: 0 --- !u!1 &6530305934527102091 GameObject: @@ -58279,8 +58279,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: 5} - m_SizeDelta: {x: 160, y: 67.06} + m_AnchoredPosition: {x: 1, y: 0.77499} + m_SizeDelta: {x: 201.3, y: 75.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1956035086381280908 CanvasRenderer: @@ -58314,14 +58314,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 50 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: "\u786E \u5B9A" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab index c23cd78155..b81fa770ac 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab @@ -184,8 +184,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: "\u989D\u5916\u8D60\u90011\u4E2A\u5996\u7075\u7389" LanguageIndex: 0 @@ -24472,8 +24472,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 @@ -34997,11 +34997,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 43 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u989D\u5916\u8D60\u90011\u4E2A\u4E7E\u5764\u4EE4" LanguageIndex: 0 @@ -35038,9 +35038,9 @@ RectTransform: m_RootOrder: 0 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.2, y: 0.3} - m_SizeDelta: {x: 69, y: 100} + m_AnchorMax: {x: 0.852674, y: 0.5} + m_AnchoredPosition: {x: -41.9, y: 0.3} + m_SizeDelta: {x: 212.7, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3178489416745694411 CanvasRenderer: @@ -35074,13 +35074,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u518D\u6765\u4E00\u6B21" diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab index e0021a27fb..d7131968d8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab @@ -69,8 +69,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 48 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 48 m_Alignment: 4 m_AlignByGeometry: 0 @@ -602,8 +602,8 @@ MonoBehaviour: m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_MinSize: 20 + m_MaxSize: 30 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -776,8 +776,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 48 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 48 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1151,8 +1151,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.00001463, y: 66.2} - m_SizeDelta: {x: 202.9, y: 25.97} + m_AnchoredPosition: {x: -0.000015259, y: 66.2} + m_SizeDelta: {x: 384, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6430166561436097551 CanvasRenderer: @@ -1770,8 +1770,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: -282.3, y: 794.3} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -52.624985, y: 796.00006} + m_SizeDelta: {x: 619.3, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2027173860086751447 CanvasRenderer: @@ -1811,7 +1811,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: @@ -2458,8 +2458,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 48 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 48 m_Alignment: 4 m_AlignByGeometry: 0 @@ -2502,8 +2502,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.0000038146973, y: 1.24} - m_SizeDelta: {x: 129.63, y: 25.89} + m_AnchoredPosition: {x: 0.0000038146973, y: 3.63} + m_SizeDelta: {x: 129.63, y: 30.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5386072846625055340 CanvasRenderer: @@ -2537,14 +2537,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 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: "\u53BB\u6FC0\u6D3B" LanguageIndex: 0 @@ -2765,9 +2765,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 48 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 52 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 48 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -2858,16 +2858,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2972572135738739882} m_Modifications: - - target: {fileID: 8511423249256405072, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3, - type: 3} - propertyPath: m_Name - value: Effect_Dan_changzhu - objectReference: {fileID: 0} - - target: {fileID: 8511423249256405072, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7869096045278935994, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3, type: 3} propertyPath: m_LocalPosition.x @@ -2923,6 +2913,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8511423249256405072, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3, + type: 3} + propertyPath: m_Name + value: Effect_Dan_changzhu + objectReference: {fileID: 0} + - target: {fileID: 8511423249256405072, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3, type: 3} --- !u!4 &1439099829012666779 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonTenResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonTenResultPanel.prefab index 4b5376b45d..54a1a18776 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonTenResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonTenResultPanel.prefab @@ -128586,8 +128586,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 44 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 @@ -129310,8 +129310,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: "\u8D60\u900111\u4E2A\u5996\u7075\u7389" LanguageIndex: 0 @@ -134770,13 +134770,13 @@ MonoBehaviour: m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 30 m_MaxSize: 50 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\xD7100" LanguageIndex: 0 @@ -135289,13 +135289,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "10\u8FDE" @@ -135411,8 +135411,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.8999634, y: 7} - m_SizeDelta: {x: 255.2, y: 76.3} + m_AnchoredPosition: {x: -4.365, y: 7} + m_SizeDelta: {x: 301.63, y: 76.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1295876389278240009 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index f6f8470cf8..2d249caa33 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -321,7 +321,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6630273786794472594 RectTransform: m_ObjectHideFlags: 0 @@ -4578,7 +4578,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5}