From 037d8414d4119820b74cd918ea894f7788a32734 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 19 Mar 2021 10:33:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E8=B1=AA?= =?UTF-8?q?=E7=A4=BC=E3=80=91=E4=BB=8E=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=BC=80?= =?UTF-8?q?=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua index b4302f8ed4..a1973a72a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua @@ -81,7 +81,7 @@ function Expert_UpLv:OnShowData(isTop,isAni) end) this.ScrollView:SetData(activeData.mission, function (index, go) this.SingleItemDataShow(go, activeData.mission[index]) - end,not isTop,not isAni) + end,isTop,not isAni) if isPlayAnim then SecTorPlayAnimByScroll(self.ScrollView) isPlayAnim = false From f51a4305ab4c77f30226c9df9e57a1abea43d423 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 19 Mar 2021 11:08:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=B1=AA=E7=A4=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index cde929cca7..6df4652a70 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1030,6 +1030,8 @@ function this.TimeFormat() activityTabs[k].go.gameObject:SetActive(false) supremHadSet = true end + elseif v.FunType and v.FunType == 41 then + activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else local info = ActivityGiftManager.GetActivityTypeInfo(v.ActiveType) local extraTime = 0