diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_cjGM_01_zh.png b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_cjGM_01_zh.png index 1240f94366..24119059d8 100644 Binary files a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_cjGM_01_zh.png and b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_cjGM_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_sjGM_01_zh.png b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_sjGM_01_zh.png index 97c1140341..368867999f 100644 Binary files a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_sjGM_01_zh.png and b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_sjGM_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_wsGM_01_zh.png b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_wsGM_01_zh.png index 40383ffe2c..3916e9115a 100644 Binary files a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_wsGM_01_zh.png and b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_shuachong_wsGM_01_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab index c7421ab08c..e5059ac05d 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab @@ -96,7 +96,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1796856597 RectTransform: m_ObjectHideFlags: 0 @@ -734,7 +734,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3670159923304295513 RectTransform: m_ObjectHideFlags: 0 @@ -811,7 +811,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6181255060874004653 RectTransform: m_ObjectHideFlags: 0 @@ -904,6 +904,7 @@ RectTransform: - {fileID: 4971920776083045945} - {fileID: 5655428758918892390} - {fileID: 5667492174569696616} + - {fileID: 5427866806403663461} m_Father: {fileID: 4971744144487204077} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1877,7 +1878,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: 0, y: -511} + m_AnchoredPosition: {x: 0, y: -301} m_SizeDelta: {x: 1080, y: 758} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4719383393331877365 @@ -1917,6 +1918,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3115400373794667772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5427866806403663461} + - component: {fileID: 8729116329645395785} + - component: {fileID: 6473420722438791336} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5427866806403663461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3115400373794667772} + 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: + - {fileID: 1032978480157919936} + m_Father: {fileID: 7066509116918457454} + 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} + m_AnchoredPosition: {x: 0, y: 749} + m_SizeDelta: {x: 1080, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8729116329645395785 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3115400373794667772} + m_CullTransparentMesh: 0 +--- !u!114 &6473420722438791336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3115400373794667772} + 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: ce3025c68f4e0424cb12194680c39eef, 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!1 &3187340153663670587 GameObject: m_ObjectHideFlags: 0 @@ -2075,6 +2151,85 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &3545263761416131750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1032978480157919936} + - component: {fileID: 4684683145414351138} + - component: {fileID: 3339857707375405154} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1032978480157919936 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3545263761416131750} + 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: 5427866806403663461} + 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: 0, y: 0} + m_SizeDelta: {x: 1080, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4684683145414351138 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3545263761416131750} + m_CullTransparentMesh: 0 +--- !u!114 &3339857707375405154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3545263761416131750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9803922, g: 0.92549026, b: 0.85098046, 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: 48 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 48 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8D85\u503C\u6708\u5361\uFF0C\u798F\u5229\u591A\u591A\uFF01\uFF01" --- !u!1 &3776473353693909153 GameObject: m_ObjectHideFlags: 0 @@ -2183,7 +2338,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4950520957808164713 RectTransform: m_ObjectHideFlags: 0 @@ -2282,7 +2437,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: -0.089157104} - m_SizeDelta: {x: 0, y: 73.4} + m_SizeDelta: {x: 10, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1306951046585607155 CanvasRenderer: @@ -3111,7 +3266,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4971920776083045945 RectTransform: m_ObjectHideFlags: 0 @@ -3310,7 +3465,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &126691002140141174 RectTransform: m_ObjectHideFlags: 0 @@ -3583,7 +3738,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0.59998703} - m_SizeDelta: {x: 0, y: 73.4} + m_SizeDelta: {x: 10, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2685266852430105348 CanvasRenderer: @@ -4045,7 +4200,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5451923575520913762 RectTransform: m_ObjectHideFlags: 0 @@ -4441,7 +4596,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: 0, y: 32} + m_AnchoredPosition: {x: 0, y: 268} m_SizeDelta: {x: 1080, y: 758} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1332715413280453328