diff --git a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab index c7f47afeae..7021524218 100644 --- a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab @@ -14190,6 +14190,124 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &736755683896815519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6132988501381339848} + - component: {fileID: 954880200981904347} + - component: {fileID: 9061200830683212480} + - component: {fileID: 2433455499709166498} + m_Layer: 5 + m_Name: item2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6132988501381339848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736755683896815519} + 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: 3229278172586863352} + m_Father: {fileID: 3023114428356180209} + 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: 415.52, y: 325} + m_SizeDelta: {x: 222, y: 206} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &954880200981904347 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736755683896815519} + m_CullTransparentMesh: 0 +--- !u!114 &9061200830683212480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736755683896815519} + 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: 0 + 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: 9088b739ea0832c4fa71dba800a3e431, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &2433455499709166498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736755683896815519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9061200830683212480} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &962275278345370046 GameObject: m_ObjectHideFlags: 0 @@ -14266,10 +14384,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6891459877915491670} - - {fileID: 1858337286414582230} - {fileID: 1232358333541977880} m_Father: {fileID: 2666603382833339960} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -23788,6 +23905,85 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &1448211917480372351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9034650359086929486} + - component: {fileID: 1681667490845531497} + - component: {fileID: 4579693082699034113} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9034650359086929486 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448211917480372351} + 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: 4654934871440973512} + 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.37, y: 0} + m_SizeDelta: {x: 222, y: 206} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1681667490845531497 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448211917480372351} + m_CullTransparentMesh: 0 +--- !u!114 &4579693082699034113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448211917480372351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.9686275, b: 0.6039216, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "18\u5143" --- !u!1 &1697672711186113089 GameObject: m_ObjectHideFlags: 0 @@ -23818,7 +24014,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2666603382833339960} - m_RootOrder: 5 + 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} @@ -38120,6 +38316,124 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &2573179371463540040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4654934871440973512} + - component: {fileID: 4990277690167765699} + - component: {fileID: 1162318548694227293} + - component: {fileID: 2301565823337577315} + m_Layer: 5 + m_Name: item1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4654934871440973512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2573179371463540040} + 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: 9034650359086929486} + m_Father: {fileID: 3023114428356180209} + 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: 305.45, y: 498.51} + m_SizeDelta: {x: 222, y: 206} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4990277690167765699 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2573179371463540040} + m_CullTransparentMesh: 0 +--- !u!114 &1162318548694227293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2573179371463540040} + 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: 0 + 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: 9088b739ea0832c4fa71dba800a3e431, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &2301565823337577315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2573179371463540040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1162318548694227293} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &2757836410088769565 GameObject: m_ObjectHideFlags: 0 @@ -47601,7 +47915,7 @@ RectTransform: - {fileID: 6502138893631067994} - {fileID: 7862660995487247169} m_Father: {fileID: 2666603382833339960} - 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} @@ -61939,6 +62253,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2573892075853270583} + - {fileID: 3023114428356180209} - {fileID: 7156617476580941738} - {fileID: 4810961925972088587} - {fileID: 2789809297807740180} @@ -62170,7 +62485,7 @@ RectTransform: m_Children: - {fileID: 6149224637021186986} m_Father: {fileID: 2666603382833339960} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -76309,6 +76624,203 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &4831222972237929333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2407384313343382181} + - component: {fileID: 3325029960965013219} + - component: {fileID: 2175155576228980258} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2407384313343382181 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4831222972237929333} + 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: 9024153887736843079} + 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.37, y: 0} + m_SizeDelta: {x: 222, y: 206} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3325029960965013219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4831222972237929333} + m_CullTransparentMesh: 0 +--- !u!114 &2175155576228980258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4831222972237929333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.9686275, b: 0.6039216, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "18\u5143" +--- !u!1 &4849518899953380729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9024153887736843079} + - component: {fileID: 4140525882464813160} + - component: {fileID: 6620741937810581630} + - component: {fileID: 5842960893086852275} + m_Layer: 5 + m_Name: item3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9024153887736843079 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4849518899953380729} + 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: 2407384313343382181} + m_Father: {fileID: 3023114428356180209} + 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: 400.7, y: 101.5} + m_SizeDelta: {x: 222, y: 206} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4140525882464813160 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4849518899953380729} + m_CullTransparentMesh: 0 +--- !u!114 &6620741937810581630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4849518899953380729} + 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: 0 + 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: 9088b739ea0832c4fa71dba800a3e431, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &5842960893086852275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4849518899953380729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6620741937810581630} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5099411074429555244 GameObject: m_ObjectHideFlags: 0 @@ -76420,6 +76932,85 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5732843633504799538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3229278172586863352} + - component: {fileID: 4861832340460097991} + - component: {fileID: 235229909648453473} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3229278172586863352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732843633504799538} + 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: 6132988501381339848} + 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.37, y: 0} + m_SizeDelta: {x: 222, y: 206} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4861832340460097991 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732843633504799538} + m_CullTransparentMesh: 0 +--- !u!114 &235229909648453473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732843633504799538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.9686275, b: 0.6039216, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "18\u5143" --- !u!1 &6022121919775825136 GameObject: m_ObjectHideFlags: 0 @@ -81314,7 +81905,7 @@ RectTransform: m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: [] m_Father: {fileID: 4810961925972088587} - m_RootOrder: 2 + 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} @@ -81374,6 +81965,7 @@ GameObject: - component: {fileID: 2573892075853270583} - component: {fileID: 9197128890400917667} - component: {fileID: 3487050828821664397} + - component: {fileID: 7514056343717522629} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -81439,6 +82031,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &7514056343717522629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6530875567309028468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3487050828821664397} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &6689904928662305650 GameObject: m_ObjectHideFlags: 0 @@ -81639,80 +82273,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6BCF\n\u65E5\n\u9650\n\u8D2D\n1\n\u6B21" LanguageIndex: 0 ---- !u!1 &6865133760093087843 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1858337286414582230} - - component: {fileID: 8392695639743829547} - - component: {fileID: 214811510772124694} - m_Layer: 5 - m_Name: dollar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1858337286414582230 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6865133760093087843} - m_LocalRotation: {x: 0, y: 0, z: -0.08715578, w: 0.9961947} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} - m_Children: [] - m_Father: {fileID: 4810961925972088587} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -10} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 163, y: 10} - m_SizeDelta: {x: 46, y: 46} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8392695639743829547 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6865133760093087843} - m_CullTransparentMesh: 0 ---- !u!114 &214811510772124694 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6865133760093087843} - 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: 0 - 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: 8433faecc652d374ab2a8398d559dfcb, 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 &6879166851826757275 GameObject: m_ObjectHideFlags: 0 @@ -86464,7 +87024,7 @@ RectTransform: - {fileID: 3149415096394959693} - {fileID: 5816537070531068682} m_Father: {fileID: 2666603382833339960} - m_RootOrder: 3 + 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} @@ -86516,6 +87076,44 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &8555858095907169212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3023114428356180209} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3023114428356180209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8555858095907169212} + 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: 4654934871440973512} + - {fileID: 6132988501381339848} + - {fileID: 9024153887736843079} + m_Father: {fileID: 2666603382833339960} + 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: 4.2, y: -272.9} + m_SizeDelta: {x: 1080.9, y: 1919.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9041563016891532642 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab index 8a423bf522..261e796ae4 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab @@ -4948,6 +4948,7 @@ GameObject: - component: {fileID: 6994395264985701369} - component: {fileID: 4890792805904739620} - component: {fileID: 1166191618764414646} + - component: {fileID: 1522478114482535362} m_Layer: 5 m_Name: store m_TagString: Untagged @@ -5012,6 +5013,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &1522478114482535362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1511636045497201153} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1166191618764414646} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &3354018833361181709 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua index 862a39be84..601cbf58d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua @@ -7,7 +7,6 @@ DailyRechargeManager = {} local this = DailyRechargeManager -local rechargeState = false local rechargeValue = 0 function this.Initialize() @@ -17,13 +16,9 @@ end function this.InitRechargeStatus() local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) - if dailyActInfo and dailyActInfo.mission[1] then - rechargeState = dailyActInfo.mission[1].state + if dailyActInfo then rechargeValue = dailyActInfo.value - Log("rechargeValue "..rechargeValue) - if rechargeState == 0 then - CheckRedPointStatus(RedPointType.DailyRecharge) - end + CheckRedPointStatus(RedPointType.DailyRecharge) end end @@ -33,21 +28,26 @@ end --1已领取0未完成 function this.GetRechargeState() - return rechargeState == 1 -end - -function this.SetRechargeState(value) - rechargeState = value -end - -function this.ReceivedEnabled() local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) - if dailyActInfo and dailyActInfo.mission[1] then - local actRewardConfig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, dailyActInfo.mission[1].missionId) - return dailyActInfo.value >= actRewardConfig.Values[1][1] - else - return false + if dailyActInfo then + for i = 1,#dailyActInfo.mission do + if dailyActInfo.mission[i].state == 0 then + return false + end + end end + return true +end + +function this.ReceivedEnabled(missionId) + local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) + local actRewardConfig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, missionId) + for i = 1,#dailyActInfo.mission do + if missionId == dailyActInfo.mission[i].missionId then + return dailyActInfo.value >= actRewardConfig.Values[1][1] + end + end + return false end function this.DailyRechargeReset() @@ -64,7 +64,7 @@ end function this.GetDailyRechargeExist() local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) - if this.GetRechargeState() or not dailyActInfo or not dailyActInfo.mission[1] then + if this.GetRechargeState() or not dailyActInfo or #dailyActInfo.mission < 1 then return false end return true diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index 9841906c12..573832b493 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -1,15 +1,7 @@ ---[[ - * @ClassName DailyRechargePanel - * @Description 每日首充 - * @Date 2019/8/1 19:28 - * @Author MagicianJoker, fengliudianshao@outlook.com - * @Copyright Copyright (c) 2019, MagicianJoker ---]] ----@class DailyRechargePanel -local DailyRechargePanel = quick_class("DailyRechargePanel", BasePanel) - +local DailyRechargePanel = quick_class("DailyRechargePanel", BasePanel) +local actRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) local kMaxReward = 4 - +local index = 0 local rechargeBgDef = { [1] = "r_mrcz_zi_1_zh", [2] = "r_mrcz_zi_2_zh", @@ -21,42 +13,39 @@ local cursortingOrder local isFirstOpen = false function DailyRechargePanel:InitComponent() cursortingOrder = 0 + self.backBtn = Util.GetGameObject(self.transform, "frame") - self.extraIcon = Util.GetGameObject(self.transform,"frame/bg/descbg/extraIcon"):GetComponent("Image") - self.desc = Util.GetGameObject(self.transform, "frame/bg/descbg/value"):GetComponent("Text") + self.grid = Util.GetGameObject(self.transform, "grid") + self.items = {} + for i = 1,#self.grid.transform.childCout do + self.items[i] = {} + self.items[i].go = Util.GetGameObject(self.grid,"item"..i) + self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Text") + end + + self.titleParent = Util.GetGameObject(self.backBtn, "bg/Image") + self.titleIcon = Util.GetGameObject(self.titleParent, "Image"):GetComponent("Image") + self.titleText = Util.GetGameObject(self.titleParent, "Text"):GetComponent("Text") + + self.extra = Util.GetGameObject(self.backBtn,"bg/descbg") + self.extraIcon = Util.GetGameObject(self.extra,"extraIcon"):GetComponent("Image") + self.desc = Util.GetGameObject(self.extra,"value"):GetComponent("Text") self.desc.text = "" - self.dollar = Util.GetGameObject(self.transform,"frame/bg/descbg/dollar") - self.dollar:SetActive(false) self.rewardContent = {} self.rewardContentEffect = {} self.rewardList = {} for i = 1, kMaxReward do - self.rewardContent[i] = Util.GetGameObject(self.transform, "frame/bg/rewardContent/itemPos_" .. i) + self.rewardContent[i] = Util.GetGameObject(self.backBtn, "bg/rewardContent/itemPos_" .. i) self.rewardContentEffect[i] = Util.GetGameObject(self.rewardContent[i], "Kuang") effectAdapte(self.rewardContentEffect[i]) self.rewardList[i] = SubUIManager.Open(SubUIConfig.ItemView, self.rewardContent[i].transform) end - if not self.moneyNum then - local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) - local actRewardConfig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, dailyActInfo.mission[1].missionId) - self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, Util.GetGameObject(self.transform,"frame/bg/descbg").transform, - actRewardConfig.Values[1][1], MoneyNumViewType.Image_Horizontal, "LevelFont", 42, 1, Vector2.New(60, 100), Vector2.New(20, 0), MoneyNumViewImageType.Big_1) - end - self.moneyNum:SetOffsetPosition(Vector2.New(480, -90)) - self.moneyNum:SetOffsetRotation(Vector3.New(0, 0, -10)) - self.moneyNum.transform:SetSiblingIndex(2) - - - self.dealBtn = Util.GetGameObject(self.transform, "frame/bg/dealBtn") + self.dealBtn = Util.GetGameObject(self.backBtn,"bg/dealBtn") self.dealText = Util.GetGameObject(self.dealBtn, "Text"):GetComponent("Text") self.UI_effect_DailyRechargePanel_particle = Util.GetGameObject(self.transform, "frame/UI_effect_DailyRechargePanel_particle") - local parent = Util.GetGameObject(self.transform, "frame/bg/Image") - local titleText = Util.GetGameObject(parent, "Text"):GetComponent("Text") - titleText.text = Language[12109] - SetTextVerTial(titleText,Vector3.New(102.07,18.2,0)) end function DailyRechargePanel:BindEvent() @@ -70,19 +59,29 @@ function DailyRechargePanel:BindEvent() self:OnDealBtnClicked() end end) + + for i = 1, #self.items do + Util.AddClick(self.items[i], function() + if i ~= index then + index = i + self:RefreshPanel() + end + end) + end end function DailyRechargePanel:OnOpen() isFirstOpen = true - self:RefreshPanel() Timer.New(function () isFirstOpen = false end, 1.5):Start() end - -function DailyRechargePanel:OnShow() +function DailyRechargePanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, self.RefreshPanel, self) end +function DailyRechargePanel:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, self.RefreshPanel, self) +end function DailyRechargePanel:OnSortingOrderChange() Util.AddParticleSortLayer( self.UI_effect_DailyRechargePanel_particle, self.sortingOrder - cursortingOrder) for i = 1, #self.rewardContentEffect do @@ -90,38 +89,67 @@ function DailyRechargePanel:OnSortingOrderChange() end cursortingOrder = self.sortingOrder end -function DailyRechargePanel:OnClose() - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, self.RefreshPanel, self) +function DailyRechargePanel:OnShow() + self.actInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) + if not self.actInfo then + return + end + self.activityId = self.actInfo.activityId + if #self.actInfo.mission > 1 then + self.grid.gameObject:SetActive(true) + else + self.grid.gameObject:SetActive(false) + end + self:SetGrid() + self:RefreshPanel() end +function DailyRechargePanel:SetGrid() + for i = 1, math.max(#self.actInfo.mission,#self.items) do + if not self.items[i] then + return + end + if not self.actInfo.mission[i] then + self.items[i].go.gameObject:SetActive(false) + else + self.items[i].go.gameObject:SetActive(true) + self.items[i].priceText.text = MoneyUtil.GetMoneyUnitNameWithMoney(actRewardConfig[self.actInfo.mission[i].missionId].Values[1][1]) + end + end + for i = 1,#self.actInfo.mission do + if self.actInfo.mission[i].state == 0 then + index = i + break + end + end + if index == 0 then + index = #self.actInfo.mission + end +end + +function DailyRechargePanel:OnClose() + index = 0 +end + function DailyRechargePanel:OnDestroy() if self.moneyNum then SubUIManager.Close(self.moneyNum) self.moneyNum = nil end + index = 0 end function DailyRechargePanel:RefreshPanel() - local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) - self.activityId = dailyActInfo.activityId - self.missionInfo = dailyActInfo.mission[1] - local actRewardConfig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, self.missionInfo.missionId) + self.missionInfo = self.actInfo.mission[index] + local actRewardConfig1 = actRewardConfig[self.missionInfo.missionId] if self.missionInfo.state == 0 then - if DailyRechargeManager.GetRechargeValue()==0 then + if DailyRechargeManager.ReceivedEnabled() then + self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[3]) + self.dealText.text = Language[10018] + self.moneyNum.gameObject:SetActive(false) + else self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) self.dealText.text = Language[10420] self.moneyNum.gameObject:SetActive(true) - else - if DailyRechargeManager.ReceivedEnabled() then - self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[3]) - self.dealText.text = Language[10018] - self.moneyNum.gameObject:SetActive(false) - else - self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) - -- local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue() - -- remainValue = remainValue < 0 and 0 or remainValue - self.dealText.text = Language[10420] - self.moneyNum.gameObject:SetActive(true) - end end else self.dealText.text = Language[10101] @@ -132,10 +160,26 @@ function DailyRechargePanel:RefreshPanel() table.walk(self.rewardContent, function(rewardPosItem) rewardPosItem:SetActive(false) end) - for i, rewardInfo in ipairs(actRewardConfig.Reward) do + for i, rewardInfo in ipairs(actRewardConfig1.Reward) do self.rewardList[i]:OnOpen(false, rewardInfo, 1.1) self.rewardContent[i]:SetActive(true) end + + self.titleText.text = Language[12109] + SetTextVerTial(self.titleText,Vector3.New(102.07,18.2,0)) + + if self.moneyNum then + SubUIManager.Close(self.moneyNum) + self.moneyNum = nil + end + if not self.moneyNum then + self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, self.extra.transform, + actRewardConfig1.Values[1][1], MoneyNumViewType.Image_Horizontal, "LevelFont", 42, 1, Vector2.New(60, 100), Vector2.New(20, 0), MoneyNumViewImageType.Big_1) + end + self.moneyNum:SetOffsetPosition(Vector2.New(480, -90)) + self.moneyNum:SetOffsetRotation(Vector3.New(0, 0, -10)) + self.moneyNum.transform:SetSiblingIndex(2) + end function DailyRechargePanel:OnDealBtnClicked() @@ -145,7 +189,6 @@ function DailyRechargePanel:OnDealBtnClicked() if DailyRechargeManager.ReceivedEnabled() then NetManager.GetActivityRewardRequest(self.missionInfo.missionId, self.activityId, function(_drop) UIManager.OpenPanel(UIName.RewardItemPopup, _drop, 1) - DailyRechargeManager.SetRechargeState(1) Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, { type = ActivityTypeDef.DailyRecharge, status = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 0974258dea..3d76692c93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -40,6 +40,7 @@ function EveryDayGift:InitComponent() self.store = Util.GetGameObject(self.extra, "store") self.UI_Effect_jinkuang_Yuan = Util.GetGameObject(self.store, "UI_Effect_jinkuang_Yuan") + Util.SetParticleSortLayer(self.UI_Effect_jinkuang_Yuan, 1) self.endTimeBg = Util.GetGameObject(self.bg,"tiao") self.endTime = Util.GetGameObject(self.endTimeBg,"time"):GetComponent("Text")