Major Update - 2.0.0.143
EN: 2.0.0.143 CN: 2.0.0.142 JP: 2.0.0.145 KR: 2.0.0.150
This commit is contained in:
@@ -281,7 +281,7 @@ local PreExitCurrent = function()
|
||||
objCurPanel:_PreExit(PreEnterNext, true)
|
||||
end
|
||||
end
|
||||
local OnOpenPanel = function(listener, nPanelId, ...)
|
||||
local OpenPanel = function(nPanelId, mapOpenContext, ...)
|
||||
if objNextPanel ~= nil then
|
||||
printError("[界面切换] 打开界面:" .. GetPanelName(nPanelId) .. " 失败,上一次界面切换流程尚未完成,正在处理:" .. GetPanelName(objNextPanel._nPanelId))
|
||||
return
|
||||
@@ -304,6 +304,9 @@ local OnOpenPanel = function(listener, nPanelId, ...)
|
||||
nIndex = objCurPanel._nIndex + 1
|
||||
end
|
||||
local objTempPanel = luaClass.new(nIndex, nPanelId, tbParameter)
|
||||
if mapOpenContext ~= nil then
|
||||
objTempPanel._nSortingOrderBase = mapOpenContext.nSortingOrderBase
|
||||
end
|
||||
if objTempPanel._bIsMainPanel == true then
|
||||
objNextPanel = objTempPanel
|
||||
if objNextPanel._bAddToBackHistory == true then
|
||||
@@ -336,6 +339,12 @@ local OnOpenPanel = function(listener, nPanelId, ...)
|
||||
end
|
||||
CheckThresholdCount()
|
||||
end
|
||||
local OnOpenPanel = function(listener, nPanelId, ...)
|
||||
OpenPanel(nPanelId, nil, ...)
|
||||
end
|
||||
function PanelManager.OpenPanelWithContext(nPanelId, mapOpenContext, ...)
|
||||
OpenPanel(nPanelId, mapOpenContext, ...)
|
||||
end
|
||||
local OnOpenLoading = function(listener, objTarget, callbackUpdate, callbackDone)
|
||||
if objTarget == nil or type(callbackUpdate) == "function" then
|
||||
else
|
||||
@@ -460,6 +469,7 @@ local RegisterTextGetContentFun = function()
|
||||
CS.TextMeshProWrap.GetTextFunc = ConfigTable.GetUIText
|
||||
end
|
||||
function PanelManager.Init()
|
||||
PanelManager.IGNORE_CS_TRANS_EVENT = false
|
||||
local goUIRoot = GameObject.Find("==== UI ROOT ====")
|
||||
if goUIRoot ~= nil then
|
||||
mapUIRootTransform = {}
|
||||
|
||||
Reference in New Issue
Block a user