diff --git a/Assets/Resources/UIs/PanelLevel.prefab b/Assets/Resources/UIs/PanelLevel.prefab index 99879b73..774cdcb7 100644 --- a/Assets/Resources/UIs/PanelLevel.prefab +++ b/Assets/Resources/UIs/PanelLevel.prefab @@ -329,7 +329,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1890007152666068253} - m_Father: {fileID: 7274106815721414707} + m_Father: {fileID: 4188896560613130201} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -878,7 +878,7 @@ RectTransform: - {fileID: 1890007151263563443} - {fileID: 1890007151171864231} m_Father: {fileID: 9135682575492832201} - 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} @@ -1190,7 +1190,7 @@ MonoBehaviour: m_EditorClassIdentifier: mBtnBack: {fileID: 1549853548048420530} mBtnBackToMain: {fileID: 1549853548561325180} - mLvPage: {fileID: 9135682575477233262} + mLvPage: {fileID: 2313535500816353668} --- !u!114 &923398011 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1428,6 +1428,356 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &4188896560613130200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4188896560613130201} + - component: {fileID: 4188896560613130204} + - component: {fileID: 4188896560613130207} + - component: {fileID: 4188896560613130206} + - component: {fileID: 2313535500816353668} + m_Layer: 5 + m_Name: PageView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4188896560613130201 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4188896560613130200} + 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: 1549853547905349718} + m_Father: {fileID: 9135682575492832201} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4188896560613130204 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4188896560613130200} + m_CullTransparentMesh: 0 +--- !u!114 &4188896560613130207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4188896560613130200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4188896560613130206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4188896560613130200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1890007152666068253} + m_Horizontal: 1 + m_Vertical: 0 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1549853547905349718} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2313535500816353668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4188896560613130200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f57cac8c398047309e9dd841dbeca36, type: 3} + m_Name: + m_EditorClassIdentifier: + CountPerPage: 20 + SlideSpeed: 4 + sensitivity: 0.3 + mSpotView: {fileID: 4965647244722132842} + mCtnPage: {fileID: 1890007152666068253} + mTplPage: {fileID: 9135682575315895655} + mTplCell: {fileID: 1549853548759154687} +--- !u!1 &4965647244121264397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4965647244121264402} + - component: {fileID: 4965647244121264400} + - component: {fileID: 4965647244121264403} + m_Layer: 5 + m_Name: LightSpot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4965647244121264402 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647244121264397} + 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: 4965647245680162111} + 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: 31, y: 31} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4965647244121264400 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647244121264397} + m_CullTransparentMesh: 0 +--- !u!114 &4965647244121264403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647244121264397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 466375c5c95a14ae1a3aa2e51acf7735, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4965647244722132836 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4965647244722132837} + - component: {fileID: 4965647244722132842} + - component: {fileID: 4965647244722132843} + m_Layer: 5 + m_Name: PageSpot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4965647244722132837 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647244722132836} + 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: 9135682575492832201} + 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: -450} + m_SizeDelta: {x: 640, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4965647244722132842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647244722132836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 54374b487b547400ea71cbb6e6cf2cf5, type: 3} + m_Name: + m_EditorClassIdentifier: + mTplSpot: {fileID: 4965647245680162110} +--- !u!114 &4965647244722132843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647244722132836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &4965647245680162110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4965647245680162111} + - component: {fileID: 4965647245680162109} + - component: {fileID: 4965647245680162108} + m_Layer: 5 + m_Name: Tpl_Spot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4965647245680162111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647245680162110} + 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: 4965647244121264402} + m_Father: {fileID: 9135682575492832201} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 31, y: 31} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4965647245680162109 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647245680162110} + m_CullTransparentMesh: 0 +--- !u!114 &4965647245680162108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4965647245680162110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 25fbdfff901f54aae82515140c3b69a9, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7274106814010849298 GameObject: m_ObjectHideFlags: 0 @@ -1582,132 +1932,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7274106815721414706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7274106815721414707} - - component: {fileID: 7274106815721414710} - - component: {fileID: 7274106815721414709} - - component: {fileID: 7274106815721414708} - - component: {fileID: 9135682575477233262} - m_Layer: 5 - m_Name: ScrollView - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7274106815721414707 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7274106815721414706} - 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: 1549853547905349718} - m_Father: {fileID: 9135682575492832201} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7274106815721414710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7274106815721414706} - m_CullTransparentMesh: 0 ---- !u!114 &7274106815721414709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7274106815721414706} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 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 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7274106815721414708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7274106815721414706} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 1890007152666068253} - m_Horizontal: 1 - m_Vertical: 0 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 1549853547905349718} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &9135682575477233262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7274106815721414706} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6f57cac8c398047309e9dd841dbeca36, type: 3} - m_Name: - m_EditorClassIdentifier: - CountPerPage: 20 - SlideSpeed: 4 - sensitivity: 0.3 - mCtnPage: {fileID: 1890007152666068253} - mTplPage: {fileID: 9135682575315895655} - mTplCell: {fileID: 1549853548759154687} - posList: [] --- !u!1 &7274106816053439044 GameObject: m_ObjectHideFlags: 0 @@ -1811,7 +2035,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 9135682575492832201} - 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} @@ -1869,9 +2093,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7274106815721414707} + - {fileID: 4188896560613130201} + - {fileID: 4965647244722132837} - {fileID: 9135682575315895654} - {fileID: 1549853548759154686} + - {fileID: 4965647245680162111} m_Father: {fileID: 1549853549434864437} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 93605cf9..a88871c4 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -170,136 +170,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2617655799926167754} m_PrefabAsset: {fileID: 0} ---- !u!224 &1549853549371387012 stripped +--- !u!224 &1132805848468396765 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, type: 3} - m_PrefabInstance: {fileID: 1890007151875725800} + m_PrefabInstance: {fileID: 4965647244895307266} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1890007151875725800 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3333527423099584207} - m_Modifications: - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864438, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_Name - value: PanelLevel - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864438, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 30cc95837c5a74b1ca4757bb85a4abfa, type: 3} --- !u!1001 &2617655799926167754 PrefabInstance: m_ObjectHideFlags: 0 @@ -565,7 +441,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 776958736012266133} - - {fileID: 1549853549371387012} + - {fileID: 1132805848468396765} m_Father: {fileID: 3333527423029586801} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -746,3 +622,127 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1001 &4965647244895307266 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3333527423099584207} + m_Modifications: + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864438, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_Name + value: PanelLevel + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864438, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 30cc95837c5a74b1ca4757bb85a4abfa, type: 3} diff --git a/Assets/Scripts/UI/CustomControl/LevelList/LevelPage.cs b/Assets/Scripts/UI/CustomControl/LevelList/LevelPage.cs index e2e8d66d..2bb7b88f 100644 --- a/Assets/Scripts/UI/CustomControl/LevelList/LevelPage.cs +++ b/Assets/Scripts/UI/CustomControl/LevelList/LevelPage.cs @@ -12,7 +12,7 @@ public class LevelPage : PageView get { int tTotalCount = GameConfig.Instance.LevelSort.Count + 1;//add coming soon - int tUnlockedCount = PlayerData.Instance.UnlockedLevel; + int tUnlockedCount = 23;// PlayerData.Instance.UnlockedLevel; int tEnoughCount = (tUnlockedCount / CountPerPage + 1) + (tUnlockedCount % CountPerPage == 0 ? -1 : 0); return Mathf.Min(tTotalCount, tEnoughCount * CountPerPage); diff --git a/Assets/Scripts/UI/CustomControl/PageSpot.cs b/Assets/Scripts/UI/CustomControl/PageSpot.cs new file mode 100644 index 00000000..7cdb1b74 --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/PageSpot.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PageSpot : MonoBehaviour +{ + [SerializeField] GameObject mTplSpot; + + private Transform mCtn; + private List mLightSpots; + + private void Awake() + { + mCtn = transform; + } + + public void Init(int pTotalCount) + { + mLightSpots = new List(); + + for (int i = 0; i < pTotalCount; i++) + { + GameObject tSpot = Instantiate(mTplSpot, mCtn); + tSpot.SetActive(true); + tSpot.transform.localScale = Vector3.one; + + mLightSpots.Add(tSpot.transform.GetChild(0).gameObject); + } + } + + public void SetPageIndex(int pCurrentIndex) + { + for(int i = 0; i < mLightSpots.Count; i++) + { + mLightSpots[i].SetActive(pCurrentIndex == i); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/CustomControl/PageSpot.cs.meta b/Assets/Scripts/UI/CustomControl/PageSpot.cs.meta new file mode 100644 index 00000000..a153990c --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/PageSpot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 54374b487b547400ea71cbb6e6cf2cf5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/CustomControl/PageView.cs b/Assets/Scripts/UI/CustomControl/PageView.cs index c2af3ce7..7864bbc2 100644 --- a/Assets/Scripts/UI/CustomControl/PageView.cs +++ b/Assets/Scripts/UI/CustomControl/PageView.cs @@ -12,6 +12,7 @@ public abstract class PageView : MonoBehaviour, IBeginDragHandler, IEndDragHandl public float SlideSpeed = 4; //滑动速度 public float sensitivity = 0.3f; + [SerializeField] PageSpot mSpotView; [SerializeField] Transform mCtnPage; [SerializeField] GameObject mTplPage; [SerializeField] GameObject mTplCell; @@ -21,7 +22,7 @@ public abstract class PageView : MonoBehaviour, IBeginDragHandler, IEndDragHandl ScrollRect rect; //滑动组件 private float targethorizontal = 0; //滑动的起始坐标 private bool isDrag = false; //是否拖拽结束 - [SerializeField] List posList = new List();//求出每页的临界角,页索引从0开始 + List posList = new List();//求出每页的临界角,页索引从0开始 private int currentPageIndex = -1; private bool stopMove = true; @@ -46,7 +47,10 @@ public abstract class PageView : MonoBehaviour, IBeginDragHandler, IEndDragHandl float t = startTime * SlideSpeed; rect.horizontalNormalizedPosition = Mathf.Lerp(rect.horizontalNormalizedPosition, targethorizontal, t); if (t >= 1) + { stopMove = true; + NotifyPageChange(); + } } } @@ -57,9 +61,6 @@ public abstract class PageView : MonoBehaviour, IBeginDragHandler, IEndDragHandl if (currentPageIndex != index) { currentPageIndex = index; - - if (OnPageChanged != null) - OnPageChanged(index); } if (pWithScroll) @@ -72,14 +73,26 @@ public abstract class PageView : MonoBehaviour, IBeginDragHandler, IEndDragHandl else { rect.horizontalNormalizedPosition = posList[index]; + + NotifyPageChange(); } } else { - Debug.LogError("页码不存在"); + //Debug.LogError("页码不存在"); } } + public void LastPage() + { + PageTo(currentPageIndex--); + } + + public void NextPage() + { + PageTo(currentPageIndex++); + } + public void OnBeginDrag(PointerEventData eventData) { isDrag = true; @@ -105,6 +118,15 @@ public abstract class PageView : MonoBehaviour, IBeginDragHandler, IEndDragHandl } PageTo(index); } + + private void NotifyPageChange() + { + OnPageChanged?.Invoke(currentPageIndex); + if (mSpotView != null) + { + mSpotView.SetPageIndex(currentPageIndex); + } + } #endregion #region config cell @@ -140,6 +162,11 @@ public abstract class PageView : MonoBehaviour, IBeginDragHandler, IEndDragHandl HideUnused(); + if (mSpotView != null) + { + mSpotView.Init(mPageCount); + } + PageTo(0, false); }