From 1b213010d9ed9dd8804b7794c768671754e9d6aa Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Wed, 17 Apr 2024 15:12:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E6=AD=A6=E6=B4=BB=E5=8A=A8=E7=BA=A2?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/FetterItemView/FetterItem.prefab | 8 +++---- .../~Lua/Common/GlobalDefine.lua | 1 + .../ActivityGift/ActivityGiftManager.lua | 21 +++++++++++++++++-- .../ActivityGift/AllActivityManager.lua | 1 + .../~Lua/Modules/Player/RedpotManager.lua | 1 + 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab b/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab index 20771c0731..df6aba619c 100644 --- a/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab @@ -111,10 +111,10 @@ RectTransform: m_Father: {fileID: 3409355027622770596} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 257.2, y: 0.7199402} - m_SizeDelta: {x: 377.6, y: 139.3} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 69.71994} + m_SizeDelta: {x: 377.59998, y: 139.3} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6869683397130100868 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 781bf346de..f80bd7dd73 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -910,6 +910,7 @@ RedPointType = { Expert_Slhj= 3170,--森罗幻境达人 Expert_YJLC= 3188,--妖晶累充 Expert_XJLC= 3189,--仙晶累充 + Expert_ZWHD= 12501,--专武活动 Expert_WeekCard= 3150,--周卡 Expert_YunYouMan = 3128,--云游商人 --战力排行 达标战力 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 8d4fee4a3e..87b1852503 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -257,6 +257,22 @@ function this.CheckHHBJRedPoint() return false end +--检测专武活动红点 +function this.CheckZWHDRedPoint() + + local activityData=ActivityGiftManager.GetActivityInfoByType(12501) + if activityData and activityData.mission then + for i = 1, #activityData.mission do + local config = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,activityData.mission[i].missionId) + if activityData.mission[i].state==0 and activityData.mission[i].progress>=config.Values[1][1] then + return true + end + end + end + return false +end + + --检测豪华补给红点 function this.CheckImGMRedPoint() local activityData=ActivityGiftManager.GetActivityInfoByType(10301) @@ -675,6 +691,7 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.Expert_Slhj) CheckRedPointStatus(RedPointType.Expert_YJLC) CheckRedPointStatus(RedPointType.Expert_XJLC) + CheckRedPointStatus(RedPointType.Expert_ZWHD) CheckRedPointStatus(RedPointType.zhognzhichengcheng) --战力排行 CheckRedPointStatus(RedPointType.WarPowerSort_Sort) @@ -762,10 +779,10 @@ end --检测限时活动红点 function this.ExpterActivityIsShowRedPoint(activeIndex) local activeType = 0 - ----LogGreen("activeIndex "..activeIndex) + LogGreen("activeIndex "..activeIndex) --注意 红点枚举id %100 就是按钮顺序 activeType = math.floor(activeIndex % 100) - ----LogGreen("activeType "..activeType) + LogGreen("activeType "..activeType) local expertRewardTabs = this.GetActivityTypeInfo(activeType) if not expertRewardTabs then local activityGroupConfig=ConfigManager.GetConfigDataByKey(ConfigName.ActivityGroups,"RpType",activeIndex) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua index 6205bb8885..3af78e95dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua @@ -150,6 +150,7 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.Expert_Slhj) CheckRedPointStatus(RedPointType.Expert_YJLC) CheckRedPointStatus(RedPointType.Expert_XJLC) + CheckRedPointStatus(RedPointType.Expert_ZWHD) --战力排行 CheckRedPointStatus(RedPointType.WarPowerSort_Sort) --东海寻仙 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 8eef6d96ff..154fe7644e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -494,6 +494,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expert_Slhj, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_YJLC, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_XJLC, ActivityGiftManager.ExpterActivityIsShowRedPoint) + RPData:AddCheckFunc(RedPointType.Expert_ZWHD, ActivityGiftManager.CheckZWHDRedPoint) RPData:AddCheckFunc(RedPointType.Expert_YunYouMan, ActivityGiftManager.CheckYunYouManRedPoint) -- RPData:AddCheckFunc(RedPointType.HERO_STAR_GIFT, OperatingManager.IsHeroStarGiftActive) --战力排行