diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/HHBJPage.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/HHBJPage.prefab index 2b6385bac6..7ea892ff04 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/HHBJPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/HHBJPage.prefab @@ -1143,7 +1143,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0.000014982481, y: 0.59998703} + m_AnchoredPosition: {x: 0, y: 0.59998703} m_SizeDelta: {x: 0, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8424828896027908826 @@ -1763,7 +1763,7 @@ 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: 66.2, y: 15.5} + m_AnchoredPosition: {x: 92, y: 15} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6363572065507613972 @@ -2056,7 +2056,7 @@ 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: 66.2, y: 15.5} + m_AnchoredPosition: {x: 92, y: 15} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9124255323867939329 @@ -2131,7 +2131,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0.000014982481, y: 0.59998703} + m_AnchoredPosition: {x: 0, y: 0.59998703} m_SizeDelta: {x: 0, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4868416624607317618 @@ -2449,7 +2449,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0.000014982481, y: 0.59998703} + m_AnchoredPosition: {x: 0, y: 0.59998703} m_SizeDelta: {x: 0, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &916042378011477119 @@ -2736,7 +2736,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0.000014982481, y: -0.089157104} + m_AnchoredPosition: {x: 0, y: -0.089157104} m_SizeDelta: {x: 0, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8287813546707274976 @@ -3373,7 +3373,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0.000014982481, y: -0.089157104} + m_AnchoredPosition: {x: 0, y: -0.089157104} m_SizeDelta: {x: 0, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1212275157775054389 @@ -3536,7 +3536,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0.000014982481, y: -0.089157104} + m_AnchoredPosition: {x: 0, y: -0.089157104} m_SizeDelta: {x: 0, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7118653099864451388 @@ -3619,7 +3619,7 @@ 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: 66.2, y: 15.5} + m_AnchoredPosition: {x: 92, y: 15} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5616189277857032224 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 04d26c1c4e..1c0792fd1e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1019,6 +1019,7 @@ RedPointType = { jijin128 = 78, jijin328 = 79, chaozhijijin = 80, + haoHuaBuJi = 81, --豪华补给 linglongBaojing = 671, TaiChuMiJuan = 670, diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 03889c9591..c05658084b 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -240,6 +240,18 @@ function this.CheckChapterRed() return chapterRed end +--检测豪华补给红点 +function this.CheckHHBJRedPoint() + local activityData=ActivityGiftManager.GetActivityInfoByType(10401) + if activityData and activityData.mission then + for i = 1, #activityData.mission do + if activityData.mission[i].state==1 then + return true + end + end + end + return false +end -------针对首充和累充,成长礼金----------- function this.GetActivityTypeInfo(type) local globalActConfigs = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.GlobalActivity, "Type", type) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index d7a1fbd979..d19f364857 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -654,7 +654,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.WeekCardOpen, WeekCardManager.CheckRedOpen) RPData:AddCheckFunc(RedPointType.WeekCardReward, WeekCardManager.CheckRedReward) RPData:AddCheckFunc(RedPointType.ZhongShenKa, ActivityGiftManager.CheckZhongShenKaRedPoint) - + RPData:AddCheckFunc(RedPointType.haoHuaBuJi, ActivityGiftManager.CheckHHBJRedPoint) RPData:AddCheckFunc(RedPointType.tailsmanSoul_gold,TailsManSoulManager.CheckRedData) RPData:AddCheckFunc(RedPointType.tailsmanSoul_red,TailsManSoulManager.CheckRedData) RPData:AddCheckFunc(RedPointType.tailsmanSoul_whiteGold,TailsManSoulManager.CheckRedData)