Update - 1.7.0.88
EN: 1.7.0.88 CN: 1.7.0.90 JP: 1.7.0.91 KR: 1.7.0.94
This commit is contained in:
@@ -216,14 +216,16 @@ local OnClosePanel = function(listener, nPanelId)
|
||||
if type(nPanelId) == "number" then
|
||||
local bIsMainPanel = true
|
||||
if type(tbDisposablePanel) == "table" then
|
||||
for i, v in ipairs(tbDisposablePanel) do
|
||||
if v._nPanelId == nPanelId then
|
||||
local nCount = #tbDisposablePanel
|
||||
for i = nCount, 1, -1 do
|
||||
local objPanel = tbDisposablePanel[i]
|
||||
if objPanel._nPanelId == nPanelId then
|
||||
EventManager.Hit("Guide_CloseDisposablePanel", nPanelId)
|
||||
v:_PreExit()
|
||||
v:_Exit()
|
||||
v:_Destroy()
|
||||
objPanel:_PreExit()
|
||||
objPanel:_Exit()
|
||||
objPanel:_Destroy()
|
||||
table.remove(tbDisposablePanel, i)
|
||||
RemoveTbSnapShot(v)
|
||||
RemoveTbSnapShot(objPanel)
|
||||
bIsMainPanel = false
|
||||
printLog("[界面切换] 关闭了非主 Panel 界面:" .. GetPanelName(nPanelId))
|
||||
break
|
||||
@@ -314,13 +316,13 @@ local OnOpenPanel = function(listener, nPanelId, ...)
|
||||
if _bHasOpenTips == false then
|
||||
_bHasOpenTips = UTILS.CheckIsTipsPanel(v._nPanelId)
|
||||
end
|
||||
if v._nPanelId == nPanelId then
|
||||
if v._nPanelId == nPanelId and nPanelId ~= PanelId.ReceivePropsTips then
|
||||
MoveSnapShot(v)
|
||||
objTempPanel:_PreExit()
|
||||
objTempPanel:_Exit()
|
||||
objTempPanel:_Destroy()
|
||||
objTempPanel = nil
|
||||
printLog("[界面切换] 打开非主 Panel:" .. GetPanelName(nPanelId) .. " 失败,不能重复打开。")
|
||||
printError("[界面切换] 打开非主 Panel:" .. GetPanelName(nPanelId) .. " 失败,不能重复打开。")
|
||||
return
|
||||
end
|
||||
end
|
||||
@@ -546,14 +548,6 @@ function PanelManager.GetCurPanelId()
|
||||
end
|
||||
return 0
|
||||
end
|
||||
function PanelManager.GetDisposablePanelState(nPanelId)
|
||||
for i, v in ipairs(tbDisposablePanel) do
|
||||
if v._nPanelId == nPanelId then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
function PanelManager.CheckPanelOpen(nPanelId)
|
||||
if type(tbBackHistory) == "table" then
|
||||
for i, objPanel in ipairs(tbBackHistory) do
|
||||
|
||||
Reference in New Issue
Block a user