From fa1f5a7c351ab7bc67c3588a72f3e6a2384501c2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 19 Aug 2020 22:03:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=94=E6=98=9F=E6=88=90=E9=95=BF=E7=A4=BC?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../q_qinlongmibao_jiesuozhenbao198(2).png | Bin 11585 -> 16406 bytes .../UpGradePackage/UpGradePackagePanel.prefab | 1069 +++++++++++++---- .../~Lua/Modules/Expert/PatFacePanel.lua | 3 +- .../~Lua/Modules/Main/MainPanel.lua | 33 +- .../Modules/Operating/OperatingManager.lua | 2 + .../UpGradePackage/UpGradePackagePanel.lua | 187 +-- 6 files changed, 982 insertions(+), 312 deletions(-) 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 598904230d8d0beb2213ec2ec5eb92284ff1932e..8f1eedf54d51ccd6b23d3cce20f74255756de21c 100644 GIT binary patch literal 16406 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 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)