Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
gaoxin 2020-09-01 16:10:41 +08:00
commit a4ac6034b6
3 changed files with 46 additions and 45 deletions

View File

@ -498,9 +498,9 @@ function this.OnMapOut(outType)
if outType == 0 then
this.BackHome()
MapManager.Mapping = false
elseif outType == 1 then -- 正常出图
this.BackToCarbonPanel()
MapManager.Mapping = false
-- elseif outType == 1 then -- 正常出图
-- this.BackToCarbonPanel()
-- MapManager.Mapping = false
else --换层或者换地图
this.ChangeMapByType()
end
@ -513,8 +513,9 @@ end
-- ========================= 死出图的各种方法 ==========================
-- 序章回到主界面
function this.BackHome()
EndLessMapManager.EndlessRedCheck()
MapTrialManager.TrialRedCheck()
CheckRedPointStatus(RedPointType.Trial)
CheckRedPointStatus(RedPointType.TrialReward)
CheckRedPointStatus(RedPointType.EndlessPanel)
local triggerCallBack
triggerCallBack = function (panelType, panel)
if panelType == UIName.MapPanel then
@ -540,50 +541,50 @@ local panelNeedOpen = {
-- 从副本正常出图
function this.BackToCarbonPanel()
local triggerCallBack
triggerCallBack = function (panelType, panel)
if panelType == UIName.MapPanel then
this.Dispose()
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack)
end
BagManager.InBagGetMapBag()
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack)
-- 清空一下副本任务
this.ResetMapData()
-- function this.BackToCarbonPanel()
-- local triggerCallBack
-- triggerCallBack = function (panelType, panel)
-- if panelType == UIName.MapPanel then
-- this.Dispose()
-- Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack)
-- end
-- BagManager.InBagGetMapBag()
-- end
-- Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack)
-- -- 清空一下副本任务
-- this.ResetMapData()
-- 从序章出来的回到主界面
if MapManager.curMapId == 0 or MapManager.curMapId == 100 then
SwitchPanel.OpenPanel(UIName.MainPanel)
else
if(MapTrialManager.curTowerLevel>MapTrialManager.highestLevel) then
if not MapTrialManager.IsFinalLevel()then
MapTrialManager.highestLevel=MapTrialManager.curTowerLevel-1
else
MapTrialManager.highestLevel = MapTrialManager.curTowerLevel
end
end
SwitchPanel.OpenPanel(UIName.MainPanel)
end
-- -- 从序章出来的回到主界面
-- if MapManager.curMapId == 0 or MapManager.curMapId == 100 then
-- SwitchPanel.OpenPanel(UIName.MainPanel)
-- else
-- if(MapTrialManager.curTowerLevel>MapTrialManager.highestLevel) then
-- if not MapTrialManager.IsFinalLevel()then
-- MapTrialManager.highestLevel=MapTrialManager.curTowerLevel-1
-- else
-- MapTrialManager.highestLevel = MapTrialManager.curTowerLevel
-- end
-- end
-- SwitchPanel.OpenPanel(UIName.MainPanel)
-- end
-- 刷新红点
if CarbonManager.difficulty == 2 then
this.TrialCopyData()
elseif CarbonManager.difficulty == 1 then
CheckRedPointStatus(RedPointType.NormalExplore_GetStarReward)
elseif CarbonManager.difficulty == 3 then
this.TrialCopyData()
CheckRedPointStatus(RedPointType.HeroExplore_OpenMap)
CheckRedPointStatus(RedPointType.HeroExplore_Feats)
elseif CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
-- -- 刷新红点
-- if CarbonManager.difficulty == 2 then
-- this.TrialCopyData()
-- elseif CarbonManager.difficulty == 1 then
-- CheckRedPointStatus(RedPointType.NormalExplore_GetStarReward)
-- elseif CarbonManager.difficulty == 3 then
-- this.TrialCopyData()
-- CheckRedPointStatus(RedPointType.HeroExplore_OpenMap)
-- CheckRedPointStatus(RedPointType.HeroExplore_Feats)
-- elseif CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
end
-- end
poolManager:ClearPool()
end
-- poolManager:ClearPool()
-- end
-- 正常出图需要消除的数据
function this.ResetMapData()
@ -632,8 +633,8 @@ function this.TrialChangeFloor(msg)
-- end
SwitchPanel.OpenPanel(UIName.MapPanel)
MapTrialManager.isChangeLevel = false
-- Log("换层前的层数:"..MapTrialManager.curTowerLevel)
-- Log("要换到的层数:"..msg.curTower)
Log("换层前的层数:"..MapTrialManager.curTowerLevel)
Log("要换到的层数:"..msg.curTower)
-- if MapTrialManager.curTowerLevel<10000 then
-- MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1
-- end