From 18da014144fbc81264c16fd7763f5544b1bf684d Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Thu, 11 Jan 2024 17:23:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=8D=A1=E9=81=AE=E7=BD=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/MonthCardPageView/WeekCardPanel.prefab | 234 +++++++++++++----- 1 file changed, 176 insertions(+), 58 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab index 1346f9e342..364cf9f5c8 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab @@ -263,7 +263,7 @@ RectTransform: m_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] m_Father: {fileID: 7543121757773600665} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -650,8 +650,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: 9.299988, y: 0} - m_SizeDelta: {x: 128, y: 794.9} + m_AnchoredPosition: {x: -0.0025177002, y: -0.000041991243} + m_SizeDelta: {x: 762.1, y: 195.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3791396216814909723 MonoBehaviour: @@ -672,9 +672,9 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 90, y: 225} - m_Spacing: {x: 10, y: 20} + m_StartAxis: 1 + m_CellSize: {x: 234, y: 197} + m_Spacing: {x: 11.26, y: 20} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &3791396216815245136 @@ -2761,7 +2761,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3791396217137669607 RectTransform: m_ObjectHideFlags: 0 @@ -2778,10 +2778,10 @@ RectTransform: m_Father: {fileID: 3791396216814909700} 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: 348.76, y: -45} + m_SizeDelta: {x: 225, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396217137669604 CanvasRenderer: @@ -3306,7 +3306,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3791396217255331865 RectTransform: m_ObjectHideFlags: 0 @@ -3323,10 +3323,10 @@ RectTransform: m_Father: {fileID: 3791396216814909700} m_RootOrder: 4 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: 1057.54, y: -45} + m_SizeDelta: {x: 225, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396217255331870 CanvasRenderer: @@ -3774,7 +3774,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7543121757773600665} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4241,7 +4241,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: 823d43d843e587346a4b9e3e48fb69b9, type: 3} + m_Sprite: {fileID: 21300000, guid: 728164abbf8742f4197b568c53a8d02c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5173,7 +5173,7 @@ RectTransform: m_Children: - {fileID: 6345816628611862318} m_Father: {fileID: 7543121757773600665} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5447,7 +5447,7 @@ RectTransform: - {fileID: 3791396217241305271} - {fileID: 3791396218779570626} m_Father: {fileID: 7543121757773600665} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5639,7 +5639,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7543121757773600665} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5843,12 +5843,12 @@ RectTransform: m_Children: - {fileID: 3791396217934815126} m_Father: {fileID: 7543121757773600665} - m_RootOrder: 8 + m_RootOrder: 9 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, y: -39} - m_SizeDelta: {x: 90, y: 225} + m_AnchoredPosition: {x: -232, y: -1140} + m_SizeDelta: {x: 234, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396217611455733 CanvasRenderer: @@ -5878,7 +5878,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: 4c1d83a37f3fb5a4782ed084e5b45180, type: 3} + m_Sprite: {fileID: 21300000, guid: 728164abbf8742f4197b568c53a8d02c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5991,7 +5991,7 @@ RectTransform: - {fileID: 3791396217607456270} - {fileID: 3791396218678684741} m_Father: {fileID: 7543121757773600665} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6805,7 +6805,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7543121757773600665} - m_RootOrder: 1 + 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} @@ -7185,17 +7185,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3791396217934815127} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.11831733, w: 0.99297583} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3791396217611455735} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.59} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -6} - m_SizeDelta: {x: 32.8, y: 197.1} + m_AnchoredPosition: {x: 0, y: -23} + m_SizeDelta: {x: 157.1, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396217934815124 CanvasRenderer: @@ -7218,7 +7218,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.92549026, g: 0.37647063, b: 0.1254902, a: 1} + m_Color: {r: 0.99607843, g: 0.9372549, b: 0.9372549, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7226,8 +7226,8 @@ 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_FontSize: 35 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -7422,6 +7422,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3791396217950878677} + - {fileID: 6897963840378134994} - {fileID: 3791396217822728545} - {fileID: 4703903162347610410} - {fileID: 3791396218110898363} @@ -7586,7 +7587,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7543121757773600665} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8162,7 +8163,7 @@ RectTransform: m_Children: - {fileID: 3791396218351498968} m_Father: {fileID: 7543121757773600665} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9459,12 +9460,12 @@ RectTransform: m_Children: - {fileID: 3791396216814909700} m_Father: {fileID: 7543121757773600665} - m_RootOrder: 10 + m_RootOrder: 11 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: 370.3, y: -323.3} - m_SizeDelta: {x: 109.4, y: 773.5} + m_AnchoredPosition: {x: -123, y: 347} + m_SizeDelta: {x: 762.1, y: 264.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3791396218267380987 MonoBehaviour: @@ -9914,17 +9915,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3791396218393337324} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.11831733, w: 0.99297583} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3791396217393567967} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.59} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -7.49} - m_SizeDelta: {x: 54.49, y: 198.74} + m_AnchoredPosition: {x: 0, y: -23} + m_SizeDelta: {x: 157.1, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218393337313 CanvasRenderer: @@ -9947,7 +9948,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.54509807, g: 0.32941177, b: 0.2509804, a: 1} + m_Color: {r: 0.9960785, g: 0.93725497, b: 0.93725497, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -9955,8 +9956,8 @@ 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_FontSize: 35 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -10303,7 +10304,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3791396218541800469 RectTransform: m_ObjectHideFlags: 0 @@ -10320,10 +10321,10 @@ RectTransform: m_Father: {fileID: 3791396216814909700} m_RootOrder: 3 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: 821.28, y: -45} + m_SizeDelta: {x: 225, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218541800554 CanvasRenderer: @@ -11199,7 +11200,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3791396218716424628 RectTransform: m_ObjectHideFlags: 0 @@ -11216,10 +11217,10 @@ RectTransform: m_Father: {fileID: 3791396216814909700} 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: 585.02, y: -45} + m_SizeDelta: {x: 225, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218716424585 CanvasRenderer: @@ -11891,7 +11892,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7543121757773600665} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12682,7 +12683,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7543121757773600665} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12966,3 +12967,120 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5171\u8BA1\uFF1A500\u4E07\u91D1\u5E01" +--- !u!1 &8711356136925962968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6897963840378134994} + - component: {fileID: 334330705326987439} + - component: {fileID: 6656313458178598778} + - component: {fileID: 5663872705974265707} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6897963840378134994 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8711356136925962968} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7543121757773600665} + 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: 0, y: 0} + m_SizeDelta: {x: 3000, y: 3000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &334330705326987439 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8711356136925962968} + m_CullTransparentMesh: 0 +--- !u!114 &6656313458178598778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8711356136925962968} + 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.7058824} + 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_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &5663872705974265707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8711356136925962968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6656313458178598778} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null