From ed267747555a7a9f04dcd9c734c5cf2bb298c9a3 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 26 Feb 2021 17:26:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ScrollCycleView=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Arena/View/ArenaView.lua | 2 ++ .../~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua | 2 +- .../SevenDayCarnival/SevenDayCarnivalPanelV2.lua | 16 ++++++++-------- .../Modules/TreasureStore/TreasureStorePopup.lua | 10 +++++----- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index 0429f500be..32d52393f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -306,6 +306,8 @@ function this.RefreshEnemyData() table.insert(prefab,node) local lv_name = Util.GetGameObject(node, "name") local integral = Util.GetGameObject(node, "integralTip") + Util.GetGameObject(node, "power"):SetActive(false) + Util.GetGameObject(node, "integral"):SetActive(false) local power = Util.GetGameObject(node, "powerTip") local headroot = Util.GetGameObject(node, "headroot") local bg = Util.GetGameObject(node, "bg") diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua index a313e5750f..c8ed1d23f9 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[11010]..curAidNum.."/"..guildHelpConfig[1].RecourseTime[1]..")" this.ScrollView:SetData(allMyAidData, function (index, go) this.SingleHelpDataShow(go, allMyAidData[index]) - end) + end,true,true) end function this.SingleHelpDataShow(go,data) local isHave = data.type ~= nil diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua index 7f8487f81d..95f8a4bb3d 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua @@ -167,7 +167,7 @@ end --消息刷新 function this.RefreshTaskShow() - this.OnClickTabBtn(curIndex) + this.OnClickTabBtn(curIndex,false,false) this.ShowTitleProgressRewardData() this.DownTabBtnRedPointShow() this.RefreshRedPoint() @@ -256,7 +256,7 @@ function this.ShowTitleProgressRewardData() end NetManager.TakeMissionRewardRequest(TaskTypeDef.SevenDayCarnival, curProgressData.missionId, function(respond) UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function () - this.OnClickTabBtn(curIndex) + this.OnClickTabBtn(curIndex,false,false) this.ShowTitleProgressRewardData() this.DownTabBtnRedPointShow() this.RefreshRedPoint() @@ -291,7 +291,7 @@ function this.OnDayClickBtn(_curDayIndex) end this.dayBtnSelect:SetActive(curDayIndex ~= 7) this.dayBtnSelect2:SetActive(curDayIndex == 7) - this.OnClickTabBtn(curIndex) + this.OnClickTabBtn(curIndex,false,false) this.CreateTabData() this.DownTabBtnRedPointShow() end @@ -305,7 +305,7 @@ function this.TabAdapter(tab, index, status) end --切换视图 function this.SwitchView(index) - this.OnClickTabBtn(index) + this.OnClickTabBtn(index,true,true) end local sortTable = { [0] = 2, @@ -333,7 +333,7 @@ function this.DownTabBtnRedPointShow() end end --下方页签选择 -function this.OnClickTabBtn(_curIndex) +function this.OnClickTabBtn(_curIndex,isTop,isAni) serverTaskList = TaskManager.GetTypeTaskList(TaskTypeDef.SevenDayCarnival) curIndex = _curIndex curTaskListConfigDtata = {} @@ -365,7 +365,7 @@ function this.OnClickTabBtn(_curIndex) end) this.ScrollView:SetData(curTaskListConfigDtata, function (index, go) this.SingleItemDataShow(go, curTaskListConfigDtata[index]) - end) + end,not isTop,not isAni) else-- 4 半价购买 curShopData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.StoreTypeConfig,"StoreType",SHOP_TYPE.SEVENDAY_CARNIVAL_SHOP,"Sort",curDayIndex) if curShopData then @@ -377,7 +377,7 @@ function this.OnClickTabBtn(_curIndex) this.ScrollView:SetData(shopInfoList.storeItem, function (index, go) this.SingleItemDataShow2(go, shopInfoList.storeItem[index],curShopData.Id) - end) + end,not isTop,not isAni) end end end @@ -422,7 +422,7 @@ function this.SingleItemDataShow2(go, data,curShopDataId) Util.AddOnceClick(buyBtn, function() if BagManager.GetItemCountById(item) >= num then ShopManager.RequestBuyItemByShopId(curShopDataId, storeConfig.Id, 1, function () - this.OnClickTabBtn(curIndex) + this.OnClickTabBtn(curIndex,false,false) this.ShowTitleProgressRewardData() this.DownTabBtnRedPointShow() this.RefreshRedPoint() diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua index 719185af1f..abb7515803 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua @@ -40,7 +40,7 @@ function TreasureStorePopup:OnOpen(...) end function TreasureStorePopup:OnShow() - this:RefreshPanel() + this:RefreshPanel(true) this:TimeCountDown() isPlayAnim = true end @@ -62,7 +62,7 @@ function TreasureStorePopup:OnDestroy() end --刷新面板 -function TreasureStorePopup:RefreshPanel() +function TreasureStorePopup:RefreshPanel(isAni) local allData = {} local curActId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureStore) if not curActId then @@ -77,13 +77,13 @@ function TreasureStorePopup:RefreshPanel() allData = this.SortData(allData) this.scrollView:SetData(allData, function (index, go) this:SetScrollPre(go, allData[index]) - end) + end,false,not isAni) end -- if isPlayAnim then -- SecTorPlayAnimByScroll(this.scrollView) -- isPlayAnim = false -- end - this.scrollView:SetIndex(1) + -- this.scrollView:SetIndex(1) end function this.SortData(allData) @@ -180,7 +180,7 @@ function this.TimeCountDown() this.timer:Stop() this.timer = nil this.timer = Timer.New(function() - this:RefreshPanel() + this:RefreshPanel(false) this:TimeCountDown() end,1):Start() return