From 6f5cd1d44a8ca7f1baa2c1325f1d0b0863576021 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 17 Jun 2021 15:21:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=83=8A=E5=96=9C=E7=A4=BC=E5=8C=85=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c11dfa56a6..bb8d5b4d32 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2132,6 +2132,7 @@ FacePanelType = { TimeLimitSkin = 11,--限时神装礼包 FuXingGaoZhao = 12,--福星高照活动 Pokemon = 13,--灵兽推送礼包 + Surprise = 14, --惊喜礼包推送 } --迷宫寻宝条件类型 FindTreasureNeedType = { diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 7a6aed057e..bb8b196176 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -133,7 +133,8 @@ function PatFacePanel:OnShowPatFaceData() self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac or patFaceSingleData.Type == FacePanelType.MonsterWave or patFaceSingleData.Type == FacePanelType.MainLevel or - patFaceSingleData.Type == FacePanelType.Pokemon) + patFaceSingleData.Type == FacePanelType.Pokemon or + patFaceSingleData.Type == FacePanelType.Surprise) self.obg8:SetActive(patFaceSingleData.Type == FacePanelType.TimeLimitSkin) -- self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao) if patFaceSingleData.Type == FacePanelType.Sbtj then @@ -154,7 +155,8 @@ function PatFacePanel:OnShowPatFaceData() elseif patFaceSingleData.Type == FacePanelType.UpgradePac or patFaceSingleData.Type == FacePanelType.MonsterWave or patFaceSingleData.Type == FacePanelType.MainLevel or - patFaceSingleData.Type == FacePanelType.Pokemon then + patFaceSingleData.Type == FacePanelType.Pokemon or + patFaceSingleData.Type == FacePanelType.Surprise then self:OnShowOb7Data(patFaceSingleData.Type) elseif patFaceSingleData.Type == FacePanelType.TimeLimitSkin then self:OnShowOb8Data() @@ -353,6 +355,8 @@ function PatFacePanel:OnShowOb7Data(Type) OperatingManager.upGradePackagePanelType = 3 elseif Type == FacePanelType.Pokemon then OperatingManager.upGradePackagePanelType = 5 + elseif Type == FacePanelType.Surprise then + OperatingManager.upGradePackagePanelType = 6 end UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end) end