From d3d363762bc0d09e8e607f5db6576e82087bd81c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 30 Mar 2021 16:55:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A6=8F=E6=98=9F=E9=AB=98=E7=85=A7?= =?UTF-8?q?=E3=80=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua | 8 ++++---- .../~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua index 489447d060..7add48d179 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua @@ -33,14 +33,14 @@ function this.UpdataRewardData() if not ActData then return end Data.activityId = ActData.activityId Data.ActState = ActData.value - LogPink("礼包状态:"..tostring(ActData.value)) + -- LogPink("礼包状态:"..tostring(ActData.value)) Data.startTime = ActData.startTime table.sort(ActData.mission, function(a, b) return a.missionId < b.missionId end) for key, value in pairs(ActData.mission) do if Data.rewards[key] then - LogGreen("key:"..tostring(key).." "..tostring(value.missionId).." "..tostring(value.state).." "..tostring(value.progress)) + -- LogGreen("key:"..tostring(key).." "..tostring(value.missionId).." "..tostring(value.state).." "..tostring(value.progress)) Data.rewards[key].missionId = value.missionId Data.rewards[key].State = value.state Data.rewards[key].Progress = value.progress @@ -58,12 +58,12 @@ function this.CheckRedPoint() if Data.ActState == 1 then for i = 1, #Data.rewards do if Data.rewards[i].State == 0 and Data.rewards[i].Progress <= GetTimeStamp() then - LogBlue("Return true") + -- LogBlue("Return true") return true end end end - LogBlue("Return false") + -- LogBlue("Return false") return false end diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index 6611810462..1130860f0a 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -21,6 +21,7 @@ function FuXingGaoZhao:InitComponent() end end self.gift = ConfigManager.GetConfigDataByKey(ConfigName.StoreConfig,"Id",11001) + self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft}) end --绑定事件(用于子类重写) function FuXingGaoZhao:BindEvent() @@ -68,6 +69,7 @@ end --界面打开时调用(用于子类重写) function FuXingGaoZhao:OnOpen() + self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main}) end -- 打开,重新打开时回调 @@ -152,6 +154,7 @@ function FuXingGaoZhao:OnDestroy() self.timer = nil end itemPreList={} + SubUIManager.Close(self.UpView) end return FuXingGaoZhao \ No newline at end of file