dev_chengFeng
parent
448c5d3b17
commit
8f786147d3
|
@ -68,13 +68,13 @@ function this.MapOutType(type)
|
|||
this.effect:SetActive(true)
|
||||
local timer
|
||||
timer = Timer.New(function()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
|
||||
end, 1.5):Start()
|
||||
elseif type == 2 then --试炼副本
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
|
||||
|
||||
elseif type == 4 then
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ end
|
|||
function FormationEditPopup:BindEvent()
|
||||
Util.AddClick(this.BtnBack, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
|
||||
|
|
|
@ -460,6 +460,7 @@ function this.RefreshShow()
|
|||
end
|
||||
|
||||
function this.OnMapOut(outType)
|
||||
--出图不需要发协议了
|
||||
Log("outType ====== " .. outType)
|
||||
-- 无尽副本需要传目的地的地图ID
|
||||
-- local distMapId = 0
|
||||
|
@ -467,17 +468,17 @@ function this.OnMapOut(outType)
|
|||
-- distMapId = nextMapId
|
||||
-- end
|
||||
|
||||
NetManager.MapOutRequest(outType, function (msg)
|
||||
-- NetManager.MapOutRequest(outType, function (msg)
|
||||
if outType == 0 then
|
||||
this.BackHome()
|
||||
elseif outType == 1 then -- 正常出图
|
||||
this.BackToCarbonPanel()
|
||||
else --换层或者换地图
|
||||
this.ChangeMapByType(msg)
|
||||
-- else --换层或者换地图
|
||||
-- this.ChangeMapByType(msg)
|
||||
end
|
||||
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||
end, 0)
|
||||
-- end, distMapId)
|
||||
|
||||
end
|
||||
|
||||
|
@ -573,7 +574,7 @@ function this.ChangeMapByType(msg)
|
|||
elseif carbonType == 4 then
|
||||
Log(Language[11240])
|
||||
-- 执行换图方法
|
||||
this.ChangeMap(nextMapId)
|
||||
this.ChangeMap()
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -584,7 +585,7 @@ function this.TrialChangeFloor(msg)
|
|||
this.ClearBag()
|
||||
this.StopWalking()
|
||||
|
||||
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
|
||||
NetManager.MapInfoRequest(MapManager.curCarbonType,function ()
|
||||
local triggerCallBack
|
||||
triggerCallBack = function (panelType, panel)
|
||||
if panelType == UIName.SwitchPanel then
|
||||
|
@ -594,39 +595,19 @@ function this.TrialChangeFloor(msg)
|
|||
end
|
||||
Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack)
|
||||
|
||||
-- 试炼副本的完成时间
|
||||
if msg.useTime then
|
||||
Log(Language[11241] .. msg.useTime)
|
||||
MapTrialManager.doneTime = msg.useTime
|
||||
end
|
||||
SwitchPanel.OpenPanel(UIName.MapPanel)
|
||||
MapTrialManager.isChangeLevel = false
|
||||
if MapTrialManager.curTowerLevel<10000 then
|
||||
MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1
|
||||
end
|
||||
|
||||
--设置 进入下一层后领取全部奖励
|
||||
MissionManager.GetAllRewardTrigger()
|
||||
end)
|
||||
|
||||
-- NetManager.MapInfoRequest(nextMapId,function ()
|
||||
-- local triggerCallBack
|
||||
-- triggerCallBack = function (panelType, panel)
|
||||
-- if panelType == UIName.SwitchPanel then
|
||||
-- this.Dispose()
|
||||
-- Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack)
|
||||
-- end
|
||||
-- end
|
||||
-- Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack)
|
||||
|
||||
-- -- 试炼副本的完成时间
|
||||
-- if msg.useTime then
|
||||
-- Log(Language[11241] .. msg.useTime)
|
||||
-- MapTrialManager.doneTime = msg.useTime
|
||||
-- end
|
||||
-- SwitchPanel.OpenPanel(UIName.MapPanel)
|
||||
-- MapTrialManager.isChangeLevel = false
|
||||
-- if MapTrialManager.curTowerLevel<10000 then
|
||||
-- MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1
|
||||
-- end
|
||||
-- --设置 进入下一层后领取全部奖励
|
||||
-- MissionManager.GetAllRewardTrigger()
|
||||
-- end)
|
||||
end
|
||||
|
||||
-- 换图操作
|
||||
|
|
|
@ -114,9 +114,9 @@ end
|
|||
-- 张麻子:哈,大哥这他妈的惊喜啊,小弟我愿意等你三天
|
||||
-- 黄四郎:好
|
||||
function this.GoSurprisedLevel()
|
||||
local mapId = this.GetSurprisedLevelMapId()
|
||||
-- local mapId = this.GetSurprisedLevelMapId()
|
||||
this.isChangeLevel = true
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, mapId, 1)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,1)
|
||||
this.bossType = 0
|
||||
end
|
||||
|
||||
|
|
|
@ -265,7 +265,7 @@ function this.UpdateEventPoint(msg, optionId, func)
|
|||
{"DeletePoint", {pos = MapManager.curTriggerPos}},
|
||||
}
|
||||
elseif behaviorType == 47 then -- 跨地图传送
|
||||
EndLessMapManager.TranssportByMapId(beArgs[1][1])
|
||||
-- EndLessMapManager.TranssportByMapId(beArgs[1][1])
|
||||
elseif behaviorType == 48 then
|
||||
behaviorNodeList = {
|
||||
{"Battle", {monsterID = beArgs[1][2]}, this.SetNextEventId},
|
||||
|
|
Loading…
Reference in New Issue