diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index 6fa98a83d3..8b49569163 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -11759,8 +11759,8 @@ RectTransform: m_Father: {fileID: 4149605185548300908} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 9, y: 0} m_SizeDelta: {x: 0, y: 86} m_Pivot: {x: 0, y: 1} @@ -110820,7 +110820,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 46 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 4 m_MaxSize: 46 m_Alignment: 4 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index 50a3aa892b..dead15a16b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -183,7 +183,6 @@ function this.InitCompShow() end end this.bossGridText.text = config.Desc - local mapData = endLessConfig[EndLessMapManager.openMapId] this.miniMapName.text = config.Title end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index e475a8ad4b..5639f47bcd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -543,9 +543,17 @@ function EndLessMapView:SetTipShow() Log("MapManager.curMapId ========== " .. MapManager.curMapId) -- if not this:IsEndLessMap() then return end if not endLessData[MapManager.curMapId] then Log(Language[11278]) return end - this.areaName.text = GetLanguageStrById(endLessData[MapManager.curMapId].Info) - EndLessMapManager.curMapName = GetLanguageStrById(endLessData[MapManager.curMapId].Info) + local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.endlessDifficulty,"MapPool",EndLessMapManager.openMapId) + local lv = PlayerManager.level + local config = nil + for i = 1,#configs do + if lv >= configs[i].WorldLevel[1] and lv <= configs[i].WorldLevel[2] then + config = configs[i] + end + end + this.areaName.text = config.Title + EndLessMapManager.curMapName = config.Title end function EndLessMapView:InitBoolState()