From 7a1894e75e35bdf557a627919094eb4b64c296c1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 19 May 2021 10:56:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/NewActivity/CommonActPageManager.lua | 13 ++++++++++--- .../~Lua/Modules/Operating/MissionPre.lua | 2 -- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 4477339719..9ec68d4047 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -85,10 +85,16 @@ local TypeUpdateFunc = { this.GetExpertData(2,ActivityTypeDef.SecretBoxExper) end, [ActivityTypeDef.AccumulativeRechargeExper] = function ()---日累计充值 - this.GetExpertData(2,ActivityTypeDef.AccumulativeRechargeExper) + local curData = dataList[ActivityTypeDef.AccumulativeRechargeExper] + local configData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,curData.activityId) + if configData.ShowArt == FUNCTION_OPEN_TYPE.EXPERT then + this.GetExpertData(2,ActivityTypeDef.AccumulativeRechargeExper) + else + this.GetMissionData(2,ActivityTypeDef.AccumulativeRechargeExper) + end end, [ActivityTypeDef.UpLvAct] = function ()---日累计充值 - this.GetMissionData(2,ActivityTypeDef.UpLvAct) + this.GetExpertData(2,ActivityTypeDef.UpLvAct) end, [ActivityTypeDef.DynamicAct_recharge] = function ()---周累计充值 this.GetMissionData(1,ActivityTypeDef.DynamicAct_recharge) @@ -184,7 +190,7 @@ function this.GetMissionData(indexType,actType) else curData.rewards[i].progress = curData.value end - if actType == ActivityTypeDef.DynamicAct_recharge then + if actType == ActivityTypeDef.DynamicAct_recharge or actType == ActivityTypeDef.AccumulativeRechargeExper then curData.rewards[i].value = actRewardConfigs[j].Values[1][1] else curData.rewards[i].value = actRewardConfigs[j].Values[2][1] @@ -198,6 +204,7 @@ function this.GetMissionData(indexType,actType) curData.rewards[i].state = 1 end end + LogGreen("actRewardConfigs[j].Reward :"..#actRewardConfigs[j].Reward ) curData.rewards[i].shows = actRewardConfigs[j].Reward curData.rewards[i].jump = actRewardConfigs[j].Jump[1] end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index 97427e840c..d9a8f65280 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -134,7 +134,6 @@ function MissionPre:SetData(data,_parent,sortingOrder,actData,actConfig,func) for i = 1, #self.itemList do self.itemList[i].gameObject:SetActive(false) end - if self.data.shows then for i = 1, #self.data.shows do if not self.itemList[i] then self.itemList[i] = SubUIManager.Open(SubUIConfig.ItemView,self.grid.transform) @@ -143,7 +142,6 @@ function MissionPre:SetData(data,_parent,sortingOrder,actData,actConfig,func) self.itemList[i]:OnOpen(false, {self.data.shows[i][1],self.data.shows[i][2]}, 0.9,false,false,false,sortingOrder) self.itemList[i].gameObject:SetActive(true) end - end if self.func then self:SetIcon(self.data) else