diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 37863630cb..5665bcb18a 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -33322,8 +33322,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 294.40002, y: -351.95496} - m_SizeDelta: {x: 1080, y: 192.67} + m_AnchoredPosition: {x: 294.40002, y: -42.7} + m_SizeDelta: {x: 1080, y: 51.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5897560853818070714 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 622b8433c8..e132e59b4b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1019,7 +1019,7 @@ ActivityTypeDef = { OpenSeverWelfare=55,--开服福利 EightDayGift = 56,--八日登陆 SignInfo = 57,--三日七日签到 - pozhenzhuxian_task = 2000,--破阵诛仙任务 + pozhenzhuxian_task = 20000,--破阵诛仙任务 pozhenzhuxian_recharge = 58,--破阵诛仙累充 } diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 78b558fa64..b8594bb329 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -725,12 +725,17 @@ this.TimeLimitedTimes = 0 this.allData = {} function this.InitPoZhenZhuXianData() local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task) - if not ActivityGiftManager.IsActivityTypeOpen(id) then + if (not id) or id == 0 then + return nil + end + if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.pozhenzhuxian_task) then return nil end this.allData = {} local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id) - local allMissionData = ActivityGiftManager.GetActivityTypeInfo(id).mission + LogBlue("#allListData:"..#allListData) + local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.pozhenzhuxian_task).mission + LogBlue("#allMissionData"..#allMissionData) for i=1,#allListData do for j=1,#allMissionData do if allListData[i].Id == allMissionData[j].missionId then diff --git a/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua index daba09aae9..30d5bb9a7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua @@ -104,9 +104,14 @@ function PrayMainPanel:BindEvent() end) Util.AddClick(self.extraRewardBtn, function() --累计奖励 - for i = 1, #PrayManager.extraRewardData do - local patyRewardData = PrayManager.extraRewardData[i] - this:ShowSingleExtraRewardData(false,extraRewardParentGrid[i],extraRewardItemGrid[i],patyRewardData) + for i = 1, 6 do + if i <= #PrayManager.extraRewardData then + extraRewardParentGrid[i]:SetActive(true) + local patyRewardData = PrayManager.extraRewardData[i] + this:ShowSingleExtraRewardData(false,extraRewardParentGrid[i],extraRewardItemGrid[i],patyRewardData) + else + extraRewardParentGrid[i]:SetActive(false) + end end self.extraRewardLayout:SetActive(true) end) @@ -385,7 +390,7 @@ end function PrayMainPanel:ShowSingleExtraRewardData(_isGet,_parentGo,_go,patyRewardData) local numText = Util.GetGameObject(_parentGo.transform, "numText/Text"):GetComponent("Text") local _reward = {patyRewardData.itemId,patyRewardData.num} - _go:OnOpen(_isGet,_reward,1) + _go:OnOpen(_isGet,_reward,0.9) numText.text = patyRewardData.extraRewardCount end --刷新按钮事件