From f49634a6fb50d81bc794bda7bf75adf91614f6d2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 11 Sep 2021 15:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1018456=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=96=B0=E6=8E=A8=E9=80=81=E7=A4=BC=E5=8C=85=E3=80=91=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E6=96=87=E6=A1=88=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/GlobalDefine.lua | 4 ++++ .../~Lua/Modules/Expert/PatFaceManager.lua | 11 +++++++++-- .../~Lua/Modules/Expert/PatFacePanel.lua | 14 +++++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0c89ac209d..3d9a4e7645 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2259,6 +2259,10 @@ FacePanelType = { Pokemon = 13,--灵兽推送礼包 Surprise = 14, --惊喜礼包推送 TeHuiShenZhuang = 15, --特惠神装 + xuanyuanbaojing = 16, --轩辕宝镜 + jianmushenshu = 17, --建木神树 + silnigshilian = 18, --四灵试炼 + redTreasure = 19, --红色品质宝物推送礼包 } --迷宫寻宝条件类型 FindTreasureNeedType = { diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 84d9ec0c95..44aea9b566 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -332,8 +332,15 @@ function this.GetGuildFightTime() end --事件触发拍脸 (如五星成长礼) function this.OnAddPatFaceData(faceConFigType, starUpGiftNum) - if faceConFigType == FacePanelType.GrowGift or faceConFigType == FacePanelType.UpgradePac or faceConFigType == FacePanelType.MonsterWave or faceConFigType == FacePanelType.MainLevel - or faceConFigType == FacePanelType.TimeLimitSkin then + if faceConFigType == FacePanelType.UpgradePac or + faceConFigType == FacePanelType.MonsterWave or + faceConFigType == FacePanelType.MainLevel or + faceConFigType == FacePanelType.Pokemon or + faceConFigType == FacePanelType.Surprise or + faceConFigType == FacePanelType.xuanyuanbaojing or + faceConFigType == FacePanelType.jianmushenshu or + faceConFigType == FacePanelType.silnigshilian or + faceConFigType == FacePanelType.redTreasure then Log("此种拍脸已改为后端推送 faceConFigType: "..faceConFigType) return end diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 5db2c68890..765d2dd0d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -159,7 +159,11 @@ function PatFacePanel:OnShowPatFaceData() patFaceSingleData.Type == FacePanelType.MonsterWave or patFaceSingleData.Type == FacePanelType.MainLevel or patFaceSingleData.Type == FacePanelType.Pokemon or - patFaceSingleData.Type == FacePanelType.Surprise then + patFaceSingleData.Type == FacePanelType.Surprise or + patFaceSingleData.Type == FacePanelType.xuanyuanbaojing or + patFaceSingleData.Type == FacePanelType.jianmushenshu or + patFaceSingleData.Type == FacePanelType.silnigshilian or + patFaceSingleData.Type == FacePanelType.redTreasure then self:OnShowOb7Data(patFaceSingleData.Type) elseif patFaceSingleData.Type == FacePanelType.TimeLimitSkin then self:OnShowOb8Data() @@ -361,6 +365,14 @@ function PatFacePanel:OnShowOb7Data(Type) OperatingManager.upGradePackagePanelType = 5 elseif Type == FacePanelType.Surprise then OperatingManager.upGradePackagePanelType = 6 + elseif Type == FacePanelType.xuanyuanbaojing then + OperatingManager.upGradePackagePanelType = 7 + elseif Type == FacePanelType.jianmushenshu then + OperatingManager.upGradePackagePanelType = 8 + elseif Type == FacePanelType.silnigshilian then + OperatingManager.upGradePackagePanelType = 9 + elseif Type == FacePanelType.redTreasure then + OperatingManager.upGradePackagePanelType = 10 end UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end) end