From f20c58dc9607139552c8f89cc206bf9ad353e545 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 27 Apr 2021 17:56:55 +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=20=E6=AF=8F=E6=AC=A1=E7=82=B9=E5=87=BB=E6=8F=B4?= =?UTF-8?q?=E5=8A=A9=EF=BC=8C=E5=88=97=E8=A1=A8=E9=83=BD=E4=BC=9A=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E7=BD=AE=E9=A1=B6=E6=98=BE=E7=A4=BA----3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 9 +++++++-- Assets/ManagedResources/~Lua/View/ScrollCycleView.lua | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 4594376216..ec36512dd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -121,6 +121,7 @@ function EveryDayGift:OnShow(_sortingOrder) self.titleTip.gameObject:SetActive(true) else self.titleTip.gameObject:SetActive(false) + end if self.actConfig.Id == 63 then @@ -163,6 +164,7 @@ function EveryDayGift:RefreshGiftData(isTop,isAni) if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then for j = 1 , #DynamicActivityManager.selectIndex.goodsId do if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then + DynamicActivityManager.SetSelectIndex(0,{}) curindex = i break end @@ -172,8 +174,11 @@ function EveryDayGift:RefreshGiftData(isTop,isAni) break end end - --LogGreen("curindex:"..curindex) - self.scrollView:SetIndex(curindex) + if curindex ~= 0 then + --LogGreen("curindex:"..curindex) + self.scrollView:SetIndex(curindex) + end + end function EveryDayGift:isBought() diff --git a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua index 1928336a91..b1bb92ae1e 100644 --- a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua +++ b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua @@ -322,9 +322,10 @@ function this:SetData(dataList, updateFunc, noTop, noAnim) -- 判断是否回到顶部,否则保持不动 if noTop then local oldPosY = self.dragGOTran.anchoredPosition.y + local oldPosX = self.dragGOTran.anchoredPosition.x local showIndex = self:CalShowIndex() self:SetShow(showIndex) - self.dragGOTran.anchoredPosition = Vector2.New(0, oldPosY) + self.dragGOTran.anchoredPosition = Vector2.New(oldPosX, oldPosY) else self:SetShow(1) end