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