From 2fed5ddb454a30e6c6bebd816f98789e395c9010 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 4 Jan 2021 11:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= =?UTF-8?q?=E3=80=91=E8=BF=9B=E5=85=A5=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= =?UTF-8?q?=E5=90=8E=E7=9B=B4=E6=8E=A5=E5=85=B3=E9=97=AD=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E5=BC=B9=E7=AA=97=EF=BC=8C=E4=BC=9A=E5=9C=A8?= =?UTF-8?q?=E7=A6=BB=E5=BC=80=E5=B9=BB=E5=A2=83=E5=89=8D=E9=97=AA=E8=BF=87?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=BB=9F=E8=AE=A1=E5=BC=B9=E7=AA=97=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Carbon/MapLeavePanel.lua | 2 +- .../~Lua/Modules/Guide/GuideManager.lua | 20 ++++++++--------- .../~Lua/Modules/Map/MapManager.lua | 4 ++-- .../~Lua/Modules/Map/MapPanel.lua | 22 +++++++++---------- .../~Lua/Modules/Map/View/MapMissionView.lua | 6 ++--- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/MapLeavePanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/MapLeavePanel.lua index 06230a508e..6d15b6f226 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/MapLeavePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/MapLeavePanel.lua @@ -61,7 +61,7 @@ function MapLeavePanel:BindEvent() end) Util.AddClick(this.btnEnd, function() - UIManager.OpenPanel(UIName.MapStatsPanel) + -- UIManager.OpenPanel(UIName.MapStatsPanel) --PlayUIAnimBack(this.frame, function () -- PlayUIAnimBack(this.starRoot, function () self:ClosePanel() diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 08dceeac3b..1cf57187da 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -507,16 +507,16 @@ function this.RefreshTriggerListen(id, openType, openArgs) end end Game.GlobalEvent:AddEvent(GameEvent.Guide.MapInit, trigger) - elseif openType == 22 then - --监听副本结算界面 - local trigger - trigger = function(panelType) - if panelType == UIName.MapStatsPanel then - Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger) - this.ShowGuide(id) - end - end - Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger) + -- elseif openType == 22 then + -- --监听副本结算界面 + -- local trigger + -- trigger = function(panelType) + -- if panelType == UIName.MapStatsPanel then + -- Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger) + -- this.ShowGuide(id) + -- end + -- end + -- Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger) elseif openType == 23 then --监听副本界面 local trigger diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua index a8ea822c43..fc70dc7984 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua @@ -434,7 +434,7 @@ function this.UpdateMapProgressData(_type, _data, _num, _isSend) --if not UIManager.IsOpen(UIName.MissionRewardPanel) then this.progressFull = true if not UIManager.IsOpen(UIName.RewardItemPopup) then - UIManager.OpenPanel(UIName.MapStatsPanel) + -- UIManager.OpenPanel(UIName.MapStatsPanel) end else this.progressFull = false @@ -570,7 +570,7 @@ function this.VictoryHandler(result, callBack) -- 试炼副本最后一层 if MapTrialManager.IsFinalLevel() then this.PanelCloseCallBack(UIName.MapOptionPanel, function () - UIManager.OpenPanel(UIName.MapStatsPanel) + -- UIManager.OpenPanel(UIName.MapStatsPanel) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 24d6bb6b29..16c64ea3d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -230,7 +230,7 @@ function this:OnOpen(...) -- 副本相关的初始化设置 this.InitCarbonSet() -- 如果100%,弹出离开界面 - this.ExploreInitSet() + -- this.ExploreInitSet() this.InitrightUpBtn() ---- 刷新被主角狗眼糟蹋过的点 EndLessMapManager.isOpenedFullPanel = false @@ -251,16 +251,16 @@ function this.SetMapFog() end -- 有探索度地图的初始化 -function this.ExploreInitSet() - --首先他得有探索度 - local curMapId = MapManager.curMapId - if DifficultyData[curMapId] and DifficultyData[curMapId].IsExplore == 1 then - local isPass = CarbonManager.ExplorationDone() - if isPass then - UIManager.OpenPanel(UIName.MapStatsPanel) - end - end -end +-- function this.ExploreInitSet() +-- --首先他得有探索度 +-- local curMapId = MapManager.curMapId +-- if DifficultyData[curMapId] and DifficultyData[curMapId].IsExplore == 1 then +-- local isPass = CarbonManager.ExplorationDone() +-- if isPass then +-- UIManager.OpenPanel(UIName.MapStatsPanel) +-- end +-- end +-- end function this.InitCarbonSet() -- 面板遮罩 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapMissionView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapMissionView.lua index 3031b640bb..f95da1afb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapMissionView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapMissionView.lua @@ -457,9 +457,9 @@ function this.NormalShowTime(time) end end - if not UIManager.IsOpen(UIName.MapStatsPanel) then - UIManager.OpenPanel(UIName.MapStatsPanel) - end + -- if not UIManager.IsOpen(UIName.MapStatsPanel) then + -- UIManager.OpenPanel(UIName.MapStatsPanel) + -- end end end end