diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png.meta index a47817d8f0..a1fe123095 100644 --- a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 65, z: 0, w: 58} + spriteBorder: {x: 0, y: 65, z: 0, w: 53} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 658832a5cc..c9e3c8fe8f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -20386,6 +20386,52 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2025930671981306296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2763478119683056422} + - component: {fileID: 1214399939458572418} + m_Layer: 5 + m_Name: RightUp2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2763478119683056422 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025930671981306296} + 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: + - {fileID: 791836871433561562} + - {fileID: 934965601362156588} + m_Father: {fileID: 986452627335843391} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -53} + m_SizeDelta: {x: 160, y: 400} + m_Pivot: {x: 1, y: 1} +--- !u!222 &1214399939458572418 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025930671981306296} + m_CullTransparentMesh: 0 --- !u!1 &2039603832023882378 GameObject: m_ObjectHideFlags: 0 @@ -21137,120 +21183,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &2415491614551069973 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7660667769146384125} - - component: {fileID: 4838229921349092622} - - component: {fileID: 4128701516009104150} - - component: {fileID: 1645486651630728352} - - component: {fileID: 5173274903696953053} - m_Layer: 5 - m_Name: RightUp2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7660667769146384125 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2415491614551069973} - 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: 986452627335843391} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -50} - m_SizeDelta: {x: 160, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &4838229921349092622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2415491614551069973} - 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: 7f8196f2128a4e6489a78791b3146f78, type: 3} - 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!222 &4128701516009104150 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2415491614551069973} - m_CullTransparentMesh: 0 ---- !u!114 &1645486651630728352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2415491614551069973} - 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!114 &5173274903696953053 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2415491614551069973} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 50 - m_Bottom: 150 - m_ChildAlignment: 1 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 148, y: 126} - m_Spacing: {x: 0, y: 0} - m_Constraint: 1 - m_ConstraintCount: 1 --- !u!1 &2427972345482950957 GameObject: m_ObjectHideFlags: 0 @@ -21900,6 +21832,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2612545891026455540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 791836871433561562} + - component: {fileID: 6392692323906310469} + - component: {fileID: 1695695450593083737} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &791836871433561562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612545891026455540} + 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: 1956258183123164743} + m_Father: {fileID: 2763478119683056422} + 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: 80, y: 0} + m_SizeDelta: {x: 160, y: 709.92} + m_Pivot: {x: 1, y: 1} +--- !u!222 &6392692323906310469 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612545891026455540} + m_CullTransparentMesh: 0 +--- !u!114 &1695695450593083737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612545891026455540} + 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: 7f8196f2128a4e6489a78791b3146f78, type: 3} + 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!1 &2641955853697951866 GameObject: m_ObjectHideFlags: 0 @@ -22101,8 +22108,6 @@ GameObject: - component: {fileID: 4196182477682311981} - component: {fileID: 3137880424192743195} - component: {fileID: 8771929481548081679} - - component: {fileID: 24300954701252944} - - component: {fileID: 2233367739935552024} m_Layer: 5 m_Name: Image_1 m_TagString: Untagged @@ -22125,9 +22130,9 @@ RectTransform: m_Father: {fileID: 5034612710644007650} m_RootOrder: 2 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: -80.00004, y: -120} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -6, y: -126} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &3137880424192743195 @@ -22167,43 +22172,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &24300954701252944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2719273995663898841} - 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!114 &2233367739935552024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2719273995663898841} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 1 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 1 --- !u!1 &2782524026362280290 GameObject: m_ObjectHideFlags: 0 @@ -22798,9 +22766,9 @@ RectTransform: m_Father: {fileID: 5034612710644007650} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -63} m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &600217400349962022 @@ -49076,6 +49044,8 @@ GameObject: - component: {fileID: 4890164291228737029} - component: {fileID: 1148295245348429754} - component: {fileID: 4495607258833565001} + - component: {fileID: 6799165370466724897} + - component: {fileID: 8656524977008347276} m_Layer: 5 m_Name: activityTabPrefab m_TagString: Untagged @@ -49102,8 +49072,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: 692, y: 2172} - m_SizeDelta: {x: 148, y: 126} + m_AnchoredPosition: {x: -144.00005, y: -77.999954} + m_SizeDelta: {x: 148, y: 156} m_Pivot: {x: 0.49999973, y: 0.50000036} --- !u!222 &4883613866719607552 CanvasRenderer: @@ -49194,6 +49164,43 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &6799165370466724897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346368747760932773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &8656524977008347276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346368747760932773} + 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 &4359420380105879269 GameObject: m_ObjectHideFlags: 0 @@ -63991,6 +63998,55 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5735984104073139643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 934965601362156588} + - component: {fileID: 6888282265971651260} + m_Layer: 5 + m_Name: Ract2D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &934965601362156588 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5735984104073139643} + 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: 5336649970600085238} + m_Father: {fileID: 2763478119683056422} + m_RootOrder: 1 + 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: 80, y: 0} + m_SizeDelta: {x: 160, y: 709.92} + m_Pivot: {x: 1, y: 1} +--- !u!114 &6888282265971651260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5735984104073139643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5739855427012587213 GameObject: m_ObjectHideFlags: 0 @@ -64325,6 +64381,123 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &5814791337436474819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1956258183123164743} + - component: {fileID: 3224084130185534030} + - component: {fileID: 1337664295642808677} + - component: {fileID: 4424675629482360260} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1956258183123164743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5814791337436474819} + 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: 791836871433561562} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 3.9, y: 64.5} + m_SizeDelta: {x: 100, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3224084130185534030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5814791337436474819} + m_CullTransparentMesh: 0 +--- !u!114 &1337664295642808677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5814791337436474819} + 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: f9398964d6d4cdf4db9b39ec0fc5f348, 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 &4424675629482360260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5814791337436474819} + 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: 1 + 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: 1337664295642808677} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5887759230450269790 GameObject: m_ObjectHideFlags: 0 @@ -64808,6 +64981,7 @@ GameObject: - component: {fileID: 1314175879525437839} - component: {fileID: 8712514228028050916} - component: {fileID: 4298641023398397074} + - component: {fileID: 8632044476318714795} m_Layer: 5 m_Name: redPoint m_TagString: Untagged @@ -64871,6 +65045,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &8632044476318714795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6057761575288893132} + 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 &6130103891919744698 GameObject: m_ObjectHideFlags: 0 @@ -67136,6 +67330,89 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7198565923305368524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5336649970600085238} + - component: {fileID: 5480043022987940638} + - component: {fileID: 9007777386818839726} + - component: {fileID: 8771821115590540766} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5336649970600085238 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7198565923305368524} + 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: 934965601362156588} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -79.999985, y: -0.000061035156} + m_SizeDelta: {x: 160, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5480043022987940638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7198565923305368524} + m_CullTransparentMesh: 0 +--- !u!114 &9007777386818839726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7198565923305368524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 50 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &8771821115590540766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7198565923305368524} + 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 &7210930641227675088 GameObject: m_ObjectHideFlags: 0 @@ -67327,7 +67604,7 @@ RectTransform: - {fileID: 1508767087665272957} - {fileID: 1470640894515440942} - {fileID: 1612271237950830011} - - {fileID: 7660667769146384125} + - {fileID: 2763478119683056422} - {fileID: 8831099743542526053} - {fileID: 7019400324678272696} - {fileID: 19914098443950123} diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 7f6511beec..b57bf577dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -27,8 +27,7 @@ local isFirstOpen = 0 --local isCanDragMsg = true local supremHadSet = false local isUpperMonthCardTimeShow = true - local activitys = {}--中部页签 - local activitysRight = {}--右侧页签 + local activitys = {} local activityTabs = {} local moveSceneList = { @@ -242,6 +241,7 @@ function this:InitComponent() this.RightUp = Util.GetGameObject(self.gameObject, "RightUp") this.RightUp.transform.localScale = Vector3.one * UIManager.adapterScale this.RightUp2 = Util.GetGameObject(self.gameObject, "RightUp2") + this.RightUp2Grid = Util.GetGameObject(self.gameObject, "RightUp2/Ract2D/Grid") this.jiantouObj=Util.GetGameObject(self.gameObject, "jiantouObj") end @@ -705,7 +705,7 @@ function this.CreatActivity() activityTabs[k] = {} local root = this.RightUp if v.ListType == 1 then - root = this.RightUp2 + root = this.RightUp2Grid end activityTabs[k].go = newObjToParent(this.activityTabPrefab,root) activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image") @@ -754,6 +754,57 @@ function this.CreatActivity() end end) end + this.SetRightBarSize() +end + +--设置右侧条 +function this.SetRightBarSize() + local bgSize = Util.GetGameObject(this.RightUp2,"BG"):GetComponent("RectTransform") + local btn = Util.GetGameObject(this.RightUp2,"BG/Button") + local btnImg = Util.GetGameObject(this.RightUp2,"BG/Button"):GetComponent("RectTransform") + local rectSize = Util.GetGameObject(this.RightUp2,"Ract2D"):GetComponent("RectTransform") + local gridSize = this.RightUp2Grid :GetComponent("RectTransform") + + local str = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting") + if not str or str == 0 then + bgSize.sizeDelta = Vector3.New(160,276,0) + rectSize.sizeDelta = Vector3.New(160,176,0) + btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,-90)) + else + bgSize.sizeDelta = gridSize.sizeDelta + Vector3.New(0,100,0) + rectSize.sizeDelta = gridSize.sizeDelta + btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,90)) + end + Util.AddOnceClick(btn.gameObject,function() + local str2 = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting") + if str2 == 0 then + PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",1) + --按钮旋转 + DoTween.To(DG.Tweening.Core.DOGetter_float( function () return -90 end), + DG.Tweening.Core.DOSetter_float(function (t) + btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,t)) + end), 90, 0.3):SetEase(Ease.Linear) + --底图拉伸 + DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 176 end), + DG.Tweening.Core.DOSetter_float(function (t) + rectSize.sizeDelta = Vector3.New(160,t,0) + bgSize.sizeDelta = Vector3.New(160,t + 100,0) + end), gridSize.sizeDelta.y, 0.3):SetEase(Ease.Linear) + else + PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",0) + --按钮旋转 + DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 90 end), + DG.Tweening.Core.DOSetter_float(function (t) + btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,t)) + end), -90, 0.3):SetEase(Ease.Linear) + --底图拉伸 + DoTween.To(DG.Tweening.Core.DOGetter_float( function () return gridSize.sizeDelta.y end), + DG.Tweening.Core.DOSetter_float(function (t) + rectSize.sizeDelta = Vector3.New(160,t,0) + bgSize.sizeDelta = Vector3.New(160,t + 100,0) + end), 176, 0.3):SetEase(Ease.Linear) + end + end) end function this:TabBtnAction(id,actType,data)