diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 694a768125..19864a6a84 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2299,6 +2299,7 @@ BATTLE_TYPE = { FIGHTLEVEL = 20, --山河社稷图主关卡 FIGHT_ASSISTANT_LEVEL = 21, --山河社稷图副关卡战斗 BACK_BATTLE = 1000, -- 系统战斗回放 + EndlessMpaFight = 22, } rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true}, [2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true}, diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index c579fc8c5d..19226443f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -11,7 +11,7 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local endlessMorale = ConfigManager.GetConfig(ConfigName.endlessMorale) local endlessTreasure = ConfigManager.GetConfig(ConfigName.endlessTreasure) this.limiteLevel = 0 - +this.EndlessDrop = {} function this.Initialize() this.hungery = false -- 没有行动力了 this.leftEnergy = 0 -- 剩余行动力 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index 1e2c0ee90d..d5cf681bad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -57,9 +57,11 @@ function this:BindEvent() if MapManager.curCarbonType == CarBonTypeId.ENDLESS then NetManager.QuickFightRequest(function(msg) -- CarbonManager.InitQuickFightData(monsterGroupId, nil, msg) - + if msg.result == 1 then + EndLessMapManager.EndlessDrop = msg.enventDrop + end local fightData = BattleManager.GetBattleServerData(msg) - UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.MAP_FIGHT, function() + UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.EndlessMpaFight, function() --更新精气值 --LogGreen("战斗后的更新精气值:"..msg.essenceValue) MapTrialManager.powerValue = msg.essenceValue @@ -74,10 +76,6 @@ function this:BindEvent() -- 刷新数据 CarbonManager.InitQuickFightData(monsterGroupId, nil, msg) end, 0.2):Start() - -- if msg.result == 1 then - -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.enventDrop,1,function() - -- end) - -- end end) self:ClosePanel() end) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index ea77a3d830..a09721ac57 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -97,7 +97,7 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType) FightPointPassManager.FightBattleEnd() Util.GetGameObject(this.btnClose, "record"):SetActive(m_showRecord) Util.GetGameObject(this.btnClose,"tip"):SetActive(not fightType ==12)--副本内无法点击招募 - if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide() or MapManager.Mapping or fightType == BATTLE_TYPE.Test then--地图 + if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide() or MapManager.Mapping or fightType == BATTLE_TYPE.Test or fightType == BATTLE_TYPE.EndlessMpaFight then--地图 this.btnBattleBack:SetActive(false) else this.btnBattleBack:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index e2059bcb42..d309a56853 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -45,7 +45,7 @@ function BattleWinPopup:NextStep() return end if m_fightType == BATTLE_TYPE.MAP_FIGHT then --副本战斗结算 - UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() m_battlePanel:ClosePanel() self:ClosePanel() end, 1, true) + --UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() m_battlePanel:ClosePanel() self:ClosePanel() end, 1, true) -- local bestData, allDamage= BattleRecordManager.GetBattleBestData() -- FightPointPassManager.oldLevel = PlayerManager.level -- if bestData then @@ -83,6 +83,24 @@ function BattleWinPopup:NextStep() this.ShowBattleResultByFightLevelType(m_battleResult.drop) elseif m_fightType == BATTLE_TYPE.FIGHT_ASSISTANT_LEVEL then--山河社稷图副关卡 this.ShowBattleResultByFightLevelAssistantType(m_battleResult.drop) + elseif m_fightType == BATTLE_TYPE.EndlessMpaFight then + local bestData, allDamage= BattleRecordManager.GetBattleBestData() + FightPointPassManager.oldLevel = PlayerManager.level + if bestData then + UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId, bestData.skinId,bestData.damage, allDamage, function(_BattleBestPopup) + -- 打开关卡奖励界面 + UIManager.OpenPanel(UIName.RewardItemPopup, EndLessMapManager.EndlessDrop, 1,function() + if _BattleBestPopup then + _BattleBestPopup:ClosePanel() + end + if m_battlePanel then + m_battlePanel:ClosePanel() + end + self:ClosePanel() + Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold) + end,1, true, true) + end) + end --新回放功能 elseif m_fightType == BATTLE_TYPE.BACK_BATTLE then if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