From 16e5b894e3e98d7a1e3ba020e21428da872a9a2f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 10 May 2021 10:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=A9=E5=B0=8A=E9=99=8D=E4=B8=96?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=89=E4=B8=AA=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/SupremeHeroPopup.prefab | 77 ++++++++++++++++++- .../~Lua/Common/GlobalDefine.lua | 1 + .../ActivityGift/ActivityGiftManager.lua | 8 +- .../~Lua/Modules/Popup/SupremeHeroPopup.lua | 9 ++- 4 files changed, 91 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab index 92dcdfc0c6..82674b5ad4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab @@ -111233,6 +111233,7 @@ RectTransform: - {fileID: 2866440957157781469} - {fileID: 1694038629151059246} - {fileID: 6967453100348782406} + - {fileID: 2123381437356778877} m_Father: {fileID: 6882643634657733322} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -112783,6 +112784,80 @@ MonoBehaviour: m_LineSpacing: 0.94 m_Text: "\u7389\u7687\u5927\u5E1D" LanguageIndex: 0 +--- !u!1 &4390960374646630457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2123381437356778877} + - component: {fileID: 791236077759547715} + - component: {fileID: 7431224673380378147} + m_Layer: 5 + m_Name: redPot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2123381437356778877 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4390960374646630457} + 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_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_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &791236077759547715 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4390960374646630457} + m_CullTransparentMesh: 0 +--- !u!114 &7431224673380378147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4390960374646630457} + 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 &4537415796437960469 GameObject: m_ObjectHideFlags: 0 @@ -114614,7 +114689,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 &6930476946847958737 GameObject: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 7e468e897f..30b04703f5 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -694,6 +694,7 @@ RedPointType = { FirstRecharge = 233,--首充 SupremeHero=234,--剑影仙踪 + SupremeHero_mission3=2341,--剑影仙踪第三个奖励 LuckyTurn= 235,--幸运探宝 FindFairy=236,--东海寻仙 ---主界面按钮 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index bfad31755b..483ebe3af3 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -976,7 +976,13 @@ function this.CheckSupremeHeroRedPoint() isOpen=receive<3 end - return isOpen + --第三个任务红点检测 + local state = false + local finishedNum, missionData = this.GetTaskData() + if missionData[3] == 3 then + state = true + end + return (isOpen or state) end --获取活动结束时间 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index 71f468ba05..9789f505e8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -49,14 +49,16 @@ function SupremeHeroPopup:InitComponent() this.itemTitle = {} this.itemList = {} this.btnGet={} - for i = 1, 3 do + 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 end this.activityTime = Util.GetGameObject(self.gameObject, "Panel/Middle/freshTime"):GetComponent("Text")--活动时间 @@ -168,6 +170,7 @@ function SupremeHeroPopup:BindEvent() Util.AddClick(this.click, function() UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroId, heroData.Star) end) + RedpotManager.BindObject(RedPointType.SupremeHero_mission3,this.redPot3) end --添加事件监听(用于子类重写) @@ -287,8 +290,10 @@ function this.SetMissionData() 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) UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()