diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/q_qinlongmibao_jiesuozhenbao198(2).png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/q_qinlongmibao_jiesuozhenbao198(2).png index 598904230d..8f1eedf54d 100644 Binary files a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/q_qinlongmibao_jiesuozhenbao198(2).png and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/q_qinlongmibao_jiesuozhenbao198(2).png differ diff --git a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab index 13ce95d8e9..e2b17714c8 100644 --- a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab @@ -4776,7 +4776,7 @@ ParticleSystem: --- !u!199 &6742891089580813566 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9640,7 +9640,7 @@ ParticleSystem: --- !u!199 &5145475213663396904 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9728,7 +9728,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6176893569939801487} + m_Father: {fileID: 7076300033625331926} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -9785,12 +9785,12 @@ GameObject: - component: {fileID: 7611403991256843622} - component: {fileID: 4872748844166438370} m_Layer: 0 - m_Name: bg + m_Name: bg2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6176893569939801487 RectTransform: m_ObjectHideFlags: 0 @@ -9802,18 +9802,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1815088663130093662} - - {fileID: 3836449925080198145} - - {fileID: 465105968418070018} - - {fileID: 3039794306764396230} - - {fileID: 5541345126725532482} + - {fileID: 130999874944175256} + - {fileID: 4153057891760143617} + - {fileID: 8679419316812699543} + - {fileID: 1380318029707229026} m_Father: {fileID: 2299626211489364802} - m_RootOrder: 0 + 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: 1082, y: 1920.1} + m_AnchoredPosition: {x: 0, y: -0.025024} + m_SizeDelta: {x: 1082, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7611403991256843622 CanvasRenderer: @@ -9836,7 +9835,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} + m_Color: {r: 0, g: 0, b: 0, a: 0.8392157} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -9869,7 +9868,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2034880781698674022 RectTransform: m_ObjectHideFlags: 0 @@ -9877,13 +9876,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1128877549306784536} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4962214830913375066} - m_Father: {fileID: 3836449925080198145} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 7076300033625331926} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14611,7 +14609,7 @@ ParticleSystem: --- !u!199 &8066144489704971912 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19307,7 +19305,7 @@ ParticleSystem: --- !u!199 &2674941647737039045 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19395,8 +19393,8 @@ Transform: m_Children: - {fileID: 4684054568920006905} - {fileID: 8270990450476474254} - m_Father: {fileID: 9049939546735235859} - m_RootOrder: 5 + m_Father: {fileID: 7288097194414657236} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2422350911653475333 GameObject: @@ -19508,7 +19506,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8466737968469474137} - m_Father: {fileID: 9049939546735235859} + m_Father: {fileID: 7288097194414657236} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -19585,8 +19583,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4107740806240722104} - m_Father: {fileID: 9049939546735235859} - m_RootOrder: 4 + m_Father: {fileID: 7288097194414657236} + 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} @@ -24222,7 +24220,7 @@ ParticleSystem: --- !u!199 &315076872362553229 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24289,7 +24287,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9049939546735235859} + - component: {fileID: 7288097194414657236} m_Layer: 0 m_Name: show m_TagString: Untagged @@ -24297,8 +24295,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &9049939546735235859 -Transform: +--- !u!224 &7288097194414657236 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -24309,14 +24307,101 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1016205941835756556} - - {fileID: 1421412721531771649} - - {fileID: 6634527983000632123} - - {fileID: 1185281317674412411} - {fileID: 2035901429463309988} + - {fileID: 6634527983000632123} + - {fileID: 1421412721531771649} - {fileID: 7292845902067024352} + - {fileID: 1185281317674412411} + - {fileID: 1414649655821106981} + - {fileID: 8309702626744653315} m_Father: {fileID: 2299626211489364802} - 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3527560122081183440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7076300033625331926} + - component: {fileID: 6786230847870621759} + - component: {fileID: 8364259675507966139} + m_Layer: 0 + m_Name: bg1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7076300033625331926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527560122081183440} + 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: 1815088663130093662} + - {fileID: 3836449925080198145} + - {fileID: 465105968418070018} + - {fileID: 3039794306764396230} + - {fileID: 9005274938624981717} + - {fileID: 2034880781698674022} + m_Father: {fileID: 2299626211489364802} + 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: 1082, y: 1920.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6786230847870621759 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527560122081183440} + m_CullTransparentMesh: 0 +--- !u!114 &8364259675507966139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527560122081183440} + 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.9411765} + 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!1 &3556907925128277840 GameObject: m_ObjectHideFlags: 0 @@ -24346,8 +24431,8 @@ Transform: m_Children: - {fileID: 950272054982939995} - {fileID: 4487460610156214052} - m_Father: {fileID: 9049939546735235859} - m_RootOrder: 3 + m_Father: {fileID: 7288097194414657236} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3796292795648297344 GameObject: @@ -29062,7 +29147,7 @@ ParticleSystem: --- !u!199 &2646779478843247047 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29121,6 +29206,86 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &3838883898171301278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1414649655821106981} + - component: {fileID: 7979380570737577854} + - component: {fileID: 2524790808486586830} + m_Layer: 0 + m_Name: timesLeft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1414649655821106981 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3838883898171301278} + 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: 7288097194414657236} + 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} + m_AnchoredPosition: {x: 0, y: -788} + m_SizeDelta: {x: 300, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7979380570737577854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3838883898171301278} + m_CullTransparentMesh: 0 +--- !u!114 &2524790808486586830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3838883898171301278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.98823535, g: 0.8470589, b: 0.8470589, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5269\u4F59\u6B21\u6570" + LanguageIndex: 11730 --- !u!1 &4038185327160838764 GameObject: m_ObjectHideFlags: 0 @@ -33760,7 +33925,7 @@ ParticleSystem: --- !u!199 &7017377515869972143 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33848,8 +34013,8 @@ RectTransform: m_Children: - {fileID: 9172750238096426000} - {fileID: 3994606929163631500} - m_Father: {fileID: 2299626211489364802} - m_RootOrder: 2 + m_Father: {fileID: 7076300033625331926} + 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} @@ -38387,7 +38552,7 @@ ParticleSystem: --- !u!199 &1412951642965379859 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38475,7 +38640,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6176893569939801487} + m_Father: {fileID: 7076300033625331926} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -38550,9 +38715,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7076300033625331926} - {fileID: 6176893569939801487} - - {fileID: 9049939546735235859} - - {fileID: 9005274938624981717} + - {fileID: 7288097194414657236} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -38607,86 +38772,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4758041225773859405} m_CullTransparentMesh: 0 ---- !u!1 &4802541132981777449 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5541345126725532482} - - component: {fileID: 7127042387487130306} - - component: {fileID: 6222497011225012962} - m_Layer: 0 - m_Name: timesLeft - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5541345126725532482 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4802541132981777449} - 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: 6176893569939801487} - 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: -788} - m_SizeDelta: {x: 300, y: 70} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7127042387487130306 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4802541132981777449} - m_CullTransparentMesh: 0 ---- !u!114 &6222497011225012962 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4802541132981777449} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.8470589, b: 0.8470589, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5269\u4F59\u6B21\u6570" - LanguageIndex: 11730 --- !u!1 &4868507330861459819 GameObject: m_ObjectHideFlags: 0 @@ -43285,7 +43370,7 @@ ParticleSystem: --- !u!199 &3754454673652926932 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43344,6 +43429,126 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &5119165701908427264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8679419316812699543} + - component: {fileID: 1769024481595267726} + m_Layer: 0 + m_Name: hero + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8679419316812699543 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5119165701908427264} + 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: 2931217454655974565} + - {fileID: 7146392583095152824} + m_Father: {fileID: 6176893569939801487} + m_RootOrder: 2 + 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 &1769024481595267726 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5119165701908427264} + m_CullTransparentMesh: 0 +--- !u!1 &5198634765300986035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7146392583095152824} + - component: {fileID: 1558266768188772024} + - component: {fileID: 1119470173355701057} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7146392583095152824 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5198634765300986035} + 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: 8679419316812699543} + 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: 75.9, y: -174.4} + m_SizeDelta: {x: 968, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1558266768188772024 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5198634765300986035} + m_CullTransparentMesh: 0 +--- !u!114 &1119470173355701057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5198634765300986035} + 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: 0.9019608} + 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: 76c460452cbff694a9dd9ecfad1ab19c, 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 &5659957289307284420 GameObject: m_ObjectHideFlags: 0 @@ -43561,6 +43766,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4EF7\u503C\uFF1A1140\u5143" LanguageIndex: 11732 +--- !u!1 &5974049692653517533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8309702626744653315} + - component: {fileID: 8109946216632929277} + - component: {fileID: 6183585172028882639} + m_Layer: 0 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8309702626744653315 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5974049692653517533} + 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: 7288097194414657236} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 196.70003, y: 248} + m_SizeDelta: {x: 368, y: 92.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8109946216632929277 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5974049692653517533} + m_CullTransparentMesh: 0 +--- !u!114 &6183585172028882639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5974049692653517533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8117648, b: 0.27450982, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 27 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 57 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u606D\u559C\u60A8\u7B49\u7EA7\u63D0\u5347\u81F328\u7EA7\uFF0C\u6211\u4EEC\u4E3A\u60A8\u51C6\u5907\u4E86\u8D85\u503C\u793C\u5305\uFF0C\u52A9\u60A8\u63D0\u5347\u6218\u529B!!!" + LanguageIndex: 11729 --- !u!1 &6180554173573078818 GameObject: m_ObjectHideFlags: 0 @@ -43615,7 +43900,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 10 + m_Spacing: -52.62 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -43648,9 +43933,8 @@ RectTransform: 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: 2034880781698674022} - m_Father: {fileID: 6176893569939801487} + m_Children: [] + m_Father: {fileID: 7076300033625331926} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -43695,6 +43979,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6406938328886149404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3122847029739947333} + - component: {fileID: 9172115513959909474} + - component: {fileID: 6269553500272781496} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3122847029739947333 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6406938328886149404} + 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: 2931217454655974565} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9172115513959909474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6406938328886149404} + m_CullTransparentMesh: 0 +--- !u!114 &6269553500272781496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6406938328886149404} + 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.8} + 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!1 &6801484805305654314 GameObject: m_ObjectHideFlags: 0 @@ -43724,7 +44082,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6176893569939801487} + m_Father: {fileID: 7076300033625331926} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -43769,86 +44127,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7306171276817491844 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4962214830913375066} - - component: {fileID: 5116365736919914148} - - component: {fileID: 7087587646211220374} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4962214830913375066 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7306171276817491844} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2034880781698674022} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.7, y: 16} - m_SizeDelta: {x: 368, y: 92.6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5116365736919914148 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7306171276817491844} - m_CullTransparentMesh: 0 ---- !u!114 &7087587646211220374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7306171276817491844} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9921569, g: 0.8117648, b: 0.27450982, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 27 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 57 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u606D\u559C\u60A8\u7B49\u7EA7\u63D0\u5347\u81F328\u7EA7\uFF0C\u6211\u4EEC\u4E3A\u60A8\u51C6\u5907\u4E86\u8D85\u503C\u793C\u5305\uFF0C\u52A9\u60A8\u63D0\u5347\u6218\u529B!!!" - LanguageIndex: 11729 --- !u!1 &7355745224998416582 GameObject: m_ObjectHideFlags: 0 @@ -43890,6 +44168,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 289} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7635865582546749456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4153057891760143617} + - component: {fileID: 2583722475197894924} + - component: {fileID: 6628173819524339962} + m_Layer: 5 + m_Name: moon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4153057891760143617 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7635865582546749456} + 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: 6176893569939801487} + 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: 179.8} + m_SizeDelta: {x: 1060, y: 944} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2583722475197894924 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7635865582546749456} + m_CullTransparentMesh: 0 +--- !u!114 &6628173819524339962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7635865582546749456} + 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: ed86bf78b9cc4e24586ad5cb36d5cd1d, 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 &7719670241945522115 GameObject: m_ObjectHideFlags: 0 @@ -48497,7 +48849,7 @@ ParticleSystem: --- !u!199 &1954745489274861193 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48585,8 +48937,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 9049939546735235859} - m_RootOrder: 1 + m_Father: {fileID: 7288097194414657236} + 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} @@ -48636,6 +48988,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A 00:00:00" LanguageIndex: 11731 +--- !u!1 &8111922810281183819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1380318029707229026} + - component: {fileID: 2849588710029997053} + - component: {fileID: 3186398562525839710} + m_Layer: 0 + m_Name: endTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1380318029707229026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8111922810281183819} + 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: 6176893569939801487} + 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: 2.23, y: -566.2} + m_SizeDelta: {x: 449.03, y: 52.86} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2849588710029997053 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8111922810281183819} + m_CullTransparentMesh: 0 +--- !u!114 &3186398562525839710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8111922810281183819} + 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: ba69637407481694482e95746ebc9d5b, 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 &8802121631987091555 GameObject: m_ObjectHideFlags: 0 @@ -48666,7 +49092,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 9049939546735235859} + m_Father: {fileID: 7288097194414657236} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -48753,3 +49179,216 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &9122775248823390079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 130999874944175256} + - component: {fileID: 210510805359760938} + - component: {fileID: 6886464964504296265} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &130999874944175256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9122775248823390079} + 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: 6176893569939801487} + 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: -7.7, y: 712.5} + m_SizeDelta: {x: 604, y: 156} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &210510805359760938 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9122775248823390079} + m_CullTransparentMesh: 0 +--- !u!114 &6886464964504296265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9122775248823390079} + 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: c30627ba2df31754b9ca5d5430db8a46, 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!1001 &3148814552619870679 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8679419316812699543} + m_Modifications: + - target: {fileID: 1649368952783984, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} + propertyPath: m_Name + value: live2d_c_ywe_0078 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 63.4 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -138.5 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalScale.x + value: -0.665 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.665 + objectReference: {fileID: 0} + - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.665 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} +--- !u!224 &2931217454655974565 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, + type: 3} + m_PrefabInstance: {fileID: 3148814552619870679} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 150cf39206..4f63a4ee7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -346,7 +346,8 @@ end --第七种 升级限时礼包 function PatFacePanel:OnShowOb7Data() -UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end) + OperatingManager.upGradePackagePanelType = 1 + UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end) end function PatFacePanel:JumpBtnClickEvent() if openPanle then diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index b31e0e6736..12d3cc60f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1314,19 +1314,14 @@ function this.TimeFormat() --限时折扣 local giftList = {} giftList = this:GetInfoList() - if giftList ~= 0 then - local conditon = false - for i = 1, #giftList do - if giftList[i].dynamicBuyTimes ~= 0 then - conditon = true - break - end + if #giftList > 0 then + this.upGradePackageBtn:SetActive(true) + this.upGradePackageTime.text = TimeToHMS(giftList[1].endTime-GetTimeStamp()) + if giftList[1].endTime-GetTimeStamp() < 1 then + OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, giftList[1].goodsId) end - if conditon then - this.upGradePackageBtn:SetActive(true) - this.upGradePackageTime.text = TimeToHMS(giftList[1].endTime-GetTimeStamp()) - end - + else + this.upGradePackageBtn:SetActive(false) end --轮转活动,乾坤宝盒 @@ -1348,7 +1343,15 @@ function this:GetInfoList() local infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",21) for index, value in pairs(infoList) do for i = 1, #infoList2 do - if infoList2[i].Id == value.goodsId then + if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then + table.insert(giftList,value) + end + end + end + infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8) + for index, value in pairs(infoList) do + for i = 1, #infoList2 do + if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then table.insert(giftList,value) end end @@ -1406,8 +1409,8 @@ function this.RefreshGiftBtnShow() local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) this.upperMonthCardBtn:SetActive(isOpen_128 or isOpen_328) - local isOpen_upgrade = OperatingManager.IsBaseOpen(GoodsTypeDef.UpgradePackage) - this.upGradePackageBtn:SetActive(isOpen_upgrade) + -- local isOpen_upgrade = OperatingManager.IsBaseOpen(GoodsTypeDef.UpgradePackage) + -- this.upGradePackageBtn:SetActive(isOpen_upgrade) end --后台推送 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 11e934dd64..1419d7ae74 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -18,6 +18,8 @@ local luxuryConfig = ConfigManager.GetConfig(ConfigName.LuxuryFundConfig) --后端数据 goodsId;//商品id buyTimes; //购买次数 startTime;//开始时间 endTime; //结束时间 dynamicBuyTimes; //可购买次数 local giftGoodsInfo +this.upGradePackagePanelType = 1 +this.upGradePackagePanelIndex = 1 --初始化 function this.Initialize() Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, function() diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index f951879bf5..12a653fb29 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -11,21 +11,25 @@ local curGiftList = {} local curGiftId = nil local curEndTime = 0 local curIndex +local curType local fun--回调 - +local rechargeData +local activityType = { +[1] = {name = "等级礼包",timePos = Vector3.New(0,-255.6,0),price = true,comp = "bg1",showType = 21}, +[2] = {name = "五星成长礼",timePos = Vector3.New(0,-567,0),price = false,comp = "bg2",showType = 8}, +} --初始化组件(用于子类重写) function this:InitComponent() this.btnClose = Util.GetGameObject(self.gameObject,"show/btnBack") this.btnBuy = Util.GetGameObject(self.gameObject,"show/Button") this.grid = Util.GetGameObject(self.gameObject,"show/rewards/Grid") this.endTime = Util.GetGameObject(self.gameObject,"show/endTime"):GetComponent("Text") - this.price = Util.GetGameObject(self.gameObject,"show/Button/Text"):GetComponent("Text") + this.price = Util.GetGameObject(self.gameObject,"show/price/Text1"):GetComponent("Text") this.arrowsLeft = Util.GetGameObject(self.gameObject,"show/arrows/left") this.arrowsRight = Util.GetGameObject(self.gameObject,"show/arrows/right") - this.UI_effect_DailyRechargePanel_particle = Util.GetGameObject(self.gameObject, "UI_effect_DailyRechargePanel_particle") - this.times = Util.GetGameObject(self.gameObject,"bg/timesLeft"):GetComponent("Text") - this.Text = Util.GetGameObject(self.gameObject,"bg/hero/Image/Text"):GetComponent("Text") - + this.UI_effect_DailyRechargePanel_particle = Util.GetGameObject(self.gameObject, "bg1/UI_effect_DailyRechargePanel_particle") + this.times = Util.GetGameObject(self.gameObject,"show/timesLeft"):GetComponent("Text") + this.tip = Util.GetGameObject(self.gameObject,"show/tip"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -41,49 +45,54 @@ function this:BindEvent() NetManager.RequestBuyGiftGoods(curGiftId, function() FirstRechargeManager.RefreshAccumRechargeValue(curGiftId) CheckRedPointStatus(RedPointType.GrowthPackage)--成长礼包的红点检测 - curGiftList[curIndex].dynamicBuyTimes = curGiftList[curIndex].dynamicBuyTimes - 1 + rechargeData.dynamicBuyTimes = rechargeData.dynamicBuyTimes - 1 --判断可购买次数是否为零,是剔除礼包信息 -- for i = 1, #curGiftList do - if curGiftList[curIndex].dynamicBuyTimes == 0 then - OperatingManager.SetHadBuyGoodsId({curGiftId}) - OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, curGiftId) - if curGiftList[curIndex-1] then - curIndex = curIndex -1 - -- LogBlue("QWEQWEQWEWQ") - -- elseif curGiftList[curIndex+1] then - -- curIndex = curIndex +1 - -- LogRed("ZXCZXCZX") - end - end - -- end - --判断是否有礼包 - self:GetInfoList() - if #curGiftList == 0 then - self:ClosePanel() - else - if curIndex then - self:Refresh(curIndex) - -- LogGreen("没换界面") - else - if not not curGiftList[curIndex-1] then - self:Refresh(curIndex-1) - -- LogRed("界面-1") - elseif not not curGiftList[curIndex+1] then - self:Refresh(curIndex+1) - -- LogBlue("界面+1") - end - end + if rechargeData.dynamicBuyTimes == 0 then + OperatingManager.SetHadBuyGoodsId({curGiftId}) + OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, curGiftId) end + -- end + this:Refresh() end) end end) Util.AddClick(this.arrowsLeft,function() - self:Refresh(curIndex-1) + curIndex = curIndex - 1 + if curGiftList[curType][curIndex] then + else + curType = curType == 1 and (LengthOfTable(activityType)) or (curType - 1) + for i = curType,1,-1 do + if curGiftList[i] and #curGiftList[i] > 0 then + curType = i + curIndex = #curGiftList[i] + break + end + end + + end + OperatingManager.upGradePackagePanelType = curType + OperatingManager.upGradePackagePanelIndex = curIndex + this:Refresh() end) Util.AddClick(this.arrowsRight,function() - self:Refresh(curIndex+1) + curIndex = curIndex + 1 + if curGiftList[curType][curIndex] then + else + curType = curType == (LengthOfTable(activityType)) and 1 or (curType + 1) + for i = curType,(LengthOfTable(activityType)) do + if curGiftList[i] and #curGiftList[i] > 0 then + curType = i + curIndex = 1 + break + end + end + end + OperatingManager.upGradePackagePanelType = curType + OperatingManager.upGradePackagePanelIndex = curIndex + this:Refresh() end) end @@ -109,56 +118,88 @@ end --获取(自己拼凑)礼包数据 function this:GetInfoList() - -- body - local list={} local infoList = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift)--拿取所有类型5礼包信息(包含需要的礼包) - local infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",21) - for index, value in pairs(infoList) do - for i = 1, #infoList2 do - if infoList2[i].Id == value.goodsId then - table.insert(list,value) + local num = 0 + for k,v in pairs(activityType) do + curGiftList[k] = {} + local infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",v.showType) + for index, value in pairs(infoList) do + for i = 1, #infoList2 do + if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then + table.insert(curGiftList[k],value) + num = num + 1 + end end end end - curGiftList = list + return num end -function this:OnShow() - local index = 1 - this:Refresh(index) +function this:OnShow() + this:Refresh() end -function this:Refresh(index) - curIndex = index +function this:SetCurTypeAndIndex() + curType = OperatingManager.upGradePackagePanelType and OperatingManager.upGradePackagePanelType or 1 + curIndex = OperatingManager.upGradePackagePanelIndex and OperatingManager.upGradePackagePanelIndex or 1 + if curGiftList[curType] and #curGiftList[curType] > 0 and curGiftList[curType][curIndex] then + elseif curGiftList[curType] and #curGiftList[curType] > 0 and (not curGiftList[curType][curIndex]) then + curIndex = ##curGiftList[curType] + return curGiftList[curType][curIndex] + else + for k,v in pairs(curGiftList) do + for i = 1 ,#v do + curType = k + curIndex = i + return curGiftList[curType][curIndex] + end + end + end + return curGiftList[curType][curIndex] +end + +function this:Refresh() + local num = self:GetInfoList() + if num < 1 then + this:OnClose() + return + end + rechargeData = this:SetCurTypeAndIndex() + + for k,v in pairs(activityType) do + Util.GetGameObject(self.gameObject,v.comp):SetActive(false) + end + Util.GetGameObject(self.gameObject,activityType[curType].comp):SetActive(true) + rechargeNum= VipManager.GetChargedNum() - self:GetInfoList() - - this.Text.text = Language[12000]..PlayerManager.level..Language[12001] - this.arrowsLeft:SetActive(not not curGiftList[curIndex-1]) - this.arrowsRight:SetActive(not not curGiftList[curIndex+1]) - curGiftId = curGiftList[curIndex].goodsId - curEndTime = curGiftList[curIndex].endTime + this.tip.text = curType == 1 and Language[12000]..PlayerManager.level..Language[12001] or "" + this.arrowsLeft:SetActive(num > 1) + this.arrowsRight:SetActive(num > 1) + curGiftId = rechargeData.goodsId + curEndTime = rechargeData.endTime this.endTime.text = Language[11496]..TimeToHMS(curEndTime-GetTimeStamp()) - this:SetGfitShow() - this:SetTime() + this.endTime.gameObject:GetComponent("RectTransform").localPosition = activityType[curType].timePos + this:SetGfitShow(rechargeData) + this:SetTime(rechargeData) end --设置奖励 local _ItemViewList = {} -function this:SetGfitShow() +function this:SetGfitShow(rechargeData) for i=1, #RechargeConfig[curGiftId].RewardShow do if not _ItemViewList[i] then local view = SubUIManager.Open(SubUIConfig.ItemView,this.grid.transform) _ItemViewList[i] = view end - _ItemViewList[i]:OnOpen(false,RechargeConfig[curGiftId].RewardShow[i],1,false) + _ItemViewList[i]:OnOpen(false,RechargeConfig[curGiftId].RewardShow[i],0.95,false) _ItemViewList[i].gameObject:SetActive(true) end - this.times.text = Language[10535]..curGiftList[curIndex].dynamicBuyTimes..Language[10054] + this.times.text = Language[10535]..rechargeData.dynamicBuyTimes..Language[10054] + this.price.gameObject:SetActive(activityType[curType].price) this.price.text = RechargeConfig[curGiftId].Price..Language[10538] end ---设置剩余时间,取剩余时间最短的礼包(第一个礼包的剩余时间) +--设置剩余时间,取剩余时间最短的礼包 function this:SetTime() if self.localTimer then self.localTimer:Stop() @@ -169,23 +210,7 @@ function this:SetTime() --时间到了之后 if curEndTime-GetTimeStamp() < 0 then OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, curGiftId) - if curGiftList[curIndex-1] then - curIndex = curIndex -1 - end - self:GetInfoList() - if #curGiftList == 0 then - self:ClosePanel() - else - if curIndex then - self:Refresh(curIndex) - else - if not not curGiftList[curIndex-1] then - self:Refresh(curIndex-1) - elseif not not curGiftList[curIndex+1] then - self:Refresh(curIndex+1) - end - end - end + this:Refresh() end this.endTime.text = Language[11496]..TimeToHMS(curEndTime-GetTimeStamp()) end,1,-1,true)