From 4d4cd5501081c3fa45fb7e7589536830805fe6aa Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 28 Oct 2020 19:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E3=80=91=20=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/Pokemon/PokemonSummonPanel.lua | 1 - Assets/ManagedResources/~Lua/View/UpView.lua | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index cc1e8fc8c7..3e46fed44f 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -523,6 +523,7 @@ UpViewRechargeType = { Celebration = 50003,--社稷赏 PuTiZi = 1203,--菩提子 XianLingCao = 1202,--仙灵草 + YHMF= 21,--妖魂魔符 } SHOP_PAGE = { diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua index 7d3bdb4c8c..2f529a7ab9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua @@ -275,7 +275,6 @@ end function PokemonSummonPanel:OnClose() self.gameObject:SetActive(false) - self.detail.gameObject:SetActive(false) if self.timer then self.timer:Stop() self.timer = nil diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 669d7d3a1f..aa031a78de 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -46,6 +46,7 @@ local _ShowPlusType = { UpViewRechargeType.EndlessCoin, UpViewRechargeType.XianLingCao, UpViewRechargeType.PuTiZi, + UpViewRechargeType.YHMF, } -- 判断是否显示加号 @@ -349,6 +350,7 @@ function UpView:RechargeType(_type) _type==UpViewRechargeType.TianGong or _type==UpViewRechargeType.PuTiZi or _type==UpViewRechargeType.XianLingCao or + _type==UpViewRechargeType.YHMF or _type==UpViewRechargeType.EndlessCoin then UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)