diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 41839cddf5..4c723f04c7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -91097,6 +91097,101 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &8566185936258289684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8184802073755172884} + - component: {fileID: 8950191985057241170} + - component: {fileID: 8622056184303375083} + - component: {fileID: 6196916221233851549} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8184802073755172884 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8566185936258289684} + 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: 9158673223480268760} + 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} + m_AnchoredPosition: {x: 105.1, y: 46.2} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8950191985057241170 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8566185936258289684} + m_CullTransparentMesh: 0 +--- !u!114 &8622056184303375083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8566185936258289684} + 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!114 &6196916221233851549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8566185936258289684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8597900428888542408 GameObject: m_ObjectHideFlags: 0 @@ -91592,6 +91687,7 @@ RectTransform: - {fileID: 1262562981263151929} - {fileID: 4728685466024744306} - {fileID: 8538207055964167903} + - {fileID: 8184802073755172884} m_Father: {fileID: 8935360825500051851} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index cfdf49f231..bae3417392 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1063,6 +1063,7 @@ RedPointType = { PowerRiceGool = 7101,--战力目标 FestevalRed = 9501, + EightLoginReward=9502,--八日登陆红点 zhognzhichengcheng = 10096, eastSeaFindGod = 98000, diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 714e45de27..c2bab3077c 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -597,6 +597,7 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.chaozhifanli6) CheckRedPointStatus(RedPointType.chaozhifanli30) CheckRedPointStatus(RedPointType.chaozhifanli) + CheckRedPointStatus(RedPointType.EightLoginReward) end function this.GetContinuityRechargeRedPoint() @@ -1455,6 +1456,19 @@ function this.TreasureStoreSeason2RedCheck() end return false end +--检测八日登陆红点 +function this.CheckLoginRewardRedPoint() + if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EightDayGift) then + local rewardData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.EightDayGift) + local curDay = math.ceil((CalculateSecondsNowTo_N_OClock(0) + GetTimeStamp() - PlayerManager.userCreateTime)/86400) + for i = 1, #rewardData.mission do + if rewardData.mission[i].state==0 and i<=curDay then + return true + end + end + end + return false +end function this.FestevalRedCheck() local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.qiandaohaoli) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 867558bc35..6311d7b47a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -560,7 +560,8 @@ end function this.RefreshOpenTips() local tips = FightPointPassManager.GetCurLevelTips() if tips then - this.OpenTips:SetActive(true) + ---不显示该提示 + this.OpenTips:SetActive(false) this.OpenTipsTxt.text = tips else this.OpenTips:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 89449757e8..c79fae070c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -88,6 +88,7 @@ function this:InitComponent() this.sgType=Util.GetGameObject(this.sgBtn,"sevenGift/type"):GetComponent("Text") this.sgName=Util.GetGameObject(this.sgBtn,"sevenGift/name"):GetComponent("Text") this.sgInfo=Util.GetGameObject(this.sgBtn,"sevenGift/info"):GetComponent("Text") + this.sgRedPoint=Util.GetGameObject(this.sgBtn,"sevenGift/redPoint") this.sgEffect={} for i = 1, 2 do this.sgEffect[i]=Util.GetGameObject(this.sgBtn,"sevenGift/effect/effect"..i) @@ -751,6 +752,7 @@ function this.BindRedPoint() BindRedPointObject(RedPointType.TaiChuMiJuan, this.taichumijuanRed) BindRedPointObject(RedPointType.ExploreFunc, this.btnExploreRed) BindRedPointObject(RedPointType.FestevalRed, this.FestevaBtnRed) + BindRedPointObject(RedPointType.EightLoginReward, this.sgRedPoint) end -- 绑定红点 function this.ClearRedPoint() @@ -778,6 +780,7 @@ function this.ClearRedPoint() ClearRedPointObject(RedPointType.TaiChuMiJuan, this.taichumijuanRed) ClearRedPointObject(RedPointType.ExploreFunc, this.btnExploreRed) ClearRedPointObject(RedPointType.FestevalRed, this.FestevaBtnRed) + ClearRedPointObject(RedPointType.EightLoginReward, this.sgRedPoint) end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 80dafb922f..f5abce7851 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -673,6 +673,7 @@ function this.RegisterRedCheckFunc() --家园 RPData:AddCheckFunc(RedPointType.HomeLand,HomeLandManager.CheckRedMain,FUNCTION_OPEN_TYPE.HOMELAND) RPData:AddCheckFunc(RedPointType.FestevalRed,ActivityGiftManager.FestevalRedCheck) + RPData:AddCheckFunc(RedPointType.EightLoginReward,ActivityGiftManager.CheckLoginRewardRedPoint) --超值基金 RPData:AddCheckFunc(RedPointType.jijin128,CommonActPageManager.ChaoZhiJiJin128Red) RPData:AddCheckFunc(RedPointType.jijin328,CommonActPageManager.ChaoZhiJiJin328Red)