diff --git a/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab b/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab index e7a3d7052d..32a9eb2306 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab @@ -80,6 +80,101 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u83B7\u53D6\u9014\u5F84" LanguageIndex: 0 +--- !u!1 &1093966159983557969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8738846203946458627} + - component: {fileID: 1137573515560892680} + - component: {fileID: 1810334659827614510} + - component: {fileID: 6331939690409937939} + m_Layer: 5 + m_Name: line (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8738846203946458627 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093966159983557969} + 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: 5063647704346803895} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.02, y: 3.699997} + m_SizeDelta: {x: 847.65, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1137573515560892680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093966159983557969} + m_CullTransparentMesh: 0 +--- !u!114 &1810334659827614510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093966159983557969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.6} + 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_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6331939690409937939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093966159983557969} + 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 &1219738714191345279 GameObject: m_ObjectHideFlags: 0 @@ -376,7 +471,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &552792606630635475 RectTransform: m_ObjectHideFlags: 0 @@ -393,8 +488,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.14, y: -60} - m_SizeDelta: {x: 879.21, y: 3} + m_AnchoredPosition: {x: 0.14, y: 3} + m_SizeDelta: {x: 847.65, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5408977987724499569 CanvasRenderer: @@ -592,13 +687,14 @@ RectTransform: - {fileID: 7858094131881493843} - {fileID: 1116572309818407697} - {fileID: 6930396005098058569} + - {fileID: 8690173684779559526} m_Father: {fileID: 2569204044806183315} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 445.1365, y: 0} - m_SizeDelta: {x: 905, y: 0} + m_AnchoredPosition: {x: 440, y: 0} + m_SizeDelta: {x: 882.07, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5468668283960185943 MonoBehaviour: @@ -630,7 +726,7 @@ MonoBehaviour: m_Left: 30 m_Right: 0 m_Top: 10 - m_Bottom: 20 + m_Bottom: 10 m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -818,6 +914,7 @@ GameObject: - component: {fileID: 7892514507901717546} - component: {fileID: 8178795368856619124} - component: {fileID: 4765965295993073111} + - component: {fileID: 3670301253922082159} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -841,8 +938,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: 15.5, y: 0.0000049142163} - m_SizeDelta: {x: 690.9, y: 132.91} + m_AnchoredPosition: {x: -1.2599, y: -0.000043637574} + m_SizeDelta: {x: 846.52, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7892514507901717546 CanvasRenderer: @@ -902,6 +999,20 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!114 &3670301253922082159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340063732143384124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &2569204043069825329 GameObject: m_ObjectHideFlags: 0 @@ -1332,8 +1443,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.04, y: -195.02} - m_SizeDelta: {x: 879.64, y: 3} + m_AnchoredPosition: {x: 0, y: -200.4} + m_SizeDelta: {x: 850, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2569204043561998425 CanvasRenderer: @@ -1505,12 +1616,12 @@ RectTransform: - {fileID: 4017037150082179591} - {fileID: 4719022025841726983} m_Father: {fileID: 2569204043929918739} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 920, y: 130} + m_SizeDelta: {x: 882.24, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2569204043918481269 MonoBehaviour: @@ -1533,7 +1644,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 260, y: 90} - m_Spacing: {x: 40, y: 0} + m_Spacing: {x: 10, y: 0} m_Constraint: 0 m_ConstraintCount: 1 --- !u!1 &2569204043929918738 @@ -1565,6 +1676,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5536435128881939401} - {fileID: 2569204044901933266} - {fileID: 2569204043918481268} m_Father: {fileID: 5360556648190854126} @@ -1573,7 +1685,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 901.25, y: 450} + m_SizeDelta: {x: 881.96, y: 450} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2569204043929918733 CanvasRenderer: @@ -1655,7 +1767,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 890.65, y: 267.862} + m_SizeDelta: {x: 881.72, y: 267.86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2569204043989112581 CanvasRenderer: @@ -1767,7 +1879,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2569204044134945840 RectTransform: m_ObjectHideFlags: 0 @@ -1784,8 +1896,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.03, y: -359} - m_SizeDelta: {x: 879.9, y: 3} + m_AnchoredPosition: {x: 9, y: -39.3} + m_SizeDelta: {x: 867, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2569204044134945843 CanvasRenderer: @@ -1808,15 +1920,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.6} 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_Sprite: {fileID: 21300000, guid: 15e168978c3b1f34ab7c908890c3f1ca, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 48b69449aa377b94aa90be9331fe0162, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1880,7 +1992,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 822.7, y: 61} + m_SizeDelta: {x: 867, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2569204044212116970 CanvasRenderer: @@ -2050,7 +2162,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 844, y: 250} + m_SizeDelta: {x: 848.63, y: 250} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2569204044474226676 CanvasRenderer: @@ -2197,7 +2309,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 449.35, y: 0} - m_SizeDelta: {x: 890.273, y: 0} + m_SizeDelta: {x: 880, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2569204044806183309 MonoBehaviour: @@ -2304,12 +2416,12 @@ RectTransform: - {fileID: 2569204044212116968} - {fileID: 2569204044474226683} m_Father: {fileID: 2569204043929918739} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 925, y: 320} + m_SizeDelta: {x: 881.63, y: 320} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2569204044901933267 MonoBehaviour: @@ -2324,10 +2436,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 38 + m_Left: 16 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 5 m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -2562,7 +2674,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 445.1365, y: 0} + m_AnchoredPosition: {x: 440, y: 0} m_SizeDelta: {x: 890, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2569204045014159985 @@ -2581,7 +2693,7 @@ MonoBehaviour: m_Left: 20 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 10 m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -2660,7 +2772,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2798,6 +2910,101 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &4402955511242835793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8690173684779559526} + - component: {fileID: 1390172733831212875} + - component: {fileID: 6758423628418832190} + - component: {fileID: 4150494976468434559} + m_Layer: 5 + m_Name: line (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8690173684779559526 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4402955511242835793} + 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: 4017090540579479040} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.03, y: -2.899994} + m_SizeDelta: {x: 847.65, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1390172733831212875 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4402955511242835793} + m_CullTransparentMesh: 0 +--- !u!114 &6758423628418832190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4402955511242835793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 15e168978c3b1f34ab7c908890c3f1ca, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &4150494976468434559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4402955511242835793} + 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 &4932966125577899783 GameObject: m_ObjectHideFlags: 0 @@ -2945,8 +3152,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 445.1365, y: 0} - m_SizeDelta: {x: 905, y: 0} + m_AnchoredPosition: {x: 440, y: 0} + m_SizeDelta: {x: 872.77, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2661736631983498299 MonoBehaviour: @@ -3194,7 +3401,7 @@ MonoBehaviour: m_Top: 2 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 0.72 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -3212,7 +3419,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_HorizontalFit: 0 - m_VerticalFit: 2 + m_VerticalFit: 1 --- !u!114 &5360556648190854121 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3276,15 +3483,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9529412, g: 0.9529412, b: 0.9529412, 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_Sprite: {fileID: 21300000, guid: 6dafd9e39a1ebe54f88dd32e7276d861, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: a9cf5792d692a824ea0eacc1e9fd42e0, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3548,6 +3755,101 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &5963040974489840749 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5536435128881939401} + - component: {fileID: 5639662455212307774} + - component: {fileID: 1605906394753041552} + - component: {fileID: 7474544183913595673} + m_Layer: 5 + m_Name: line (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5536435128881939401 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5963040974489840749} + 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: 2569204043929918739} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.03, y: 2.699997} + m_SizeDelta: {x: 847.65, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5639662455212307774 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5963040974489840749} + m_CullTransparentMesh: 0 +--- !u!114 &1605906394753041552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5963040974489840749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 15e168978c3b1f34ab7c908890c3f1ca, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &7474544183913595673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5963040974489840749} + 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 &6070743836927831094 GameObject: m_ObjectHideFlags: 0 @@ -3602,7 +3904,7 @@ MonoBehaviour: m_Left: 100 m_Right: 0 m_Top: 60 - m_Bottom: 0 + m_Bottom: 10 m_ChildAlignment: 0 m_Spacing: 60 m_ChildForceExpandWidth: 0 @@ -3659,7 +3961,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 60} + m_SizeDelta: {x: 212.61, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6695149895635219565 CanvasRenderer: @@ -3682,7 +3984,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.98867184, b: 0.9764151, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3754,7 +4056,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 872.5, y: 250.6} + m_SizeDelta: {x: 846.09, y: 250.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2007441922187717740 CanvasRenderer: @@ -3820,8 +4122,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 482.1, y: 0} - m_SizeDelta: {x: 904.2, y: 0} + m_AnchoredPosition: {x: 453.045, y: 0} + m_SizeDelta: {x: 846.09, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &603462693638031846 CanvasRenderer: @@ -3886,7 +4188,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8473358474235357670 RectTransform: m_ObjectHideFlags: 0 @@ -3903,8 +4205,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.02, y: -135.7} - m_SizeDelta: {x: 879.8, y: 3} + m_AnchoredPosition: {x: -1, y: -30.3} + m_SizeDelta: {x: 847.65, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8044394050125714379 CanvasRenderer: @@ -3927,15 +4229,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.6} 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_Sprite: {fileID: 21300000, guid: 15e168978c3b1f34ab7c908890c3f1ca, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 48b69449aa377b94aa90be9331fe0162, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4121,6 +4423,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7858094131881493843} + - component: {fileID: 6314277850277116073} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -4146,8 +4449,16 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 40} + m_SizeDelta: {x: 847.65, y: 61} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6314277850277116073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7207022561182050076} + m_CullTransparentMesh: 0 --- !u!1 &7290834751679840098 GameObject: m_ObjectHideFlags: 0 @@ -4376,7 +4687,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 801.92, y: 133} + m_SizeDelta: {x: 847.65, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4182130950397580521 CanvasRenderer: @@ -4419,7 +4730,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.0645766, g: 0.6603774, b: 0.05918475, a: 1} + m_Color: {r: 0.1764706, g: 0.5882353, b: 0.16862746, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4439,7 +4750,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u62A4\u7532" + m_Text: "\u62A4\u7532\n" LanguageIndex: 0 --- !u!114 &181309038237512809 MonoBehaviour: @@ -4454,7 +4765,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} + m_EffectDistance: {x: 0.2, y: -0.2} m_UseGraphicAlpha: 1 --- !u!1 &7730222082511011633 GameObject: @@ -4515,7 +4826,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9433962, g: 0.9433962, b: 0.9433962, a: 1} + m_Color: {r: 0.4245283, g: 0.41051087, b: 0.41051087, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -4589,7 +4900,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 845, y: 133} + m_SizeDelta: {x: 849.04, y: 133} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2608280986553954113 CanvasRenderer: @@ -4775,12 +5086,13 @@ RectTransform: - {fileID: 8473358474235357670} - {fileID: 6938480162684262204} - {fileID: 3846960628233657260} + - {fileID: 8738846203946458627} m_Father: {fileID: 2569204044806183315} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 445.1365, y: 0} + m_AnchoredPosition: {x: 440, y: 0} m_SizeDelta: {x: 890, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3923514204606133585 @@ -4799,7 +5111,7 @@ MonoBehaviour: m_Left: 30 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 5 m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -4911,7 +5223,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4815054056712833042 RectTransform: m_ObjectHideFlags: 0 @@ -5136,7 +5448,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: 177, y: -20.5} + m_AnchoredPosition: {x: 82.3, y: -28.8} m_SizeDelta: {x: 150, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7558503479984648912 @@ -5304,6 +5616,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2569204043989112587} m_Modifications: + - target: {fileID: 800187307388672636, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_Name + value: fx_zhuangbeijiemian + objectReference: {fileID: 0} + - target: {fileID: 800187307388672636, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, type: 3} propertyPath: m_LocalPosition.x @@ -5359,16 +5681,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 800187307388672636, guid: 6e21988006c4b0942b32c75e6b6987ba, - type: 3} - propertyPath: m_Name - value: fx_zhuangbeijiemian - objectReference: {fileID: 0} - - target: {fileID: 800187307388672636, guid: 6e21988006c4b0942b32c75e6b6987ba, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6e21988006c4b0942b32c75e6b6987ba, type: 3} --- !u!4 &256400619242869876 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab index 58e714f72c..2e1b4c2784 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab @@ -1611,7 +1611,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: 3c01a305eb51c04478b39d3060aceefe, type: 3} + m_Sprite: {fileID: 21300000, guid: e0c957b932199124c8fcaf7f11352aa6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3617,7 +3617,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8113208, g: 0.46019083, b: 0.16456035, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3848,7 +3848,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/JumpView/JumpView2.prefab b/Assets/ManagedResources/Prefabs/UI/JumpView/JumpView2.prefab index 052596bcb1..7030de96ee 100644 --- a/Assets/ManagedResources/Prefabs/UI/JumpView/JumpView2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JumpView/JumpView2.prefab @@ -60,7 +60,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9137255, b: 0.6, a: 1} + m_Color: {r: 0.990566, g: 0.96940243, b: 0.8924439, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -413,7 +413,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: -46.9, y: -3} + m_AnchoredPosition: {x: -103, y: -3} m_SizeDelta: {x: 468.3, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222572824413093294 @@ -437,7 +437,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.254717, g: 0.24150054, b: 0.24150054, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -450,7 +450,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 1 m_MinSize: 0 - m_MaxSize: 32 + m_MaxSize: 50 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab index edc0d1b1a8..718bdab61e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab @@ -260,7 +260,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 @@ -640,7 +640,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 @@ -6767,7 +6767,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -7689,7 +7689,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -10370,7 +10370,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -12985,7 +12985,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -17610,7 +17610,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -21932,7 +21932,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab index 16f002cebf..3686816a7e 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab @@ -402,8 +402,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 358, y: -47} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: 429.4, y: -41.25} + m_SizeDelta: {x: 932.32, y: 82.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222433518390430160 CanvasRenderer: @@ -434,7 +434,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -806,7 +806,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 179ba29a4451da245a7d6cfcaae39cc2, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -944,7 +944,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 179ba29a4451da245a7d6cfcaae39cc2, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1129,7 +1129,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 179ba29a4451da245a7d6cfcaae39cc2, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarLayout.prefab index 556470ca93..7c28ef505d 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarLayout.prefab @@ -2113,7 +2113,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: 7f34859978e378a47a237a6effe9152c, type: 3} + m_Sprite: {fileID: 21300000, guid: 934f215d095d3ee45913a1a02fabe1e1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2758,7 +2758,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 190, y: 153} + m_AnchoredPosition: {x: 193.7, y: 153} m_SizeDelta: {x: 201, y: 181.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &981049492709868683 @@ -3103,7 +3103,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &438922620722438850 RectTransform: m_ObjectHideFlags: 0 @@ -3120,7 +3120,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: 5.3999996, y: -74.927} + m_AnchoredPosition: {x: 5.3999996, y: -84.1} m_SizeDelta: {x: 60.39, y: 31.835} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4997783070877861743 @@ -3152,7 +3152,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 @@ -3453,7 +3453,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 @@ -3538,10 +3538,10 @@ RectTransform: m_Father: {fileID: 4632784590279934111} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 383.95, y: -96.9} + m_SizeDelta: {x: 201, y: 181.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6650889944257412233 CanvasRenderer: @@ -5334,7 +5334,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: 4080a1963cb778b47b33972e55bd5d9d, type: 3} + m_Sprite: {fileID: 21300000, guid: 4d829f7d088ef4448b5e87eaefa4d9e0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5866,7 +5866,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: 4080a1963cb778b47b33972e55bd5d9d, type: 3} + m_Sprite: {fileID: 21300000, guid: 4d829f7d088ef4448b5e87eaefa4d9e0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6315,8 +6315,8 @@ 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: 09a9525af5a63444a8b2786cf33aabed, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 3871582dadbfc39489517bdfd808d2de, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7488,7 +7488,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: 7f34859978e378a47a237a6effe9152c, type: 3} + m_Sprite: {fileID: 21300000, guid: 934f215d095d3ee45913a1a02fabe1e1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7684,10 +7684,10 @@ RectTransform: m_Father: {fileID: 4632784590279934111} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 562.55005, y: -96.9} + m_SizeDelta: {x: 201, y: 181.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1388333464128589442 CanvasRenderer: @@ -10151,8 +10151,8 @@ 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: 09a9525af5a63444a8b2786cf33aabed, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 3871582dadbfc39489517bdfd808d2de, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11307,7 +11307,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab index a37b28717b..7e19fd328a 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab @@ -3488,7 +3488,7 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua index 98e97c04b4..014ec6b681 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua @@ -7,9 +7,9 @@ local chapterDataId = 0 function FightLevelOpenChapterPopup:InitComponent() this.spLoader = SpriteLoader.New() self.btnBack = Util.GetGameObject(self.gameObject, "CloseBtn") - this.titleImage = Util.GetGameObject(self.gameObject, "bg/titleImage"):GetComponent("Image") + --this.titleImage = Util.GetGameObject(self.gameObject, "bg/titleImage"):GetComponent("Image") this.chapterName = Util.GetGameObject(self.gameObject, "bg/ziImage/Text"):GetComponent("Text") - this.chapterImage = Util.GetGameObject(self.gameObject, "bg/chapterImage"):GetComponent("Image") + --this.chapterImage = Util.GetGameObject(self.gameObject, "bg/chapterImage"):GetComponent("Image") end @@ -35,9 +35,9 @@ function FightLevelOpenChapterPopup:OnShow() end function this.OnShowPanel() local config = ConfigManager.GetConfigData(ConfigName.HardStageChapter,chapterDataId) - this.titleImage.sprite = this.spLoader:LoadSprite("j_jsxgq_biaoti") + --this.titleImage.sprite = this.spLoader:LoadSprite("j_jsxgq_biaoti") this.chapterName.text = config.Name - this.chapterImage.sprite = this.spLoader:LoadSprite(config.Map) + --this.chapterImage.sprite = this.spLoader:LoadSprite(config.Map) end --界面关闭时调用(用于子类重写) function FightLevelOpenChapterPopup:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index 1c0bb2d48e..1d438f9bfb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -52,7 +52,7 @@ local _ShopPage = { lock = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32", rpType = RedPointType.Shop_Page_Roam, - name = "宇宙生存挑战" + name = "生存挑战商店" }, [SHOP_PAGE.YUANSHEN] = { -- 元神 default = "UI_hz_gonghui_33", lock = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33", name = "元神商店"