试炼副本补日志
(cherry picked from commit 47e547d31f282e772674a8b17617fcd931693492)dev_chengFeng
parent
4ef8870c4d
commit
9f8b553626
|
@ -147,17 +147,18 @@ function this.RequestBlood(func)
|
|||
end
|
||||
|
||||
function this.EnterMap(mapId)
|
||||
if not MapManager.isInMap then
|
||||
mapId = 4001
|
||||
-- if not MapManager.isInMap then
|
||||
-- 进入地图编队,重新赋值一遍
|
||||
CarbonManager.difficulty = CARBON_TYPE.ENDLESS
|
||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, mapId)
|
||||
|
||||
else
|
||||
-- 在地图里又没勾新手引导, 无法进图
|
||||
if MapManager.curMapId == 0 then
|
||||
PopupTipPanel.ShowTip(Language[10361])
|
||||
end
|
||||
end
|
||||
-- else
|
||||
-- -- 在地图里又没勾新手引导, 无法进图
|
||||
-- if MapManager.curMapId == 0 then
|
||||
-- PopupTipPanel.ShowTip(Language[10361])
|
||||
-- end
|
||||
-- end
|
||||
end
|
||||
|
||||
function this.InitCompShow()
|
||||
|
|
|
@ -232,12 +232,12 @@ end
|
|||
|
||||
-- 无尽副本设置
|
||||
function this.EndLessCarbon()
|
||||
if MapManager.isInMap then
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_2:SetActive(false)
|
||||
this.root.btn_1_lab.text = Language[10726]
|
||||
else
|
||||
-- if MapManager.isInMap then
|
||||
-- this.root.bg:SetActive(true)
|
||||
-- this.root.btn_1:SetActive(true)
|
||||
-- this.root.btn_2:SetActive(false)
|
||||
-- this.root.btn_1_lab.text = Language[10726]
|
||||
-- else
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(false)
|
||||
this.root.btn_2:SetActive(true)
|
||||
|
@ -245,7 +245,7 @@ function this.EndLessCarbon()
|
|||
this.root.btn_2_lab.text = Language[10724]
|
||||
-- 进入副本显示设置
|
||||
MapManager.isCarbonEnter = true
|
||||
end
|
||||
-- end
|
||||
|
||||
this.root.formTip:SetActive(true)
|
||||
this.root.formTip:GetComponent("Text").text = Language[10727] .. gameConfig[1].EndlessMinLevel .. Language[10728]
|
||||
|
|
|
@ -86,6 +86,7 @@ end
|
|||
|
||||
-- 解析标记点的数据
|
||||
function this.InitMapNoteData(signs)
|
||||
LogPink("signs是:"..signs)
|
||||
-- 不是无尽副本,直接返回
|
||||
if CarbonManager.difficulty ~= CARBON_TYPE.ENDLESS then return end
|
||||
-- 初始化
|
||||
|
@ -104,9 +105,11 @@ function this.InitMapNoteData(signs)
|
|||
--Log("标记内容" .. data.noteInfo)
|
||||
local u, v = Map_Pos2UV(data.notePos)
|
||||
--Log("标记位置(" ..u .. ", " .. v .. ")")
|
||||
-- this.PointNoteDataList[data.mapId][data.notePos] = data
|
||||
this.PointNoteDataList[data.mapId][data.notePos] = data
|
||||
end
|
||||
end
|
||||
LogPink("#PointNoteDataList"..#this.PointNoteDataList)
|
||||
end
|
||||
|
||||
function this.InitRefreshPoint(refreshInfo, func)
|
||||
|
|
|
@ -202,8 +202,9 @@ function this.InitData(msg)
|
|||
end
|
||||
|
||||
-- 无尽副本
|
||||
LogRed(tostring(#msg.signs))
|
||||
if msg.signs then
|
||||
--Log("标记数量" .. #msg.signs)
|
||||
LogPurple("标记数量" .. #msg.signs)
|
||||
EndLessMapManager.InitMapNoteData(msg.signs)
|
||||
end
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ function this.GeneratePoint()
|
|||
|
||||
-- 初始化标记点
|
||||
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
for pos, data in pairs(EndLessMapManager.PointNoteDataList[MapManager.curMapId]) do
|
||||
for pos, data in pairs(EndLessMapManager.PointNoteDataList[4401]) do--MapManager.curMapId]) do
|
||||
this.OnAddNotePoint(pos, data.noteInfo)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue