diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab index 59aecc9044..f326360db4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab @@ -110869,6 +110869,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1615174983121935435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7538222833600628052} + - component: {fileID: 2172878947096378536} + - component: {fileID: 6101220070226323248} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7538222833600628052 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615174983121935435} + 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: 1485635558825404010} + 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: 115.5, y: 25.3} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2172878947096378536 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615174983121935435} + m_CullTransparentMesh: 0 +--- !u!114 &6101220070226323248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615174983121935435} + 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 &1858820963155881173 GameObject: m_ObjectHideFlags: 0 @@ -111619,6 +111693,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2610023573808954703 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3458161776330785400} + - component: {fileID: 6848536248214749317} + - component: {fileID: 241048448916022872} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3458161776330785400 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2610023573808954703} + 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: 1423786620825678682} + 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: 112.7, y: 15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6848536248214749317 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2610023573808954703} + m_CullTransparentMesh: 0 +--- !u!114 &241048448916022872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2610023573808954703} + 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 &2943119036872382980 GameObject: m_ObjectHideFlags: 0 @@ -111946,7 +112094,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 3458161776330785400} m_Father: {fileID: 4878749898380413223} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -115503,7 +115652,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 7538222833600628052} m_Father: {fileID: 4878749898380413223} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 6986c118c2..ada253cc12 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -177,11 +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 + -- 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) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index 62f49fa38e..9e1c87b3b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -90,7 +90,9 @@ function SupremeHeroPopup:InitComponent() this.LoadLive2D() this.tianjingzunzhe = Util.GetGameObject(self.gameObject, "Panel/Middle/tianjingzunzhe") + this.tianjingzunzheRed = Util.GetGameObject(this.tianjingzunzhe, "red") this.lingxiaobaojian = Util.GetGameObject(self.gameObject, "Panel/Middle/lingxiaobaojian") + this.lingxiaobaojianRed = Util.GetGameObject(this.lingxiaobaojian, "red") end function SupremeHeroPopup:OnSortingOrderChange() @@ -112,6 +114,33 @@ function this.LoadLive2D() this.proImage.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName)) end +function this.RefreshRedPoint(indexType) + local isShow = true + if indexType ~= 1 then + isShow = false + end + for k,v in ipairs(actData.mission) do + if indexType == 1 then + if activityConfig[v.missionId].Sort == indexType then + if v.state == 3 then + return true + end + if v.state == 2 or v.state == 0 then + isShow = false + end + end + else + if activityConfig[v.missionId].Sort ~= 1 then + if v.state == 3 then + return true + end + end + end + end + LogGreen("isShow:"..tostring(isShow) ) + return isShow +end + --绑定事件(用于子类重写) function SupremeHeroPopup:BindEvent() --返回按钮 @@ -135,6 +164,8 @@ function SupremeHeroPopup:BindEvent() Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnPlayerGetSuperManReward) end CheckRedPointStatus(RedPointType.SupremeHero) + this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(1)) + this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(2)) end) end else @@ -186,8 +217,9 @@ function SupremeHeroPopup:OnShow() else curPage = 1 end - this.InitShowPanel() + this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(1)) + this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(2)) end function this.InitShowPanel() @@ -266,6 +298,8 @@ function this.SetMissionData() actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) this.RefreshItemData(j,idList[curPage][j].id) this.SetButtonState() + this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(1)) + this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(2)) end) end) end)