diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index d79af4e724..bcb30a254b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1094,38 +1094,38 @@ function this:Update() end end - if Input.GetMouseButtonDown(1) then - if ActTimeCtrlManager.SingleFuncState(30) then - CarbonManager.difficulty = 2 - local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig) + -- if Input.GetMouseButtonDown(1) then + -- if ActTimeCtrlManager.SingleFuncState(30) then + -- CarbonManager.difficulty = 2 + -- local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig) - if MapTrialManager.curTowerLevel>10000 then - MapManager.curMapId = MapTrialManager.GetSurprisedLevelMapId() - else - MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId - end - NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg) - MapManager.isReloadEnter = false - MapTrialManager.firstEnter = true - MapManager.SetViewSize(20)--设置视野范围(明雷形式) - MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND - MapManager.trialHeroInfo=msg.infos - SwitchPanel.OpenPanel(UIName.MapPanel) - end) + -- if MapTrialManager.curTowerLevel>10000 then + -- MapManager.curMapId = MapTrialManager.GetSurprisedLevelMapId() + -- else + -- MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId + -- end + -- NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg) + -- MapManager.isReloadEnter = false + -- MapTrialManager.firstEnter = true + -- MapManager.SetViewSize(20)--设置视野范围(明雷形式) + -- MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND + -- MapManager.trialHeroInfo=msg.infos + -- SwitchPanel.OpenPanel(UIName.MapPanel) + -- end) - -- local curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId - -- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, curMapId) - -- UIManager.OpenPanel(UIName.TrialCarbonPanel) - -- RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "Trial", 1) - -- CheckRedPointStatus(RedPointType.EpicExplore_OpenCarbon) - -- this.RefreshOpenText(CARBON_TYPE.TRIAL, FUNCTION_OPEN_TYPE.TRIAL) - -- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.TRIAL) - -- LogBlue(Language[11163]) - else - PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL)) - end - end + -- -- local curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId + -- -- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, curMapId) + -- -- UIManager.OpenPanel(UIName.TrialCarbonPanel) + -- -- RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "Trial", 1) + -- -- CheckRedPointStatus(RedPointType.EpicExplore_OpenCarbon) + -- -- this.RefreshOpenText(CARBON_TYPE.TRIAL, FUNCTION_OPEN_TYPE.TRIAL) + -- -- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.TRIAL) + -- -- LogBlue(Language[11163]) + -- else + -- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL)) + -- end + -- end end -- 刷新功能显示 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua index 6ca5d365bb..938d2c79a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua @@ -124,6 +124,7 @@ function this.AwakeInit(go, mapId, wakeCells, tileV2) _tileVMaxNum = _mapData.vLen local u, v + LogRed("这里是根据已经走过的cell设置地图,waleCells数量:"..#wakeCells) for i=1, #wakeCells do u, v = Map_Pos2UV(wakeCells[i]) _mapData:UpdateFogArea(u, v, this.fogSize) @@ -312,7 +313,6 @@ function this.UpdateWarFog(u, v, fogSize) end end, delayTime):Start() - LogRed("这里是干什么的") -- 不显示迷雾直接刷新 if not this.isShowFog then if _tileLivePool[pos] then diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index d96c13f456..66ce9ef364 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -252,7 +252,7 @@ function this.SetMapFog() local mapId = MapManager.curMapId local fogVal = ChallengeMapConfig[mapId].isShowFog - LogPink("地图初始化迷雾"..tostring(fogVal)) + LogPink("地图初始化迷雾:"..tostring(fogVal)) if fogVal and fogVal == 0 then TileMapView.isShowFog = false else @@ -484,7 +484,7 @@ function this.RefreshShow() pointHandleView.leaderMapData = playerView.leaderMapData pointHandleView.RefreshShow() end - + function this.OnMapOut(outType) --出图不需要发协议了 Log("outType ====== " .. outType) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua index 83f61c5c0e..f0680d1035 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua @@ -382,7 +382,7 @@ end function this.ShowSawPoints() if CarbonManager.difficulty ~= CARBON_TYPE.ENDLESS then return end - LogYellow("#MapManager.wakeCells"..#MapManager.wakeCells) + LogYellow("#MapManager.wakeCells:"..#MapManager.wakeCells) if #MapManager.wakeCells == 0 then Log(Language[11322]) return end for pos, point in pairs(this.EventPoint) do local u0, v0 = Map_Pos2UV(pos)