From 2b122d7fee1c61bd2bac9c2a7fce5096530c7609 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 22 Apr 2021 15:31:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E6=8F=B4=E5=8A=A9?= =?UTF-8?q?=E3=80=91=E6=AF=8F=E6=AC=A1=E7=82=B9=E5=87=BB=E6=8F=B4=E5=8A=A9?= =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E9=83=BD=E4=BC=9A=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua | 2 +- Assets/ManagedResources/~Lua/View/ScrollCycleView.lua | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua index 8639aa29ee..26374c2278 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua @@ -135,7 +135,7 @@ function this.ShowPanelData() this.aidNumText.text = Language[10987]..curAidNum.."/"..guildHelpConfig[1].RecourseTime[1]..")" this.ScrollView:SetData(allMyAidData, function (index, go) this.SingleHelpDataShow(go, allMyAidData[index]) - end,true,true) + end,false,true) end function this.SingleHelpDataShow(go,data) local isHave = data.type ~= nil diff --git a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua index 13ca3ccdb1..e4ff20cd50 100644 --- a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua +++ b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua @@ -320,8 +320,10 @@ function this:SetData(dataList, updateFunc, noTop, noAnim) -- 判断是否回到顶部,否则保持不动 if noTop then + local oldPosY = self.dragGOTran.anchoredPosition.y local showIndex = self:CalShowIndex() self:SetShow(showIndex) + self.dragGOTran.anchoredPosition = Vector2.New(0, oldPosY) else self:SetShow(1) end