diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 9071f4a1c4..c9894f1b6f 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -4772,7 +4772,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: 151, y: -39} + m_AnchoredPosition: {x: 151, y: -35} m_SizeDelta: {x: 262, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6414556168369772292 @@ -6154,13 +6154,14 @@ RectTransform: m_Children: - {fileID: 5519669512198605595} - {fileID: 3630269392129034293} + - {fileID: 4205529841618498703} m_Father: {fileID: 7606515546217958673} m_RootOrder: 1 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.8, y: 175} - m_SizeDelta: {x: 905, y: 78} + m_AnchoredPosition: {x: -1.8, y: 159.5} + m_SizeDelta: {x: 905, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6593275248874976042 CanvasRenderer: @@ -6214,9 +6215,9 @@ MonoBehaviour: m_Padding: m_Left: 20 m_Right: 0 - m_Top: 0 + m_Top: 10 m_Bottom: 0 - m_ChildAlignment: 3 + m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -11645,7 +11646,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: 567, y: -39} + m_AnchoredPosition: {x: 567, y: -35} m_SizeDelta: {x: 570, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5816999955467277152 @@ -11689,7 +11690,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u540C\u7CFB\u795E\u5C06\u6BCF\u65E5\u53EA\u53EF\u9009\u62E9\u5E76\u83B7\u53D6\u4E00\u6B21\u6982\u7387\u63D0\u5347" + m_Text: "\u540C\u7CFB\u795E\u5C06\u6BCF\u65E5\u53EA\u53EF\u9009\u62E9\u5E76\u83B7\u53D6\u4E00\u6B21\u6982\u7387\u63D0\u5347" LanguageIndex: 0 --- !u!1 &7155416707831602318 GameObject: @@ -12166,7 +12167,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u62BD\u52305\u661F\u795E\u5C06\u65F6\uFF0C\u670940%\u51E0\u7387\u8F6C\u5316\u4E3A\u5FC3\u613F\u795E\u5C06\uFF01" + m_Text: "\u62BD\u52305\u661F\u795E\u5C06\u65F6\uFF0C\u670940%\u51E0\u7387\u8F6C\u5316\u4E3A\u5FC3\u613F\u795E\u5C06\uFF01" LanguageIndex: 0 --- !u!1 &7349818788191680945 GameObject: @@ -13971,6 +13972,107 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8637436980630201770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4205529841618498703} + - component: {fileID: 7501801898535476680} + - component: {fileID: 5429397426301861913} + - component: {fileID: 6737946928187578861} + m_Layer: 0 + m_Name: Text (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4205529841618498703 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8637436980630201770} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2977717086846436942} + m_RootOrder: 2 + 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: -20} + m_SizeDelta: {x: 900, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7501801898535476680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8637436980630201770} + m_CullTransparentMesh: 0 +--- !u!114 &5429397426301861913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8637436980630201770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9803922, g: 0.83921576, b: 0.6745098, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u672A\u8BBE\u7F6E\u5FC3\u613F\u7684\u683C\u5B50\u4E5F\u5728\u5FC3\u613F\u89E6\u53D1\u7684\u8303\u56F4\u5185\uFF0C\u62BD\u4E2D\u65F6\u83B7\u5F97\u968F\u673A\u795E\u5C06\u3002" + LanguageIndex: 0 +--- !u!114 &6737946928187578861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8637436980630201770} + 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 &8654037135046806565 GameObject: m_ObjectHideFlags: 0