森罗幻境bug修改
parent
73c6cc9582
commit
1796c48583
|
@ -282,7 +282,7 @@ function this.SetHeroHp(data,did,func)
|
||||||
v.heroHp=data[1]
|
v.heroHp=data[1]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)--第二个false 已经进入副本了 不需要设置选择第一个Hero
|
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,true)--第二个false 已经进入副本了 不需要设置选择第一个Hero
|
||||||
if func then func() end
|
if func then func() end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -61,15 +61,16 @@ function this:BindEvent()
|
||||||
if msg.result==1 then
|
if msg.result==1 then
|
||||||
MapTrialManager.SetKillCount(MapTrialManager.GetKilCount()+1)
|
MapTrialManager.SetKillCount(MapTrialManager.GetKilCount()+1)
|
||||||
end
|
end
|
||||||
|
--更新英雄HP
|
||||||
|
MapTrialManager.SetHeroHp(msg.remainHpList, MapTrialManager.selectHeroDid)
|
||||||
|
|
||||||
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
||||||
local fightData = BattleManager.GetBattleServerData(msg)
|
local fightData = BattleManager.GetBattleServerData(msg)
|
||||||
UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
|
UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
|
||||||
--更新精气值
|
--更新精气值
|
||||||
LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
||||||
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了
|
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了
|
||||||
MapTrialManager.powerValue = msg.essenceValue
|
MapTrialManager.powerValue = msg.essenceValue
|
||||||
--更新英雄HP
|
|
||||||
MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
|
|
||||||
--召唤Boss
|
--召唤Boss
|
||||||
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
|
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
|
||||||
-- Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointAdd, msg.cell.cellId,msg.cell.pointId)
|
-- Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointAdd, msg.cell.cellId,msg.cell.pointId)
|
||||||
|
@ -161,8 +162,8 @@ function this.SetSelectHero()
|
||||||
choosed:SetActive(true)
|
choosed:SetActive(true)
|
||||||
MapTrialManager.selectHeroDid=value.heroId
|
MapTrialManager.selectHeroDid=value.heroId
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(Language[11247])
|
PopupTipPanel.ShowTip(Language[11247])
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -325,13 +325,13 @@ local directFight = function(showType, eventId, showValues, options)
|
||||||
FormationManager.formationList[FormationTypeDef.FORMATION_DREAMLAND].teamPokemonInfos)
|
FormationManager.formationList[FormationTypeDef.FORMATION_DREAMLAND].teamPokemonInfos)
|
||||||
|
|
||||||
NetManager.QuickFightRequest(function(msg)
|
NetManager.QuickFightRequest(function(msg)
|
||||||
|
--更新英雄HP
|
||||||
|
MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
|
||||||
CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg)
|
CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg)
|
||||||
--更新精气值
|
--更新精气值
|
||||||
-- LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
-- LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
||||||
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了
|
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了
|
||||||
MapTrialManager.powerValue = msg.essenceValue
|
MapTrialManager.powerValue = msg.essenceValue
|
||||||
--更新英雄HP
|
|
||||||
MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
|
|
||||||
-- --召唤Boss
|
-- --召唤Boss
|
||||||
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
|
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
|
||||||
MapTrialManager.isHaveBoss = true
|
MapTrialManager.isHaveBoss = true
|
||||||
|
@ -339,6 +339,7 @@ local directFight = function(showType, eventId, showValues, options)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 起名字界面
|
-- 起名字界面
|
||||||
|
@ -540,6 +541,7 @@ function this.GetAllRewardTrigger()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
LogBlue("掉落物品的数量:"..#msg.boxDrop)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function()
|
UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function()
|
||||||
for i = 1, #msg.buffIds do--buff加成Tips
|
for i = 1, #msg.buffIds do--buff加成Tips
|
||||||
PopupTipPanel.ShowTip(FoodsConfig[msg.buffIds[i]].Desc)
|
PopupTipPanel.ShowTip(FoodsConfig[msg.buffIds[i]].Desc)
|
||||||
|
|
Loading…
Reference in New Issue