From f53a566ce8778f85fe1251e7e9baa3f71d990d70 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 19 Oct 2020 22:56:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=8D=E9=81=A5=E6=B8=B8=E3=80=91?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=85=A5=E5=8F=A3=E9=9A=8F=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/Fight/FightPointPassMainPanel.lua | 2 ++ .../ManagedResources/~Lua/Modules/Player/RedpotManager.lua | 2 +- .../~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua | 5 ++++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 16236f3cb9..82380f1573 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1258,6 +1258,7 @@ FUNCTION_OPEN_TYPE = { CARDELAY = 73, PEOPLE_MIRROR=74,--轩辕宝镜 COMPOUND_HERO=78,--神将合成、置换 + XiaoYaoYou = 80, -- 逍遥游 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index fca045a6bc..0296371488 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -206,6 +206,7 @@ function FightPointPassMainPanel:InitComponent() --逍遥游入口 this.btnXiaoYao=Util.GetGameObject(self.gameObject,"Bg/RightUpVertical/xiaoyaoBtn") this.xiaoyaoRedPoint=Util.GetGameObject(self.gameObject,"Bg/RightUpVertical/xiaoyaoBtn/redPoint") + this.funcBtnList[FUNCTION_OPEN_TYPE.XiaoYaoYou] = this.btnXiaoYao --解锁功能 this.openFun = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun") this.openFunNeedInfo = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun/needInfo"):GetComponent("Text") @@ -915,5 +916,6 @@ end function this.RefreshBattleUpLvTip() this.battleUpLvTip:SetActive(true) end + --开服福利显示 结束 return FightPointPassMainPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index c078c0c51f..55e3b3b863 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -424,7 +424,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.QinglongSerectTreasureTrail, QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot) RPData:AddCheckFunc(RedPointType.WeekGiftPage,OperatingManager.CheckWeekGiftPageRedPoint) RPData:AddCheckFunc(RedPointType.MonthGiftPage,OperatingManager.CheckMonthGiftPageRedPoint) - RPData:AddCheckFunc(RedPointType.XiaoYaoYouRedPoint,XiaoYaoManager.CheckRedPoint) + RPData:AddCheckFunc(RedPointType.XiaoYaoYouRedPoint, XiaoYaoManager.CheckRedPoint, FUNCTION_OPEN_TYPE.XiaoYaoYou) end diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua index 1dc79cbbc9..3322e1267a 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua @@ -229,7 +229,10 @@ function this.UpdateYunYouVleShow() end --界面关闭时调用(用于子类重写) function this:OnClose() - + if this.timer then + this.timer:Stop() + end + this.timer = nil end --界面销毁时调用(用于子类重写)