diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 12133b38ce..51bfdd21ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -382,15 +382,16 @@ this.backPatFaceAllData = {} function this.SetPatFaceDaqta(PatFaceDatas) if PatFaceDatas and PatFaceDatas.id and #PatFaceDatas.id > 0 then for i = 1, #PatFaceDatas.id do - LogYellow("后端推送礼包拍脸 礼包id "..PatFaceDatas.id[i]) + --LogYellow("后端推送礼包拍脸 礼包id "..PatFaceDatas.id[i]) local curRechargeCommodityConfig = ConfigManager.TryGetConfigData(ConfigName.RechargeCommodityConfig,PatFaceDatas.id[i]) if curRechargeCommodityConfig and curRechargeCommodityConfig.PosterUiId then - LogYellow("后端推送礼包拍脸 拍脸ID "..curRechargeCommodityConfig.PosterUiId) + --LogYellow("后端推送礼包拍脸 拍脸ID "..curRechargeCommodityConfig.PosterUiId) table.insert(this.backPatFaceAllData, ConfigManager.GetConfigData(ConfigName.LoginPosterConfig,curRechargeCommodityConfig.PosterUiId)) end end end - if this.backPatFaceAllData and this.GetcurCanPatFace() then + if this.backPatFaceAllData and this.GetcurCanPatFace() then + --LogGreen("#this.backPatFaceAllData:"..#this.backPatFaceAllData) this.OpenPatFacePanel(this.backPatFaceAllData) end end @@ -399,7 +400,7 @@ function this.GetBackPatFaceDaqta() return this.backPatFaceAllData end function this.DeleBackPatFaceDaqta() - LogYellow("后端推送礼包拍脸 清空 ") + --LogYellow("后端推送礼包拍脸 清空 ") this.backPatFaceAllData = {} end function this.GetcurCanPatFace() diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 312d8e0f31..5d152a1c42 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -123,6 +123,7 @@ function PatFacePanel:OnShow() end function PatFacePanel:OnShowPatFaceData() if patFaceSingleData then + LogGreen("patFaceSingleData.Type:"..patFaceSingleData.Type) self.obg1:SetActive(patFaceSingleData.Type == FacePanelType.Sbtj) self.obg2:SetActive(patFaceSingleData.Type == FacePanelType.Tesc) self.obg3:SetActive(patFaceSingleData.Type == FacePanelType.GuildFight or patFaceSingleData.Type == FacePanelType.Championship) diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 08ac7939f6..3dea7851ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -21,7 +21,7 @@ local activityType = { [3] = {name = "关卡推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25,Text = Language[12320]}, [4] = {name = "心魔试炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26,Text = Language[12321]}, [5] = {name = "灵兽推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31,Text = "恭喜您获得极品灵兽,这是为您准备的灵兽成长礼包,助您实力飞升"}, -[6] = {name = "惊喜礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31,Text = "购买惊喜礼盒成功激活限时豪礼,祝您战力飞升,一路通关"}, +[6] = {name = "惊喜礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 33,Text = "购买惊喜礼盒成功激活限时豪礼,祝您战力飞升,一路通关"}, } --初始化组件(用于子类重写) function this:InitComponent()