From ae0d718de997438e6bf54353157d3663a3d37caf Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 27 Aug 2024 16:37:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=81=E6=97=A0=E9=99=90=E5=85=85=E6=8A=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivityGift/OpenSeverWelfarePanel.prefab | 132 ++++++++++-------- 1 file changed, 74 insertions(+), 58 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab index e311113cba..8f0e648172 100644 --- a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab @@ -115,7 +115,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: -2.82, y: -6.58} + m_AnchoredPosition: {x: -2.82, y: -0.4} m_SizeDelta: {x: 792.35, y: 224.54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1870615583 @@ -193,8 +193,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: 679, y: -172} - m_SizeDelta: {x: 210.65, y: 77.61} + m_AnchoredPosition: {x: 678.8, y: -168.34} + m_SizeDelta: {x: 354.86, y: 84.94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &475910766691659542 CanvasRenderer: @@ -224,7 +224,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: 68e8dbe58a4b6964489f91c8edda0727, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -352,7 +352,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6313726, b: 0.35686275, a: 1} + m_Color: {r: 0.8018868, g: 0.3422688, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -432,7 +432,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} + m_Color: {r: 0.23584908, g: 0.094191305, b: 0.02336241, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -442,7 +442,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 45 - m_FontStyle: 0 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 49 @@ -596,7 +596,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 45 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 @@ -828,7 +828,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: -47.609985, y: -53.22998} + m_AnchoredPosition: {x: -46.799988, y: -46.900024} m_SizeDelta: {x: 93.1, y: 92.86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &362765208748513873 @@ -954,17 +954,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1143791194579300153} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4682586752510086079} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -177.6, y: 54.4} - m_SizeDelta: {x: 441.84, y: 38} + m_AnchoredPosition: {x: -134.21, y: 52.36} + m_SizeDelta: {x: 37.8, y: 528.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3036074941569862600 CanvasRenderer: @@ -994,7 +994,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 48c2df54fe837e749874f203aa06022e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1037,7 +1037,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: -123.63, y: -33.7} + m_AnchoredPosition: {x: -123.63, y: -27.9} m_SizeDelta: {x: 532.8, y: 120.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4030117989890005437 @@ -1111,8 +1111,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: -270.5, y: 53.7} - m_SizeDelta: {x: 242.11, y: 39.5} + m_AnchoredPosition: {x: -268.99, y: 51.40999} + m_SizeDelta: {x: 242.6, y: 39.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &285384619914619573 CanvasRenderer: @@ -1135,7 +1135,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6392157, g: 0.45098042, b: 0.29803923, a: 1} + m_Color: {r: 0.3301887, g: 0.22964978, b: 0.14796191, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1182,16 +1182,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1442723832595402554} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5019242676064227155} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -1.800003, y: -0.40000153} + m_AnchoredPosition: {x: -1.8000183, y: -0.40000153} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2060634659646041080 @@ -1215,7 +1215,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} + m_Color: {r: 0.9716981, g: 0.9716981, b: 0.9716981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1274,7 +1274,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: 660, y: -82} + m_AnchoredPosition: {x: 660, y: -73.1} m_SizeDelta: {x: 145, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6784752326365692122 @@ -1483,7 +1483,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: -115.8, y: -19.3} + m_AnchoredPosition: {x: -130.7, y: -19.3} m_SizeDelta: {x: 517, y: 91.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2054452467387522985 @@ -1726,7 +1726,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: -310, y: 76.9} + m_AnchoredPosition: {x: -310, y: 83.08} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6922793763514504574 @@ -1829,7 +1829,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} + m_Color: {r: 0.2264151, g: 0.09327163, b: 0.02669989, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1838,8 +1838,8 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 - m_FontStyle: 0 + m_FontSize: 35 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 49 @@ -1885,7 +1885,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: 229.4, y: -55.4} + m_AnchoredPosition: {x: 229.4, y: -49.1} m_SizeDelta: {x: 196.12, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5392566829970465375 @@ -1909,7 +1909,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9245283, g: 0.68765247, b: 0.3532396, a: 1} + m_Color: {r: 0.8000001, g: 0.34117648, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1988,7 +1988,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} + m_Color: {r: 0.16037738, g: 0.15754052, b: 0.1565949, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2045,7 +2045,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: 259.5, y: -8.2} + m_AnchoredPosition: {x: 259.5, y: 0.7} m_SizeDelta: {x: 210.65, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4408025784198771826 @@ -2094,7 +2094,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 44 - m_FontStyle: 0 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 m_MaxSize: 44 @@ -2140,8 +2140,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: -82.7, y: 586.2} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -64.611, y: 593.49} + m_SizeDelta: {x: 824.3, y: 85.57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3154219257161401556 CanvasRenderer: @@ -2171,8 +2171,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: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c39d460845b8bfb4aab7d859cd894c2f, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2240,15 +2240,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, 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: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: be081be71ea6bbe4bacd40f0541f2ae8, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2290,8 +2290,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -152, y: 0.96} - m_SizeDelta: {x: 236, y: 149.68} + m_AnchoredPosition: {x: -151.492, y: -0.003} + m_SizeDelta: {x: 234.985, y: 146.584} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5241818603952935100 CanvasRenderer: @@ -2341,6 +2341,7 @@ GameObject: - component: {fileID: 8794741195811729961} - component: {fileID: 449746718491416787} - component: {fileID: 1842307107484999652} + - component: {fileID: 8679394201822317825} m_Layer: 5 m_Name: timeText m_TagString: Untagged @@ -2388,7 +2389,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.70980394, g: 0.6156863, b: 0.46666667, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2396,7 +2397,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 @@ -2410,6 +2411,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A2\u592915\u5C0F\u65F6" LanguageIndex: 0 +--- !u!114 &8679394201822317825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7616016320188090306} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &7804127822467120640 GameObject: m_ObjectHideFlags: 0 @@ -2444,8 +2460,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: -1595, y: -25.39} - m_SizeDelta: {x: 798.3, y: 150.03} + m_AnchoredPosition: {x: -1518, y: 0} + m_SizeDelta: {x: 806, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5131262180630368864 MonoBehaviour: @@ -2585,8 +2601,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 269.8, y: 0} - m_SizeDelta: {x: 539.7, y: 0} + m_AnchoredPosition: {x: 270.675, y: 0.100997925} + m_SizeDelta: {x: 537.951, y: -3.402} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1557228119128083342 CanvasRenderer: @@ -2609,7 +2625,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.30588236, g: 0.30588236, b: 0.30980393, a: 0.60784316} + m_Color: {r: 0.6, g: 0.39607844, b: 0.043137256, a: 0.27450982} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2702,7 +2718,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: -86, y: 57} + m_AnchoredPosition: {x: -86, y: 63.18} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3515704499065432036 @@ -2784,7 +2800,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: 679, y: -171.1998} + m_AnchoredPosition: {x: 679, y: -169.8} m_SizeDelta: {x: 210.65, y: 77.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3373195975592485429 @@ -2815,7 +2831,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: b204bd77afb57e14e830d912e88eb357, type: 3} + m_Sprite: {fileID: 21300000, guid: 32985f6aabf9da44597176a009afdea8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2923,7 +2939,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: 660, y: -82} + m_AnchoredPosition: {x: 660, y: -73.1} m_SizeDelta: {x: 145, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1801418174916172182 @@ -3058,8 +3074,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.48, y: -28.125} - m_SizeDelta: {x: 816, y: 1157.6} + m_AnchoredPosition: {x: 1.05, y: -27.53} + m_SizeDelta: {x: 839.03, y: 1176.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2294529914098417299 CanvasRenderer: @@ -3082,15 +3098,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.69803923, g: 0.69411767, b: 0.69411767, 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: 511283344267e72458c966e14295d129, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: a8f530feeafc0954db3b66a08004edf3, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4