森罗bug修改
parent
a9f8f39280
commit
9b28e7c140
|
@ -501,7 +501,7 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||||
-- 试炼副本才有的字段
|
-- 试炼副本才有的字段
|
||||||
if msg.essenceValue then
|
if msg.essenceValue then
|
||||||
LogPink(Language[10294] .. msg.essenceValue)
|
-- LogPink(Language[10294] .. msg.essenceValue)
|
||||||
|
|
||||||
-- 判断是否可寻路标志
|
-- 判断是否可寻路标志
|
||||||
if msg.essenceValue >= 100 then
|
if msg.essenceValue >= 100 then
|
||||||
|
@ -511,7 +511,7 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
|
||||||
end
|
end
|
||||||
-- -1添加Boss点 -2添加传送门点
|
-- -1添加Boss点 -2添加传送门点
|
||||||
if MapTrialManager.powerValue >= 100 or MapTrialManager.powerValue == -1 or MapTrialManager.powerValue == -2 then
|
if MapTrialManager.powerValue >= 100 or MapTrialManager.powerValue == -1 or MapTrialManager.powerValue == -2 then
|
||||||
LogPink(Language[10295])
|
-- LogPink(Language[10295])
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointAdd, MapTrialManager.cell.cellId, MapTrialManager.cell.pointId)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointAdd, MapTrialManager.cell.cellId, MapTrialManager.cell.pointId)
|
||||||
end
|
end
|
||||||
MapTrialManager.UpdatePowerValue(msg.essenceValue)
|
MapTrialManager.UpdatePowerValue(msg.essenceValue)
|
||||||
|
|
|
@ -111,18 +111,18 @@ function this.InitData(msg)
|
||||||
end
|
end
|
||||||
Log(Language[11191] .. this.totalTime)
|
Log(Language[11191] .. this.totalTime)
|
||||||
|
|
||||||
-- 复活剩余时间]
|
-- -- 复活剩余时间]
|
||||||
if msg.reviveTime then
|
-- if msg.reviveTime then
|
||||||
this.deadTime = msg.reviveTime
|
-- this.deadTime = msg.reviveTime
|
||||||
--Log("死亡剩余时间 " .. this.deadTime)
|
-- --Log("死亡剩余时间 " .. this.deadTime)
|
||||||
|
|
||||||
end
|
-- end
|
||||||
|
|
||||||
-- 死亡次数
|
-- -- 死亡次数
|
||||||
if msg.dieCount then
|
-- if msg.dieCount then
|
||||||
this.deadCount = msg.dieCount
|
-- this.deadCount = msg.dieCount
|
||||||
--Log("在地图里死亡" .. this.deadCount.. "次")
|
-- --Log("在地图里死亡" .. this.deadCount.. "次")
|
||||||
end
|
-- end
|
||||||
|
|
||||||
|
|
||||||
local time = msg.leftTime
|
local time = msg.leftTime
|
||||||
|
@ -267,7 +267,7 @@ function this.DeletePos(mapPointId)
|
||||||
for i, v in pairs(MapManager.mapPointList) do
|
for i, v in pairs(MapManager.mapPointList) do
|
||||||
if v then
|
if v then
|
||||||
if v == mapPointId then
|
if v == mapPointId then
|
||||||
Log(Language[11193] .. v .. Language[11194] .. i)
|
-- Log(Language[11193] .. v .. Language[11194] .. i)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove, i)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove, i)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -483,9 +483,6 @@ end
|
||||||
|
|
||||||
function this.MapUpdateEvent(pos, func)
|
function this.MapUpdateEvent(pos, func)
|
||||||
NetManager.MapUpdateEvent(pos, function (eventId)
|
NetManager.MapUpdateEvent(pos, function (eventId)
|
||||||
--Log("event.eventId "..eventId)
|
|
||||||
--Log("point.pos2 "..pos)
|
|
||||||
|
|
||||||
-- 试炼召唤Boss需要向服务器同步一次,发送-1000, 此时不赋值
|
-- 试炼召唤Boss需要向服务器同步一次,发送-1000, 此时不赋值
|
||||||
if pos ~= -1000 then
|
if pos ~= -1000 then
|
||||||
MapManager.curTriggerPos = pos
|
MapManager.curTriggerPos = pos
|
||||||
|
|
|
@ -610,12 +610,11 @@ function this.TrialChangeFloor(nextMapId, msg)
|
||||||
end
|
end
|
||||||
SwitchPanel.OpenPanel(UIName.MapPanel)
|
SwitchPanel.OpenPanel(UIName.MapPanel)
|
||||||
MapTrialManager.isChangeLevel = false
|
MapTrialManager.isChangeLevel = false
|
||||||
if not MapTrialManager.IsFinalLevel() then
|
if MapTrialManager.curTowerLevel<10000 then
|
||||||
MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1
|
MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1
|
||||||
end
|
end
|
||||||
--设置 进入下一层后领取全部奖励
|
--设置 进入下一层后领取全部奖励
|
||||||
MissionManager.GetAllRewardTrigger()
|
MissionManager.GetAllRewardTrigger()
|
||||||
LogGreen(MapTrialManager.selectHeroDid)
|
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,6 @@ function this:BindEvent()
|
||||||
UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
|
UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
|
||||||
--更新精气值
|
--更新精气值
|
||||||
LogGreen(Language[12222]..msg.essenceValue)
|
LogGreen(Language[12222]..msg.essenceValue)
|
||||||
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了
|
|
||||||
MapTrialManager.powerValue = msg.essenceValue
|
MapTrialManager.powerValue = msg.essenceValue
|
||||||
--召唤Boss
|
--召唤Boss
|
||||||
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
|
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
|
||||||
|
|
|
@ -233,7 +233,6 @@ function this.UpdatePowerValue()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.PlayEffect()
|
function this.PlayEffect()
|
||||||
Log(Language[11254])
|
|
||||||
if MapTrialManager.powerValue == -1 or MapTrialManager.powerValue == 0 then
|
if MapTrialManager.powerValue == -1 or MapTrialManager.powerValue == 0 then
|
||||||
this.UpdatePowerValue()
|
this.UpdatePowerValue()
|
||||||
else
|
else
|
||||||
|
@ -585,7 +584,6 @@ function this.KillAllBitch()
|
||||||
for i = 1, #pointData do
|
for i = 1, #pointData do
|
||||||
local mapPointId = pointData[i][1]
|
local mapPointId = pointData[i][1]
|
||||||
if mapPointId then
|
if mapPointId then
|
||||||
Log(Language[11266] .. mapPointId)
|
|
||||||
MapManager.DeletePos(mapPointId)
|
MapManager.DeletePos(mapPointId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -397,7 +397,6 @@ function this.OnAddPoint(pos, pointId)
|
||||||
-- LogPink("pointId "..pointId)
|
-- LogPink("pointId "..pointId)
|
||||||
if pos and not this.EventPoint[pos] then
|
if pos and not this.EventPoint[pos] then
|
||||||
local u, v = Map_Pos2UV(pos)
|
local u, v = Map_Pos2UV(pos)
|
||||||
LogPink(u.." "..v)
|
|
||||||
this.GenEventPoint(u, v, pointId)
|
this.GenEventPoint(u, v, pointId)
|
||||||
-- 在MapManager中添加新增的地图点
|
-- 在MapManager中添加新增的地图点
|
||||||
-- 如果增加的点是一个需要亮的点
|
-- 如果增加的点是一个需要亮的点
|
||||||
|
@ -422,10 +421,8 @@ function this.OnAddPoint(pos, pointId)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.OnRemovePoint(mapPointPos)
|
function this.OnRemovePoint(mapPointPos)
|
||||||
Log("removePoint:"..mapPointPos)
|
|
||||||
local u, v = Map_Pos2UV(mapPointPos) -- 当前位置坐标
|
local u, v = Map_Pos2UV(mapPointPos) -- 当前位置坐标
|
||||||
local mapPointId = MapManager.mapPointList[mapPointPos]
|
local mapPointId = MapManager.mapPointList[mapPointPos]
|
||||||
Log(Language[11323] .. mapPointId)
|
|
||||||
if MapPointConfig[mapPointId].Style == 8 then
|
if MapPointConfig[mapPointId].Style == 8 then
|
||||||
TileMapView.GetTileData(u, v).val = 0
|
TileMapView.GetTileData(u, v).val = 0
|
||||||
else
|
else
|
||||||
|
|
|
@ -395,9 +395,7 @@ function this.MapOutRequest(outType, func, nextMapId)
|
||||||
PlayerManager.curMapId = 0
|
PlayerManager.curMapId = 0
|
||||||
MapManager.curMapId = 0
|
MapManager.curMapId = 0
|
||||||
MapManager.isInMap = false
|
MapManager.isInMap = false
|
||||||
-- MapTrialManager.UpdatePowerValue(0)
|
|
||||||
MapTrialManager.SetBossState(0)
|
MapTrialManager.SetBossState(0)
|
||||||
--SubmitExtraData({ type = SDKSubMitType.TYPE_EXIT_COPY })
|
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,8 @@ function this:BindEvent()
|
||||||
elseif MapTrialManager.curTowerLevel>10000 then
|
elseif MapTrialManager.curTowerLevel>10000 then
|
||||||
PopupTipPanel.ShowTip("奖励层不可使用炸弹~")
|
PopupTipPanel.ShowTip("奖励层不可使用炸弹~")
|
||||||
return
|
return
|
||||||
|
elseif usedNum>=5 then
|
||||||
|
PopupTipPanel.ShowTip("炸弹使用已达最大次数~")
|
||||||
else
|
else
|
||||||
NetManager.RequestUseBomb(function (msg)--请求使用炸弹
|
NetManager.RequestUseBomb(function (msg)--请求使用炸弹
|
||||||
parent:ClosePanel()
|
parent:ClosePanel()
|
||||||
|
@ -102,7 +104,7 @@ function this.RefreshPanel()
|
||||||
item:OnOpen(false, {itemId,1}, 1.2,false,false,false,sortingOrder)
|
item:OnOpen(false, {itemId,1}, 1.2,false,false,false,sortingOrder)
|
||||||
item:Reset({itemId,1},ItemType.NoType,{nil,false,nil,false})
|
item:Reset({itemId,1},ItemType.NoType,{nil,false,nil,false})
|
||||||
this.num.text=Language[11657]..itemNum
|
this.num.text=Language[11657]..itemNum
|
||||||
this.leftTime.text=Language[11656]..trialSetting[1].PrivilegeReward[2]-usedNum
|
this.leftTime.text=Language[11656]..(usedNum>=5 and 0 or (trialSetting[1].PrivilegeReward[2]-usedNum))
|
||||||
end
|
end
|
||||||
|
|
||||||
return this
|
return this
|
Loading…
Reference in New Issue