From b26cbe30aef66f9f83fc9b1284d6a964643fc219 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 15 Sep 2021 10:17:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A5=96=E5=8A=B1=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardItemPopup.lua | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 050651816d..967e857afa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -176,16 +176,6 @@ 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.shenying.gameObject:SetActive(true) - this.ShengYingShow(args[8]) - return - end - if not drop then - return - end if compShowType == 3 then this.GuildCarDelayShow() @@ -198,6 +188,8 @@ function RewardItemPopup:OnOpen(...) this.TaSuiLingXiaoShow() elseif compShowType == 8 then--山河社稷图 this.FightLevelShow() + elseif compShowType == CompShowType.fourElement then + this.ShengYingShow(args[8]) end --如果没有掉落就return if not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1) then @@ -284,6 +276,9 @@ function this.SetComPShowState(type) end function this.ShengYingShow(propertyId) + this.ScrollView.gameObject:SetActive(false) + this.dropPrefab.gameObject:SetActive(false) + this.shenying.gameObject:SetActive(true) LogGreen("propertyId:"..propertyId) this.shenyingTxt.text = ConfigManager.GetConfigData(ConfigName.PropertyConfig,propertyId).Info end