From 98670958a060dc1979c0e7a27a294167687093d8 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 17 Jul 2020 13:56:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E5=86=B2=E6=8B=8D=E8=84=B8=20=20?= =?UTF-8?q?=E5=AF=BB=E5=AE=9D=E7=BA=A2=E7=82=B9=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/FindTreasure/FindTreasureManager.lua | 4 +++- .../Modules/FirstRecharge/FirstRechargePanel.lua | 13 ++++++++++--- .../~Lua/Modules/Main/MainPanel.lua | 14 +++++++++----- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua index 91dc85e0f5..843f18cc22 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua @@ -30,7 +30,9 @@ function this.RefreshUsedTimes() Game.GlobalEvent:DispatchEvent(GameEvent.FindTreasure.RefreshFindTreasure,true) end function this.RefreshFindTreasureRedPoint() - -- CheckRedPointStatus(RedPointType.SecretTer_FindTreasure) + if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.FINDTREASURE) then + return false + end TaskManager.SetFindTreasureDataState() local missionInfo = TaskManager.GetTypeTaskList(TaskTypeDef.FindTreasure) for i = 1, #missionInfo do diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index 57e18bf1a6..2b98257554 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -101,11 +101,12 @@ function FirstRechargePanel:OnSortingOrderChange() self.dayRewardList[i]:OnSortingOrderChange(self.sortingOrder) end end - -function FirstRechargePanel:OnOpen(context) +local fun = nil +function FirstRechargePanel:OnOpen(context,_fun) context = context and context or {} self.selectTabIndex = context.tabIndex and context.tabIndex or 1 -- self:SetOncePart() + fun = _fun end function FirstRechargePanel:OnShow() @@ -185,5 +186,11 @@ function FirstRechargePanel:SetTabRedPointStatus(tabIndex) end self.tabRedPoint[tabIndex]:SetActive(redPointStatus) end - +--界面关闭时调用(用于子类重写) +function FirstRechargePanel:OnClose() + if fun then + fun() + fun = nil + end +end return FirstRechargePanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 112651f0f0..efcdb070ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1031,16 +1031,20 @@ function this:OnShow() -- 刷新拍脸 local patFaceAllData = PatFaceManager.GetPatFaceAllDataTabs() if patFaceAllData and #patFaceAllData <= 0 and not UIManager.IsOpen(UIName.PatFacePanel) then - AdventureManager.GetIsMaxTime() + if FirstRechargeManager.isFirstRecharge == 1 and FirstRechargeManager.PlayerPrefsGetStrItemId() == 0 then + FirstRechargeManager.PlayerPrefsSetStrItemId(1) + UIManager.OpenPanel(UIName.FirstRechargePanel,nil,function() + AdventureManager.GetIsMaxTime() + end) + else + AdventureManager.GetIsMaxTime() + end end --主城调了两边 所以做特殊判断 if not UIManager.IsOpen(UIName.PatFacePanel) then this.RefreshShowPatPaceActivity() end - if FirstRechargeManager.isFirstRecharge == 1 and FirstRechargeManager.PlayerPrefsGetStrItemId() == 0 then - FirstRechargeManager.PlayerPrefsSetStrItemId(1) - UIManager.OpenPanel(UIName.FirstRechargePanel) - end + -- 设置主城小人名字 if self.playerView then self.playerView:SetName()