From 1796c48583b22406908c5f1c849a43ec34ce9dc5 Mon Sep 17 00:00:00 2001 From: 2han9B1a0 Date: Thu, 2 Jul 2020 20:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Map/MapTrialManager.lua | 2 +- .../~Lua/Modules/Map/ShowEnemyInfoPanel.lua | 17 +++++++++-------- .../~Lua/Modules/Mission/MissionManager.lua | 6 ++++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index 2d70fad7c3..630b7ccac6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -282,7 +282,7 @@ function this.SetHeroHp(data,did,func) v.heroHp=data[1] 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 end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index af4f1dbd0c..a2e3eae939 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -61,15 +61,16 @@ function this:BindEvent() if msg.result==1 then MapTrialManager.SetKillCount(MapTrialManager.GetKilCount()+1) end + --更新英雄HP + MapTrialManager.SetHeroHp(msg.remainHpList, MapTrialManager.selectHeroDid) + CarbonManager.InitQuickFightData(monsterGroupId, nil, msg) local fightData = BattleManager.GetBattleServerData(msg) UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function() - --更新精气值 - LogGreen("战斗后的更新精气值:"..msg.essenceValue) - -- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了 - MapTrialManager.powerValue = msg.essenceValue - --更新英雄HP - MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid) + --更新精气值 + LogGreen("战斗后的更新精气值:"..msg.essenceValue) + -- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了 + MapTrialManager.powerValue = msg.essenceValue --召唤Boss if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then -- Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointAdd, msg.cell.cellId,msg.cell.pointId) @@ -161,8 +162,8 @@ function this.SetSelectHero() choosed:SetActive(true) MapTrialManager.selectHeroDid=value.heroId Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false) - else - PopupTipPanel.ShowTip(Language[11247]) + else + PopupTipPanel.ShowTip(Language[11247]) end end) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua index a2e898e9f8..c1aeeb5b7e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua @@ -325,13 +325,13 @@ local directFight = function(showType, eventId, showValues, options) FormationManager.formationList[FormationTypeDef.FORMATION_DREAMLAND].teamPokemonInfos) NetManager.QuickFightRequest(function(msg) + --更新英雄HP + MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid) CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg) --更新精气值 -- LogGreen("战斗后的更新精气值:"..msg.essenceValue) -- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了 MapTrialManager.powerValue = msg.essenceValue - --更新英雄HP - MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid) -- --召唤Boss if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then MapTrialManager.isHaveBoss = true @@ -339,6 +339,7 @@ local directFight = function(showType, eventId, showValues, options) end end) end + Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false) end -- 起名字界面 @@ -540,6 +541,7 @@ function this.GetAllRewardTrigger() end end + LogBlue("掉落物品的数量:"..#msg.boxDrop) UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function() for i = 1, #msg.buffIds do--buff加成Tips PopupTipPanel.ShowTip(FoodsConfig[msg.buffIds[i]].Desc)