From cf02c49ac5a44e9a6c4cd1454174b57bbba78c58 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 17:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=A5=96=E5=8A=B1=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=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 --- .../~Lua/Modules/Popup/RewardItemPopup.lua | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 70c9e0409d..ff996976f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -163,7 +163,14 @@ function RewardItemPopup:OnOpen(...) local isHideBG = args[6] this.btnBack:GetComponent("Image").color = Color.New(0, 0, 0, isHideBG and 0 or 0.8) this.btnGoOn:SetActive(not isHideBG) - + if compShowType == CompShowType.fourElement then + this.ScrollView.gameObject:SetActive(false) + this.dropPrefab.gameObject:SetActive(false) + this.ScrollView2.gameObject:SetActive(false) + this.shenying.gameObject:SetActive(true) + this.ShengYingShow(args[8]) + return + end if not drop then this.GuildCarDelayShow() this.guildCarDelay:SetActive(compShowType == 3) @@ -179,14 +186,7 @@ function RewardItemPopup:OnOpen(...) this.GuildTranscriptShow() end - if compShowType == CompShowType.fourElement then - this.ScrollView.gameObject:SetActive(false) - this.dropPrefab.gameObject:SetActive(false) - this.ScrollView2.gameObject:SetActive(false) - this.shenying.gameObject:SetActive(true) - this.ShengYingShow(args[8]) - return - end + local starItemDataList=BagManager.GetItemListFromTempBag(drop) -- LogError("获取宝物的数量:".. LengthOfTable(starItemDataList)) --做装备叠加特殊组拼数据 @@ -521,6 +521,7 @@ function RewardItemPopup:ItemDataListSort(itemDataList) end --界面关闭时调用(用于子类重写) function RewardItemPopup:OnClose() + compShowType = 0 if compShowType == CompShowType.fourElement then return end @@ -539,8 +540,6 @@ function RewardItemPopup:OnClose() return end end - - compShowType = 0 if func and not isPopGetSSR then if fightConFigData and fightConFigData.PicShow == 1 and FightPointPassManager.isOpenNewChapter then func(isBackBattle)