无尽_新重做前的提交

dev_chengFeng
ZhangBiao 2020-08-18 15:48:41 +08:00
parent 8bad66a6c3
commit 448c5d3b17
6 changed files with 52 additions and 30 deletions

View File

@ -345,7 +345,7 @@ function this.BtnClick(id)
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id))
end end
elseif id == FUNCTION_OPEN_TYPE.TRIAL then elseif id == FUNCTION_OPEN_TYPE.TRIAL then
LogGreen("CarbonTypePanelV2"..MapTrialManager.curTowerLevel) LogGreen("CarbonTypePanelV2"..MapTrialManager.curTowerLevel)
if ActTimeCtrlManager.SingleFuncState(id) then if ActTimeCtrlManager.SingleFuncState(id) then
CarbonManager.difficulty = 2 CarbonManager.difficulty = 2
@ -356,8 +356,8 @@ function this.BtnClick(id)
else else
MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
end end
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
MapManager.curCarbonType =CarBonTypeId.TRIAL MapManager.curCarbonType =CarBonTypeId.TRIAL
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
MapManager.isReloadEnter = false MapManager.isReloadEnter = false
MapTrialManager.firstEnter = true MapTrialManager.firstEnter = true
MapManager.SetViewSize(20)--设置视野范围(明雷形式) MapManager.SetViewSize(20)--设置视野范围(明雷形式)

View File

@ -63,7 +63,7 @@ function EndLessCarbonPanel:BindEvent()
Util.AddClick(this.btnFight, function () Util.AddClick(this.btnFight, function ()
LogGreen("开放的地图ID"..EndLessMapManager.openMapId) LogGreen("开放的地图ID"..EndLessMapManager.openMapId)
this.EnterMap(EndLessMapManager.openMapId) this.EnterMap()
end) end)
@ -147,12 +147,11 @@ function this.RequestBlood(func)
end) end)
end end
function this.EnterMap(mapId) function this.EnterMap()
mapId = 4001
-- if not MapManager.isInMap then -- if not MapManager.isInMap then
-- 进入地图编队,重新赋值一遍 -- 进入地图编队,重新赋值一遍
CarbonManager.difficulty = CARBON_TYPE.ENDLESS CarbonManager.difficulty = CARBON_TYPE.ENDLESS
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, mapId) UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId)
-- else -- else
-- -- 在地图里又没勾新手引导, 无法进图 -- -- 在地图里又没勾新手引导, 无法进图

View File

@ -498,9 +498,10 @@ function this.MapUpdateEvent(pos, func)
Log(Language[11196] .. eventId) Log(Language[11196] .. eventId)
if eventId~=0 then if eventId~=0 then
MissionManager.EventPointTrigger(eventId) MissionManager.EventPointTrigger(eventId)
else elseif eventId == 0 and MapManager.curCarbonType == CarBonTypeId.TRIAL then
-- local style = MapPointConfig[MapManager.mapPointId].Style -- body
-- MissionManager.MapPointTrigger(style) local style = MapPointConfig[MapManager.mapPointId].Style
MissionManager.MapPointTrigger(style)
end end
if func then if func then

View File

