diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index adf447c8a4..7a4dd187a6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -54966,7 +54966,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -101993,7 +101993,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -122258,12 +122258,12 @@ GameObject: - component: {fileID: 8372953808703828970} - component: {fileID: 4701517501157699323} m_Layer: 5 - m_Name: btn + m_Name: redPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &876998903884338440 RectTransform: m_ObjectHideFlags: 0 @@ -122280,8 +122280,8 @@ RectTransform: 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.3, y: 4.7} - m_SizeDelta: {x: 142, y: 141.8} + m_AnchoredPosition: {x: 45.3, y: 45.7} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8372953808703828970 CanvasRenderer: @@ -122304,14 +122304,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 + 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: 0} + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -122381,7 +122381,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f8a67cf17b..3439c66885 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -592,6 +592,7 @@ RedPointType = { LegendExplore = 118, --车迟斗法副本 EndLess = 119,--无尽副本 Trial = 121,--森罗幻境 + TrialReward = 1211,--森罗任务 -- 充值 Recharge = 120, diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index 39427ee27f..321611df69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -206,6 +206,20 @@ function this.GetTrialRewardState(id) return 1 end end +--任务红点检测 +function this.TrialRewardRedPointCheck() + local d={} + for _, configInfo in ConfigPairs(trialKillConfig) do + table.insert(d, configInfo) + end + for i = 1, #d do + local state = MapTrialManager.GetTrialRewardState(d[i].Id) + if state == 1 then + return true + end + end + return false +end --设置试练奖励信息 function this.SetTrialRewardInfo(v) @@ -222,6 +236,7 @@ end --设置试练已杀小怪数量 function this.SetKillCount(v) + CheckRedPointStatus(RedPointType.TrialReward) this.killCount=v end --获取已杀小怪数量 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index b3cf6b2abd..b87494f6fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -70,6 +70,9 @@ function TrialMapPanel:InitComponent(root, mapPanel) --boss召唤特效 this.bossEffect = Util.GetGameObject(root, "UI_effect_shilian_tab") this.energyRoot = Util.GetGameObject(root, "stepROot") + + this.rewardRedPoint = Util.GetGameObject(root,"leftCenter/btnReward/redPoint") + BindRedPointObject(RedPointType.TrialReward, this.rewardRedPoint) end @@ -461,6 +464,7 @@ function TrialMapPanel:OnClose() end function TrialMapPanel:OnDestroy() + ClearRedPointObject(RedPointType.TrialReward) SubUIManager.Close(this.upView) heroList={} end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index ef5437cef1..b9740984cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -107,6 +107,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane) RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane) + RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial) RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane) RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat) @@ -399,8 +400,10 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING) RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY) + --万象境副本 RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.Trial, MapTrialManager.TrialRedCheck) + RPData:AddCheckFunc(RedPointType.TrialReward, MapTrialManager.TrialRewardRedPointCheck) RPData:AddCheckFunc(RedPointType.EndLess, EndLessMapManager.EndlessRedCheck) RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 29eccafd9a..b7502cdc11 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -108,6 +108,7 @@ function this.SetScrollPre(root,data) mask:SetActive(true) getBtn:SetActive(false) this.RefreshPanel() + CheckRedPointStatus(RedPointType.TrialReward) end) end) end)