From c091c55bef4eb16293904e97c334172902814592 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 19 Oct 2021 11:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1010437=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=BC=80=E6=9C=8D=E7=8E=89=E5=B8=9D?= =?UTF-8?q?=E5=BE=A1=E5=89=91=E5=9D=90=E9=AA=91=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/SupremeHeroPopup.prefab | 508 ++++++++++++++++-- .../ActivityGift/ActivityGiftManager.lua | 122 ++--- .../~Lua/Modules/Main/MainPanel.lua | 13 +- .../Popup/RewardItemSingleShowPopup.lua | 6 +- .../~Lua/Modules/Popup/SupremeHeroPopup.lua | 322 ++++++----- 5 files changed, 696 insertions(+), 275 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab index 82674b5ad4..59aecc9044 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab @@ -110127,7 +110127,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -110488,7 +110488,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -110854,7 +110854,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -111110,7 +111110,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -111184,7 +111184,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -111233,7 +111233,6 @@ RectTransform: - {fileID: 2866440957157781469} - {fileID: 1694038629151059246} - {fileID: 6967453100348782406} - - {fileID: 2123381437356778877} m_Father: {fileID: 6882643634657733322} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -111311,6 +111310,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1557128444060566458} + - {fileID: 1233162924249498424} m_Father: {fileID: 5401945702704876126} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -111619,6 +111619,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2943119036872382980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9099484241047461640} + - component: {fileID: 3075942225155369347} + - component: {fileID: 6980706190834286080} + m_Layer: 5 + m_Name: redPot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9099484241047461640 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2943119036872382980} + 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: 5927154711074985062} + 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: 61.400024, y: 19} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3075942225155369347 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2943119036872382980} + m_CullTransparentMesh: 0 +--- !u!114 &6980706190834286080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2943119036872382980} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &2952697752215239445 GameObject: m_ObjectHideFlags: 0 @@ -111678,7 +111752,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -111752,7 +111826,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -111828,7 +111902,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -111843,6 +111917,123 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3099516747955952726 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423786620825678682} + - component: {fileID: 7809771545927433057} + - component: {fileID: 5928362371111477595} + - component: {fileID: 5649838752151656182} + m_Layer: 5 + m_Name: lingxiaobaojian + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1423786620825678682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3099516747955952726} + 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: 4878749898380413223} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -195, y: 191} + m_SizeDelta: {x: 390, y: 140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7809771545927433057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3099516747955952726} + m_CullTransparentMesh: 0 +--- !u!114 &5928362371111477595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3099516747955952726} + 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: 66b98230675802e41afc5c78b43d09d2, 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 &5649838752151656182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3099516747955952726} + 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: 5928362371111477595} + 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 &3216411041533252699 GameObject: m_ObjectHideFlags: 0 @@ -112043,7 +112234,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -112388,6 +112579,8 @@ RectTransform: - {fileID: 3061817213645990886} - {fileID: 5340822025078538718} - {fileID: 6882643634657733322} + - {fileID: 1485635558825404010} + - {fileID: 1423786620825678682} m_Father: {fileID: 1593966968479717942} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -112628,7 +112821,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u524D\u5F80\u5B8C\u6210" + m_Text: "\u9886 \u53D6" LanguageIndex: 0 --- !u!1 &4338257061630322715 GameObject: @@ -112809,16 +113002,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4390960374646630457} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 7587722306364218479} - m_RootOrder: 5 + m_Father: {fileID: 2866440957157781469} + 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: 60, y: -120} + m_AnchoredPosition: {x: 61.400024, y: 19} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &791236077759547715 @@ -113616,7 +113809,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -113751,6 +113944,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 876474840957966267} + - {fileID: 9099484241047461640} m_Father: {fileID: 3297505370134903317} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -114040,6 +114234,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5152043039182838789 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1233162924249498424} + - component: {fileID: 6379654371193228985} + - component: {fileID: 8160558465178089123} + m_Layer: 5 + m_Name: redPot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1233162924249498424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5152043039182838789} + 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: 3015432388728274371} + 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: 61.400024, y: 19} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6379654371193228985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5152043039182838789} + m_CullTransparentMesh: 0 +--- !u!114 &8160558465178089123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5152043039182838789} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &5339859305215338769 GameObject: m_ObjectHideFlags: 0 @@ -114178,7 +114446,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -114253,7 +114521,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -114346,7 +114614,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -114689,7 +114957,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9886 \u53D6" + m_Text: "\u9886 \u53D6" LanguageIndex: 0 --- !u!1 &6930476946847958737 GameObject: @@ -115111,7 +115379,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -115206,6 +115474,123 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u524D\u5F80\u5B8C\u6210\n" LanguageIndex: 0 +--- !u!1 &7779675472010025042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1485635558825404010} + - component: {fileID: 4142323571919997602} + - component: {fileID: 2140132831493258194} + - component: {fileID: 8287253786235025521} + m_Layer: 5 + m_Name: tianjingzunzhe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1485635558825404010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7779675472010025042} + 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: 4878749898380413223} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -184, y: 374.16992} + m_SizeDelta: {x: 368, y: 192} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4142323571919997602 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7779675472010025042} + m_CullTransparentMesh: 0 +--- !u!114 &2140132831493258194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7779675472010025042} + 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: dd7561a0b8056d34fb8c48e01a95d74a, 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 &8287253786235025521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7779675472010025042} + 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: 2140132831493258194} + 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 &7967099757077808832 GameObject: m_ObjectHideFlags: 0 @@ -115422,7 +115807,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u524D\u5F80\u5B8C\u6210" + m_Text: "\u9886 \u53D6" LanguageIndex: 0 --- !u!1 &8466498624368538195 GameObject: @@ -115717,7 +116102,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -115791,7 +116176,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -115918,6 +116303,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 774565869980011810} + - {fileID: 2123381437356778877} m_Father: {fileID: 7587722306364218479} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -116031,6 +116417,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5873460360470581336} m_Modifications: + - target: {fileID: 2246066405138788628, guid: f68c7948fcc4c8842bdd458fd850cee5, + type: 3} + propertyPath: m_Name + value: Fx_mat_UI_SupremeHeroPopup_daohen + objectReference: {fileID: 0} - target: {fileID: 2246066405138788631, guid: f68c7948fcc4c8842bdd458fd850cee5, type: 3} propertyPath: m_LocalPosition.x @@ -116086,26 +116477,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -90 objectReference: {fileID: 0} - - target: {fileID: 2246066405138788628, guid: f68c7948fcc4c8842bdd458fd850cee5, - type: 3} - propertyPath: m_Name - value: Fx_mat_UI_SupremeHeroPopup_daohen - objectReference: {fileID: 0} - target: {fileID: 2246066405138788625, guid: f68c7948fcc4c8842bdd458fd850cee5, type: 3} propertyPath: playOnAwake value: 0 objectReference: {fileID: 0} - - target: {fileID: 1751046536715397028, guid: f68c7948fcc4c8842bdd458fd850cee5, - type: 3} - propertyPath: startDelay.scalar - value: 3.6 - objectReference: {fileID: 0} - target: {fileID: 1751046537352560548, guid: f68c7948fcc4c8842bdd458fd850cee5, type: 3} propertyPath: startDelay.scalar value: 3.8 objectReference: {fileID: 0} + - target: {fileID: 1751046536715397028, guid: f68c7948fcc4c8842bdd458fd850cee5, + type: 3} + propertyPath: startDelay.scalar + value: 3.6 + objectReference: {fileID: 0} - target: {fileID: 2246066404167258074, guid: f68c7948fcc4c8842bdd458fd850cee5, type: 3} propertyPath: startDelay.scalar @@ -116241,6 +116627,56 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 8110181955453511535, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181955976120910, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181955892696568, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181955939706480, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181956065433840, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181955708574677, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181955622187047, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181955638606376, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181955661055688, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8110181955854199919, guid: d75d2bae3fb655246b60289f479028e8, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d75d2bae3fb655246b60289f479028e8, type: 3} --- !u!224 &6481611044557373655 stripped @@ -116321,12 +116757,12 @@ PrefabInstance: propertyPath: prewarm value: 0 objectReference: {fileID: 0} - - target: {fileID: 7895911890321911326, guid: e0fd8bb4cccb3be4082b16dd55872274, + - target: {fileID: 7895911890870114803, guid: e0fd8bb4cccb3be4082b16dd55872274, type: 3} propertyPath: prewarm value: 0 objectReference: {fileID: 0} - - target: {fileID: 7895911890870114803, guid: e0fd8bb4cccb3be4082b16dd55872274, + - target: {fileID: 7895911890321911326, guid: e0fd8bb4cccb3be4082b16dd55872274, type: 3} propertyPath: prewarm value: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index d09614e732..6986c118c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -70,7 +70,6 @@ function this.TimeCountDown() --CheckRedPointStatus(RedPointType.SecretTer) Game.GlobalEvent:DispatchEvent(GameEvent.Adventure.OnRefreshRedShow) else - Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnlineState, this.haveOnlineTime, this.onlineData,this.onlineTime) end end @@ -178,6 +177,11 @@ function this.InitActivityServerData(msg, isUpdate) LuckyCatManager.GetRewardProgress(v.mission, v.activityId, v.value) end end + if (v.activityId == ActivityTypeDef.SupremeHero) then + for n, m in ipairs(v.mission) do + LogGreen("v.activityId:"..v.activityId.." m.missionId:"..m.missionId.." m.state:"..m.state) + end + end this.CheckActiveIsOpen(v) else LogError("服务器发送了前端不存在的活动ID:"..v.activityId) @@ -531,7 +535,7 @@ function this.RefreshActivityProgressData(msg) -- 检测 this.CheckMoneyProgress(msg.activityInfo) -- LogYellow("刷新活动数据activityId:" .. msg.activityInfo.activityId .. "value:" .. msg.activityInfo.value) - + if this.mission[msg.activityInfo.activityId] then this.mission[msg.activityInfo.activityId].value = msg.activityInfo.value for i = 1, #msg.activityInfo.mission do @@ -539,7 +543,7 @@ function this.RefreshActivityProgressData(msg) if missionInfo.missionId == msg.activityInfo.mission[i].missionId then missionInfo.state = msg.activityInfo.mission[i].state missionInfo.progress = msg.activityInfo.mission[i].progress - -- LogYellow(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress) + LogYellow(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress) end end end @@ -548,6 +552,7 @@ function this.RefreshActivityProgressData(msg) --断线重连时 在线奖励活动 数据刷新 this.CutUpLineUpdateOnLineData(msg) end + end function this.RefreshActivityRedPoint() @@ -586,6 +591,7 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.chaofanrushengRed) CheckRedPointStatus(RedPointType.jijin128) CheckRedPointStatus(RedPointType.jijin328) + CheckRedPointStatus(RedPointType.SupremeHero) end function this.GetContinuityRechargeRedPoint() @@ -948,65 +954,22 @@ function this.GetActivityDataById(id) end end - ----剑影仙踪相关--- ---获取剑影仙踪任务数据 -function this.GetTaskData() - local taskList={} - local taskValue=0 - - local data= this.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) - - if not data then - return 0, taskList - end - - table.sort(data.mission,function(a,b) - return a.missionId= 1 then - taskValue = taskValue + 1 - end - end - - return taskValue,taskList -end - --剑影仙踪红点检测 差一个通关完毕 符合要求的红点检测 点击领取红点未检测 function this.CheckSupremeHeroRedPoint() if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) then return end - local isOpen - local num,list= this.GetTaskData() - - local complete=0 --任务是否完成 - local receive=0 --任务是否领取 - for i = 1, #list do - if list[i]>0 then - complete=complete+1 + local actInfo = ActivityGiftManager.GetActivityInfoByType(ActivityTypeDef.SupremeHero) + local isGetBigReward = true + for k,v in ipairs(actInfo.mission) do + if v.state == 3 then + return true end - if list[i]==2 then - receive=receive+1 + if ActivityRewardConfig[v.missionId].Sort == 1 and v.state ~= 1 then + isGetBigReward = false end end - - if complete<3 then--任务未完成 - isOpen=PatFaceManager.isFirstLog==0 and not this.isFirstForSupremeHero - else - isOpen=receive<3 - end - - --第三个任务红点检测 - local state = false - local finishedNum, missionData = this.GetTaskData() - if missionData[3] == 3 then - state = true - end - return (isOpen or state) + return isGetBigReward end --获取活动结束时间 @@ -1037,18 +1000,6 @@ function this.GetTaskRemainTime(activityType) return remainTime end -function this.GetRewardState() - local taskValue,missionData= this.GetTaskData() - local doneNum = 0 - for i = 1, 3 do - if missionData[i] == 2 then - doneNum = doneNum + 1 - end - end - local state = doneNum == 3 and 3 or 2 - return state -end - ---------------- -- 获取下一个每日奖励的时间 function this.GetNextOnlineRewardData() @@ -1387,4 +1338,43 @@ function this.CheckRedpointUpperMonthCard(red) return false end +--返回 false 有未完成的任务 true 全部完成 +--indexType 页签 1,至尊降世 2御剑 isHaveBigReward 是否检测大奖有没有领取 +function this.CheckSupremeMission(indexType,isHaveBigReward) + local actInfo = ActivityGiftManager.GetActivityInfoByType(ActivityTypeDef.SupremeHero) + local isAllGet = true + if indexType == 1 then + for k,v in ipairs(actInfo.mission) do + if ActivityRewardConfig[v.missionId].Sort == indexType then + if isHaveBigReward then + if v.state ~= 2 then + return false + end + else + if v.state ~= 1 or v.state ~= 2 then + return false + end + end + end + end + else + for k,v in ipairs(actInfo.mission) do + if isHaveBigReward then + if ActivityRewardConfig[v.missionId].Sort ~= 1 then + if v.state ~= 1 then + return false + end + end + else + if ActivityRewardConfig[v.missionId].Sort == 2 then + if v.state ~= 1 then + return false + end + end + end + end + end + return isAllGet +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 385097fa9d..846cbb66b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1351,7 +1351,9 @@ function this.TimeFormat() local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if QingLong and QingLong > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then if v.ActiveType == 42 then - if ActivityGiftManager.GetRewardState(42)~=3 then + if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then + showTab = false + else local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero) if endTime - PlayerManager.serverTime > 0 then local time = endTime - PlayerManager.serverTime @@ -1363,9 +1365,6 @@ function this.TimeFormat() else showTab = false end - else - showTab = false - supremHadSet = true end elseif v.ActiveType == ActivityTypeDef.TreasureStore then local endTime = CalculateSecondsNowTo_N_OClock(24) @@ -1609,15 +1608,15 @@ function this.RefreshActivityShow() local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then if v.ActiveType == 42 then - if ActivityGiftManager.GetRewardState(42) ~= 3 then + if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then + showTab = false + else local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero) if endTime - PlayerManager.serverTime > 0 then showTab = true else showTab = false end - else - showTab = false end elseif v.FunType and v.FunType == 41 then showTab = DailyRechargeManager.GetDailyRechargeExist() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 775ee55fbd..8eaf451887 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -378,15 +378,15 @@ function RewardItemSingleShowPopup:OnShow() elseif JumpConfig[jumpDataList[i]].Type == JumpType.ZhiZunJiangShi then local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) if id and id > 0 then - if ActivityGiftManager.GetRewardState(42)~=3 then + if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then + isShow = false + else local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero) if endTime - PlayerManager.serverTime > 0 then isShow = true else isShow = false end - else - isShow = false end else isShow = false diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index c644c2274b..62f49fa38e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -10,13 +10,33 @@ local live2dResName = "" local heroId = 0 local heroData = {} local actIsOpen = false -local finishedNum = 0 local missionData = {} - +local actData = {} local idList = { - [1] = 30, - [2] = 31, - [3] = 32, + [1] = { + bigId = 0, + [1] = {id = 30, jumpevent = function() + JumpManager.GoJump(26082) + end,btnTip = Language[11530].."%s",isGet = false}, + [2] = {id = 31, jumpevent = function() + PopupTipPanel.ShowTip(Language[11531]) + end,btnTip = Language[11530].."%s",isGet = false}, + [3] = {id = 32, jumpevent = function() + JumpManager.GoJump(36005) + end,btnTip = Language[11530].."%s",isGet = true}, + }, + [2] = { + bigId = 36, + [1] = {id = 33, jumpevent = function() + JumpManager.GoJump(26082) + end,btnTip = Language[10317],isGet = true}, + [2] = {id = 34, jumpevent = function() + JumpManager.GoJump(26082) + end,btnTip = Language[10018],isGet = true}, + [3] = {id = 35, jumpevent = function() + JumpManager.GoJump(36011) + end,btnTip = Language[10101],isGet = true}, + }, } local orginLayer = 0 @@ -24,7 +44,7 @@ local orginLayer2 = 0 -- 界面是否可以关闭 local canClose = false - +local curPage = 0 ---剑影迷踪 --初始化组件(用于子类重写) function SupremeHeroPopup:InitComponent() @@ -43,23 +63,18 @@ function SupremeHeroPopup:InitComponent() this.clickName = Util.GetGameObject(this.clickNameParent, "Text"):GetComponent("Text") this.proImage = Util.GetGameObject(this.middle, "PreviewBtn/di/Image"):GetComponent("Image") - this.rewardTitle = {}--奖励要求 - this.rewardBtn = {}--奖励前往按钮 - this.doneImg = {} - this.iconGrid = {} - this.itemTitle = {} this.itemList = {} - this.btnGet={} + this.RewardList = {} for i = 1, 3 do - this.rewardTitle[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .."/Button/Text"):GetComponent("Text") - this.rewardBtn[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .."/Button") - this.iconGrid[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .."/frame") - this.doneImg[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .. "/doneImg") - this.btnGet[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .. "/BtnGet") - this.itemTitle[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .."/Image/Title"):GetComponent("Text") - if i == 3 then - this.redPot3 = Util.GetGameObject(this.middle, "Reward/Panel".. i .. "/redPot") - end + this.RewardList[i] = {} + this.RewardList[i].go = Util.GetGameObject(this.middle, "Reward/Panel".. i) + this.RewardList[i].title = Util.GetGameObject(this.RewardList[i].go, "Image/Title"):GetComponent("Text") + this.RewardList[i].Btn = Util.GetGameObject(this.RewardList[i].go, "Button") + this.RewardList[i].BtnTip = Util.GetGameObject(this.RewardList[i].Btn, "Text"):GetComponent("Text") + this.RewardList[i].btnGet = Util.GetGameObject(this.RewardList[i].go, "BtnGet") + this.RewardList[i].doneImg = Util.GetGameObject(this.RewardList[i].go, "doneImg") + this.RewardList[i].frame = Util.GetGameObject(this.RewardList[i].go, "frame") + this.RewardList[i].red = Util.GetGameObject(this.RewardList[i].btnGet, "redPot") end this.activityTime = Util.GetGameObject(self.gameObject, "Panel/Middle/freshTime"):GetComponent("Text")--活动时间 @@ -71,56 +86,32 @@ function SupremeHeroPopup:InitComponent() this.effectRoot4 = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_renwuchuxian") this.effectRoot5 = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_yunwusankai") this.effectRoot:SetActive(false) - --effectAdapte(Util.GetGameObject(this.effectRoot, "Partical")) - -- effectAdapte(Util.GetGameObject(this.effectRoot, "Particle (1)")) - -- effectAdapte(Util.GetGameObject(this.effectRoot, "saoguang")) - -- effectAdapte(Util.GetGameObject(this.effectRoot, "saoguang (2)")) - -- -- effectAdapte(Util.GetGameObject(this.effectRoot, "normal/kuang03/biankuang03")) - -- -- effectAdapte(Util.GetGameObject(this.effectRoot, "normal/kuang03/saoguang03")) - -- BindLightFlash(Util.GetGameObject(this.effectRoot, "saoguang"), Util.GetGameObject(this.middle, "sword/image (2)")) - - this.LoadLive2D() this.effectRoot:SetActive(true) + + this.LoadLive2D() + this.tianjingzunzhe = Util.GetGameObject(self.gameObject, "Panel/Middle/tianjingzunzhe") + this.lingxiaobaojian = Util.GetGameObject(self.gameObject, "Panel/Middle/lingxiaobaojian") end function SupremeHeroPopup:OnSortingOrderChange() local layer=self.sortingOrder - --orginLayer2 = layer Util.SetParticleSortLayer(this.effectRoot, layer) Util.SetParticleSortLayer(this.effectRoot2, layer) Util.SetParticleSortLayer(this.effectRoot3, layer) Util.SetParticleSortLayer(this.effectRoot4, layer) - Util.SetParticleSortLayer(this.effectRoot5, layer) - --orginLayer = layer - + Util.SetParticleSortLayer(this.effectRoot5, layer) end function this.LoadLive2D() - -- 加载一个立绘 - this.live2d = nil local liveId = ActivityGiftManager.GetActivityDataById(42).Drawing heroId = liveId or 10011 liveId = heroConfig[heroId].Live this.clickName.text = GetLanguageStrById(heroConfig[heroId].ReadingName) SetTextVerTial(this.clickName,Vector3.New(59,-10,0)) - this.tipText.text =Language[11530]..""..GetLanguageStrById(heroConfig[heroId].ReadingName).."" live2dResName = artResConfig[liveId].Name this.proImage.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName)) end --- 注册三个跳转事件 -local jumpEvnt = { - [1] = function() - JumpManager.GoJump(26082) - end, - [2] = function() - PopupTipPanel.ShowTip(Language[11531]) - end, - [3] = function () - JumpManager.GoJump(36005) - end, -} - --绑定事件(用于子类重写) function SupremeHeroPopup:BindEvent() --返回按钮 @@ -131,22 +122,19 @@ function SupremeHeroPopup:BindEvent() --完成按钮 Util.AddClick(this.doneBtn,function() if actIsOpen then - local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) - if this.GetRewardState() == 2 and data.mission[3].state == 1 then - NetManager.GetActivityRewardRequest(0, ActivityTypeDef.SupremeHero, function (drop) - UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1) - for i = 1, #missionData do - missionData[i] = 3 - end - Util.SetGray(this.doneBtn, true) - this.doneBtn:GetComponent("Button").enabled = false - this.btnText.text = Language[10101] - local time=PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",0) - if time~=666 then - PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",GetTimeStamp()) - Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnPlayerGetSuperManReward) - end - CheckRedPointStatus(RedPointType.SupremeHero) + local finishedNum,isGetBigReward = this.GetBtnState() + if finishedNum >= 3 and not isGetBigReward then + NetManager.GetActivityRewardRequest(idList[curPage].bigId, ActivityTypeDef.SupremeHero, function (drop) + UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function() + actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) + this.SetButtonState() + end) + local time=PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",0) + if time ~= 666 then + PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",GetTimeStamp()) + Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnPlayerGetSuperManReward) + end + CheckRedPointStatus(RedPointType.SupremeHero) end) end else @@ -157,20 +145,19 @@ function SupremeHeroPopup:BindEvent() Util.AddClick(this.previewBtn,function() UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroId, heroData.Star) end) - --各任务前往按钮 - for i = 1, #this.rewardBtn do - Util.AddClick(this.rewardBtn[i],function() - if this.GetMissionState(i) == 0 then - LogGreen("jfdksljfklsdjf") - jumpEvnt[i]() - Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear) - self:ClosePanel() - end - end) - end + Util.AddClick(this.click, function() UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroId, heroData.Star) end) + + Util.AddClick(this.tianjingzunzhe, function() + curPage = 1 + this.SetMissionData() + end) + Util.AddClick(this.lingxiaobaojian, function() + curPage = 2 + this.SetMissionData() + end) RedpotManager.BindObject(RedPointType.SupremeHero_mission3,this.redPot3) end @@ -194,7 +181,12 @@ function SupremeHeroPopup:OnOpen(_fun) end function SupremeHeroPopup:OnShow() - actIsDone = false + if ActivityGiftManager.CheckSupremeMission(1,true) then + curPage = 2 + else + curPage = 1 + end + this.InitShowPanel() end @@ -210,33 +202,12 @@ function this.InitShowPanel() end function this.InitShow() - ActivityGiftManager.isFirstForSupremeHero=true - CheckRedPointStatus(RedPointType.SupremeHero) - heroData = heroConfig[heroId] - -- 获取任务完成状态 - local total = 3 - finishedNum, missionData = ActivityGiftManager.GetTaskData() + ActivityGiftManager.isFirstForSupremeHero = true + --heroData = heroConfig[heroId] - this.SetMissionData() actIsOpen = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0 - local color = finishedNum < total and "#FF0000FF" or "#F4D98AFF" - this.taskProgress.text = string.format(" %s/3", color, finishedNum) - - local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) - Util.SetGray(this.doneBtn, (this.GetRewardState() ~= 2) or data.mission[3].state ~= 1) - this.doneBtn:GetComponent("Button").enabled = (this.IsMissionDone() and data.mission[3].state == 1) - local textList = { - [1] = Language[10317], - [2] = Language[10018], - [3] = Language[10101], - } - if (this.IsMissionDone() and data.mission[3].state ~= 1) then - this.btnText.text = textList[1] - else - this.btnText.text = textList[this.GetRewardState()] - end - -- 设置图标显示 - this.SetIconAndTitle() + actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) + this.SetMissionData() -- 开始倒计时 local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero) @@ -245,7 +216,7 @@ function this.InitShow() this.timer = Timer.New(function () local tempTime = endTime - PlayerManager.serverTime if tempTime > 0 then - if tempTime>= 86400 then + if tempTime >= 86400 then this.activityTime.text = TimeToDH(tempTime) else this.activityTime.text = TimeToHMS(tempTime) @@ -262,72 +233,100 @@ function this.InitShow() this.timer:Start() end -function this.SetIconAndTitle() - for i = 1, 3 do - local actData = activityConfig[idList[i]] - this.itemTitle[i].text = GetLanguageStrById(actData.ContentsShow) - if actData.ExtraParm == 0 then - Log(string.format("ActivityRewardConfig表中ID为%s对应的ExtraParm项数据为空", idList[i])) - Log("请检查表或者重新导表!") - return - end - - local itemId = actData.ExtraParm - - if not this.itemList[i] then - this.itemList[i] = SubUIManager.Open(SubUIConfig.ItemView, this.iconGrid[i].transform) - end - - this.itemList[i]:OnOpen(false, {itemId, 0}, 0.92) - - end -end - --- 活动是否完成 -function this.IsMissionDone() - return finishedNum == 3 -end - function this.SetMissionData() - local data= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) - for i = 1, 3 do - this.rewardBtn[i]:SetActive(this.GetMissionState(i) == 0) - this.doneImg[i]:SetActive(this.GetMissionState(i) == 1) - this.btnGet[i]:SetActive(false) - this.redPot3:SetActive(false) - if i == 3 then - this.btnGet[i]:SetActive(this.GetMissionState(i) == 3) - this.redPot3:SetActive(this.GetMissionState(i) == 3) - Util.AddOnceClick(this.btnGet[i],function() - NetManager.GetActivityRewardRequest(data.mission[i].missionId, data.activityId,function(drop) + for i = 1,#this.RewardList do + this.RewardList[i].go.gameObject:SetActive(false) + end + for j = 1,3 do + if this.RewardList[j] then + this.RewardList[j].go.gameObject:SetActive(true) + local dataConfig = activityConfig[idList[curPage][j].id] + this.RewardList[j].title.text = GetLanguageStrById(dataConfig.ContentsShow) + if dataConfig.ExtraParm == 0 then + Log(string.format("ActivityRewardConfig表中ID为%s对应的ExtraParm项数据为空", idList[curPage][j].id)) + Log("请检查表或者重新导表!") + return + end + local itemId = dataConfig.ExtraParm + if not this.itemList[j] then + this.itemList[j] = SubUIManager.Open(SubUIConfig.ItemView, this.RewardList[j].frame.transform) + end + this.itemList[j]:OnOpen(false, {itemId, 0}, 0.92) + + this.RefreshItemData(j,idList[curPage][j].id) + Util.AddOnceClick(this.RewardList[j].Btn,function() + idList[curPage][j].jumpevent() + Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear) + this:ClosePanel() + end) + + Util.AddOnceClick(this.RewardList[j].btnGet,function() + NetManager.GetActivityRewardRequest(idList[curPage][j].id, actData.activityId,function(drop) UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() - this.InitShow() + actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) + this.RefreshItemData(j,idList[curPage][j].id) + this.SetButtonState() end) end) end) end + end + if curPage == 1 then + this.tipText.text = string.format(idList[curPage][1].btnTip,GetLanguageStrById(heroConfig[heroId].ReadingName)) + else + this.tipText.text = activityConfig[idList[curPage].bigId].ContentsShow + end + + this.SetButtonState() +end +function this.RefreshItemData(index,missionId) + for i = 1,#actData.mission do + if actData.mission[i].missionId == missionId then + this.RewardList[index].Btn.gameObject:SetActive(actData.mission[i].state == 0) + this.RewardList[index].btnGet.gameObject:SetActive(actData.mission[i].state == 3) + this.RewardList[index].doneImg.gameObject:SetActive(actData.mission[i].state == 1 or actData.mission[i].state == 2) + end end end -function this.GetMissionState(index) - return missionData[index] +function this.SetButtonState() + local finishedNum,isGetBigReward = this.GetBtnState() + local total = 3 + local color = finishedNum < total and "#FF0000FF" or "#F4D98AFF" + this.taskProgress.text = string.format(" %s/3", color, finishedNum) + + Util.SetGray(this.doneBtn, (finishedNum < total) or isGetBigReward) + this.doneBtn:GetComponent("Button").enabled = (finishedNum >= total) and not isGetBigReward + + if finishedNum < total then + this.btnText.text = "未完成" + elseif isGetBigReward then + this.btnText.text = "已领取" + else + this.btnText.text = "领取" + end end -function this.GetRewardState() - if not this.IsMissionDone() then - return 1 - else - local doneNum = 0 - for i = 1, 3 do - if missionData[i] == 2 then - doneNum = doneNum + 1 +function this.GetBtnState() + local finishedNum = 0 + local isGetBigReward = true + for i = 1,#actData.mission do + if activityConfig[actData.mission[i].missionId].Sort == curPage then + if actData.mission[i].state == 1 or actData.mission[i].state == 2 then + finishedNum = finishedNum + 1 + end + if curPage == 1 then + if actData.mission[i].state ~= 2 then + isGetBigReward = false + end end end - - local state = doneNum == 3 and 3 or 2 - return state + if curPage == 2 and activityConfig[actData.mission[i].missionId].Sort == 3 then + isGetBigReward = (actData.mission[i].state == 1 or actData.mission[i].state == 2) and true or false + end end + return finishedNum,isGetBigReward end --界面关闭时调用(用于子类重写) @@ -342,25 +341,22 @@ function SupremeHeroPopup:OnClose() this.effectTime = nil end - if PlayerPrefs.GetInt(PlayerManager.uid .. "SUPREME") == 0 then - PlayerPrefs.SetInt(PlayerManager.uid .. "SUPREME", 1) - end if fun then fun() fun = nil end + curPage = 0 + for k,v in pairs(this.itemList) do + SubUIManager.Close(v) + end this.itemList = {} end --界面销毁时调用(用于子类重写) function SupremeHeroPopup:OnDestroy() this.spLoader:Destroy() - --if this.live2d then - -- poolManager:UnLoadLive(live2dResName, this.live2d) - -- this.live2d = nil - --end - + this.RewardList = {} end return SupremeHeroPopup \ No newline at end of file