diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 16bb9b6cac..4597a4aa8c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1192,6 +1192,7 @@ ActivityTypeDef = { YunYouShangRen = 65,--云游商人 TaSuiLingXiao = 66, --踏碎凌霄 SurpriseBox = 69,--惊喜礼盒 + TeHuiShenZhuang = 70,--特惠神装 --主题活动 ShengXingYouLi=50,--升星有礼(指定猎妖师进阶) @@ -2138,6 +2139,7 @@ FacePanelType = { SurpriseBox = 12,--福星高照活动 Pokemon = 13,--灵兽推送礼包 Surprise = 14, --惊喜礼包推送 + TeHuiShenZhuang = 15, --特惠神装 } --迷宫寻宝条件类型 FindTreasureNeedType = { diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 5d152a1c42..8e5efac523 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -77,6 +77,8 @@ function PatFacePanel:InitComponent() self.obg8 = Util.GetGameObject(self.transform, "frame/obg8") -- 惊喜礼盒活动 self.obg9 = Util.GetGameObject(self.transform, "frame/obg9") + -- 特惠神装活动 + self.obg10 = Util.GetGameObject(self.transform, "frame/obg10") end --绑定事件(用于子类重写) @@ -137,6 +139,7 @@ function PatFacePanel:OnShowPatFaceData() patFaceSingleData.Type == FacePanelType.Surprise) self.obg8:SetActive(patFaceSingleData.Type == FacePanelType.TimeLimitSkin) -- self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao) + self.obg10:SetActive(patFaceSingleData.Type == FacePanelType.TeHuiShenZhuang) if patFaceSingleData.Type == FacePanelType.Sbtj then self:OnShowOb1Data() elseif patFaceSingleData.Type == FacePanelType.Tesc then @@ -162,6 +165,8 @@ function PatFacePanel:OnShowPatFaceData() self:OnShowOb8Data() elseif patFaceSingleData.Type == FacePanelType.SurpriseBox then self:OnShowOb9Data() + elseif patFaceSingleData.Type == FacePanelType.TeHuiShenZhuang then + self:OnShowOb10Data() end end end @@ -370,6 +375,11 @@ function PatFacePanel:OnShowOb9Data() UIManager.OpenPanel(UIName.SurpriseBoxPanel,function() self:ClosePanel() end) end +--第十种 --特惠神装活动 +function PatFacePanel:OnShowOb10Data() + UIManager.OpenPanel(UIName.TeHuiShenZhuangPanel,function() self:ClosePanel() end) +end + function PatFacePanel:JumpBtnClickEvent() if openPanle then openPanle.patFaceCallList:Clear() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index fc82eeb90e..b144eb82d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -887,6 +887,8 @@ function this:TabBtnAction(id,actType,data) UIManager.OpenPanel(UIName.SurpriseBoxPanel) elseif id == ActivityTypeDef.ChaoFanRuSheng then UIManager.OpenPanel(UIName.ActivityMainPanel,id) + elseif id == ActivityTypeDef.TeHuiShenZhuang then + UIManager.OpenPanel(UIName.TeHuiShenZhuangPanel) end elseif actType == 2 then if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then