diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab index d7584eeb8b..0b169b9d45 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab @@ -5595,7 +5595,7 @@ ParticleSystem: --- !u!199 &6259170830804911733 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10489,7 +10489,7 @@ ParticleSystem: --- !u!199 &7663224388703278961 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16054,7 +16054,7 @@ ParticleSystem: --- !u!199 &8731954686797860230 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20963,7 +20963,7 @@ ParticleSystem: --- !u!199 &3108859455760721518 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26545,7 +26545,7 @@ ParticleSystem: --- !u!199 &4501522755537026555 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31270,7 +31270,7 @@ ParticleSystem: --- !u!199 &1393294577423373506 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36072,7 +36072,7 @@ ParticleSystem: --- !u!199 &8993958049925528917 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36629,7 +36629,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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 15} m_SizeDelta: {x: 179.70001, y: 180.70001} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8960745114152677758 @@ -36892,7 +36892,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: 4.8, y: 37.749943} + m_AnchoredPosition: {x: 4.8, y: 37.75001} m_SizeDelta: {x: 183.1, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6680648963269486201 @@ -41795,7 +41795,7 @@ ParticleSystem: --- !u!199 &6341223334757385390 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48068,7 +48068,7 @@ ParticleSystem: --- !u!199 &1364151743088453039 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52829,7 +52829,7 @@ ParticleSystem: --- !u!199 &8405279735407594183 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -57712,7 +57712,7 @@ ParticleSystem: --- !u!199 &1786108631160810919 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab index d1b93d2593..a85c37df43 100644 --- a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab @@ -5091,7 +5091,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -538, y: 19.585968} + m_AnchoredPosition: {x: -538, y: -156} m_SizeDelta: {x: 484, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2421783758546065711 @@ -10467,8 +10467,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -528} - m_SizeDelta: {x: 0, y: 678} + m_AnchoredPosition: {x: 0, y: -331.6} + m_SizeDelta: {x: 0, y: 1258.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1278418163100822379 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 20494d69bb..fde2785360 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -868,7 +868,7 @@ RedPointType = { Expert_EnergyExper = -1,--体力达人 Expert_Talisman= 3137,--法宝达人 Expert_SoulPrint= 3138,--魂印达人 - Expert_AccumulativeRecharge= -1,--累计充值 + Expert_AccumulativeRecharge= 1999,--累计充值 Expert_FindTreasure= 3146,--寻宝达人 Expert_LuckyTurn= 3147,--探宝达人 Expert_Recruit= 3148,--征募达人 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 4ce9fe7e0f..85b5995279 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -850,7 +850,17 @@ function this.DemonSlayerNewRedCheck() end return false end - +function this.LeiChongYouLiRedCheck() + local data = this.GetData(ActivityTypeDef.DynamicAct_recharge) + if data then + for i = 1, #data.rewards do + if data.rewards[i].state == 1 then + return true + end + end + end + return false +end -- 判断是否有连续充值的礼包 function this.HasContinueGift(linkActId) local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ContinueGift) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index d68e7cb2bf..80dafb922f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -223,7 +223,7 @@ function this.InitRedPointAllRelate() -- RPData:SetParent(RedPointType.Expert_GoldExper, RedPointType.Expert) -- RPData:SetParent(RedPointType.Expert_FightExper, RedPointType.Expert) --RPData:SetParent(RedPointType.Expert_EnergyExper, RedPointType.Expert) - -- RPData:SetParent(RedPointType.Expert_AccumulativeRecharge, RedPointType.Expert) + --RPData:SetParent(RedPointType.Expert_AccumulativeRecharge, RedPointType.Expert) -- RPData:SetParent(RedPointType.Expert_Talisman, RedPointType.Expert) -- RPData:SetParent(RedPointType.Expert_SoulPrint, RedPointType.Expert) --RPData:SetParent(RedPointType.LuckyCat, RedPointType.Expert) @@ -465,7 +465,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.zhognzhichengcheng, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_FightExper, ActivityGiftManager.ExpterActivityIsShowRedPoint) --RPData:AddCheckFunc(RedPointType.Expert_EnergyExper, ActivityGiftManager.ExpterActivityIsShowRedPoint) - --RPData:AddCheckFunc(RedPointType.Expert_AccumulativeRecharge, ActivityGiftManager.ExpterActivityIsShowRedPoint) + RPData:AddCheckFunc(RedPointType.Expert_AccumulativeRecharge,CommonActPageManager.LeiChongYouLiRedCheck) RPData:AddCheckFunc(RedPointType.Expert_FindTreasure, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_LuckyTurn, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_Recruit, ActivityGiftManager.ExpterActivityIsShowRedPoint) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 38749e1a6b..80ded6c739 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -28,6 +28,8 @@ function RecruitPanelNew:InitComponent() self.boxIcon = Util.GetGameObject(self.rewardBox, "boxIcon") self.slider = Util.GetGameObject(self.rewardBox,"Bg/Slider"):GetComponent("Image") self.sliderText = Util.GetGameObject(self.rewardBox, "progress/Text"):GetComponent("Text") + self.boxNameText = Util.GetGameObject(self.rewardBox, "di/Text"):GetComponent("Text") + self.boxNameText.text="传说任选箱" self.boxBtn=Util.GetGameObject(self.rewardBox,"Btn") self.UI_effect_RecruitPanel_box_normal = Util.GetGameObject(self.rewardBox,"UI_effect_RecruitPanel_box_normal") effectAdapte(Util.GetGameObject(self.UI_effect_RecruitPanel_box_normal, "quan01"))