From 9f8b55362614ba9c227ad07f71b930194de9b2fc Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 14 Aug 2020 11:44:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=82=BC=E5=89=AF=E6=9C=AC=E8=A1=A5?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 47e547d31f282e772674a8b17617fcd931693492) --- .../~Lua/Modules/Carbon/EndLessCarbonPanel.lua | 15 ++++++++------- .../Modules/Formation/View/CarbonFormation.lua | 14 +++++++------- .../~Lua/Modules/Map/EndLessMapManager.lua | 3 +++ .../~Lua/Modules/Map/MapManager.lua | 3 ++- .../~Lua/Modules/Map/View/PointHandleView.lua | 2 +- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index 7e336f28ba..f2de622d5b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -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() diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua index b538840978..96ff74340d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua @@ -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] diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index dc9026d2a9..8e14e15b6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua index 4715998054..b4791b5aed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua index 84bc020f9e..09849c3228 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua @@ -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