@ -120,7 +120,7 @@ function this.SetEndlessShow()
end) end)
end) end)
else else
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0) Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
end end
end end
-- =============================================== -- ===============================================
@ -459,25 +459,25 @@ function this.RefreshShow()
pointHandleView.RefreshShow() pointHandleView.RefreshShow()
end end
function this.OnMapOut(nextMapId, outType) function this.OnMapOut(outType)
Log("outType ====== " .. outType) Log("outType ====== " .. outType)
-- 无尽副本需要传目的地的地图ID -- 无尽副本需要传目的地的地图ID
local distMapId = 0 -- local distMapId = 0
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and nextMapId > 0 then -- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and nextMapId > 0 then
distMapId = nextMapId -- distMapId = nextMapId
end -- end
NetManager.MapOutRequest(outType, function (msg) NetManager.MapOutRequest(outType, function (msg)
if nextMapId == 100 or nextMapId == 0 then if outType == 0 then
this.BackHome() this.BackHome()
elseif nextMapId == 1 then -- 正常出图 elseif outType == 1 then -- 正常出图
this.BackToCarbonPanel() this.BackToCarbonPanel()
else --换层或者换地图 else --换层或者换地图
this.ChangeMapByType(nextMapId, msg) this.ChangeMapByType(msg)
end end
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
end, distMapId) end, 0)
end end
@ -564,12 +564,12 @@ function this.ResetMapData()
end end
-- 换层或者换地图 -- 换层或者换地图
function this.ChangeMapByType(nextMapId, msg) function this.ChangeMapByType(msg)
local carbonType = CarbonManager.difficulty local carbonType = CarbonManager.difficulty
-- 在试炼副本中的是换层操作 -- 在试炼副本中的是换层操作
if carbonType == 2 then if carbonType == 2 then
Log(Language[11239]) Log(Language[11239])
this.TrialChangeFloor(nextMapId, msg) this.TrialChangeFloor(msg)
elseif carbonType == 4 then elseif carbonType == 4 then
Log(Language[11240]) Log(Language[11240])
-- 执行换图方法 -- 执行换图方法
@ -578,13 +578,13 @@ function this.ChangeMapByType(nextMapId, msg)
end end
-- 试炼副本的换层操作 -- 试炼副本的换层操作
function this.TrialChangeFloor(nextMapId, msg) function this.TrialChangeFloor(msg)
-- 设置不可点击 -- 设置不可点击
ctrlView.SetCtrlState(true) ctrlView.SetCtrlState(true)
this.ClearBag() this.ClearBag()
this.StopWalking() this.StopWalking()
NetManager.MapInfoRequest(nextMapId,function () NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
local triggerCallBack local triggerCallBack
triggerCallBack = function (panelType, panel) triggerCallBack = function (panelType, panel)
if panelType == UIName.SwitchPanel then if panelType == UIName.SwitchPanel then
@ -594,19 +594,39 @@ function this.TrialChangeFloor(nextMapId, msg)
end end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack) 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) SwitchPanel.OpenPanel(UIName.MapPanel)
MapTrialManager.isChangeLevel = false MapTrialManager.isChangeLevel = false
if MapTrialManager.curTowerLevel<10000 then if MapTrialManager.curTowerLevel<10000 then
MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1 MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1
end end
--设置 进入下一层后领取全部奖励 --设置 进入下一层后领取全部奖励
MissionManager.GetAllRewardTrigger() MissionManager.GetAllRewardTrigger()
end) 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 end
-- 换图操作 -- 换图操作

View File

@ -75,9 +75,9 @@ end
-- 进入下一层 -- 进入下一层
function this.GoNextLevel() function this.GoNextLevel()
local curMapId = trailConfig[MapTrialManager.curTowerLevel + 1].MapId -- local curMapId = trailConfig[MapTrialManager.curTowerLevel + 1].MapId
this.isChangeLevel = true this.isChangeLevel = true
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, curMapId, 1) Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1)
this.bossType = 0 this.bossType = 0
end end

View File

@ -137,6 +137,7 @@ end
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)
function TrialMapPanel:OnOpen() function TrialMapPanel:OnOpen()
this.upView.gameObject:SetActive(CarbonManager.difficulty == 2)
this.powerRoot:SetActive(CarbonManager.difficulty == 2) this.powerRoot:SetActive(CarbonManager.difficulty == 2)
this.btnBomb:SetActive(CarbonManager.difficulty == 2) this.btnBomb:SetActive(CarbonManager.difficulty == 2)
-- 商店 -- 商店
@ -157,6 +158,7 @@ function this.InitShowState()
if CarbonManager.difficulty ~= 2 then return end if CarbonManager.difficulty ~= 2 then return end
istrialMap = CarbonManager.difficulty == 2 istrialMap = CarbonManager.difficulty == 2
if istrialMap then this.InitTrial() end if istrialMap then this.InitTrial() end
this.upView.gameObject:SetActive(CarbonManager.difficulty ~= 4)
this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
this.helpBtn:SetActive(istrialMap) this.helpBtn:SetActive(istrialMap)
MapPanel.btnBag.gameObject:SetActive(false) MapPanel.btnBag.gameObject:SetActive(false)