From b395ea2804d32209c6c9ce8f7ddcdfcdc101deee Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 8 Sep 2020 20:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E8=B7=B3=E8=BF=8730?= =?UTF-8?q?=E7=BA=A7=E5=90=8E=E8=A7=A3=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 2 +- .../ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a144fd3482..894e1070d4 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2048,6 +2048,7 @@ BATTLE_TYPE = { Senro = 12, -- 森罗幻境 Xuanyuan = 13, -- 轩辕宝镜 GuildTranscript = 14, -- 公会副本 + ARENA = 15, -- 竞技场 } rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true}, [2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true}, diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua index 367ffa68ed..c6e4fc57ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua @@ -250,7 +250,7 @@ end --- doneFunc 战斗播放完成要回调的事件 function this.RequestReplayRecord(isWin, fightData, nameStr, doneFunc) local fightData = BattleManager.GetBattleServerData({fightData = fightData}, 1) - local battlePanel = UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.BACK, doneFunc) + local battlePanel = UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.ARENA, doneFunc) battlePanel:ShowNameShow(isWin, nameStr) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 7c23e5f667..02d59e6547 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -675,7 +675,7 @@ function this.GetBattleBg(fightType) if fightType == BATTLE_TYPE.STORY_FIGHT then local curChapter = FightPointPassManager.GetCurChapterIndex() index = math.floor((curChapter - 1) % 5 + 1) - elseif fightType == BATTLE_TYPE.BACK then + elseif fightType == BATTLE_TYPE.BACK or fightType == BATTLE_TYPE.ARENA then index = 1001 elseif fightType == BATTLE_TYPE.EXECUTE_FIGHT then index = 1002 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index b8e94fd447..b0768f3f62 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -83,7 +83,7 @@ function this:BindEvent() local pauseTime = 31 Util.AddClick(this.BtnExit, function () if not BattleManager.IsUnlockBattlePass() then - PopupTipPanel.ShowTip(PrivilegeManager.GetPrivilegeOpenTip(isBack and PRIVILEGE_TYPE.SkipFight or PRIVILEGE_TYPE.ExitFight )) + PopupTipPanel.ShowTip(PrivilegeManager.GetPrivilegeOpenTip(PRIVILEGE_TYPE.SkipFight)) return end if BattleLogic.IsEnd or not BattleManager.IsCanOperate() then @@ -377,7 +377,7 @@ function this.ShowBattleResult(result, msg) UIManager.ClosePanel(UIName.ElementPopup) end -- 回放直接关闭界面 - if fightType == BATTLE_TYPE.BACK then + if fightType == BATTLE_TYPE.BACK or fightType == BATTLE_TYPE.ARENA then this:ClosePanel() return end