From ad3ca2e0d2a1d86576d5c119adca94b0d43c2611 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 26 Nov 2021 10:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=BD=A9=E8=BE=95=E5=AE=9D=E9=95=9C=EF=BC=8C=E5=83=A7?= =?UTF-8?q?=E7=BD=97=E5=B9=BB=E5=A2=83=E6=88=98=E6=96=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC=E5=9B=9E=E6=94=BE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=9B=9E=E6=94=BE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/GlobalDefine.lua | 13 ++++++++----- .../~Lua/Modules/Carbon/XuanYuanMirrorManager.lua | 2 +- .../~Lua/Modules/Map/ShowEnemyInfoPanel.lua | 2 +- .../~Lua/Modules/Popup/BattleWinPopup.lua | 6 ++++-- .../View/GeneralPopup_FightReturnLookFourEle.lua | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 318ca5a223..6d43b3a23a 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2574,7 +2574,8 @@ EXPEDITON_POPUP_TYPE={ BATTLE_TYPE = { Test = 0, -- 测试战斗 - BACK = 1, -- 战斗回放 + BACK = 1, -- 战斗回放, 回放后直接关闭战斗界面 + BACK_BATTLE = 1000, -- 系统战斗回放,回放后显示相应的奖励界面,需要在BattleWinPopup和BattleFailPopup中配置 MAP_FIGHT = 2, -- 地图内战斗 ELITE_MONSTER = 3, -- 精英怪 MONSTER_CAMP = 5, -- 兽潮 @@ -2594,11 +2595,13 @@ BATTLE_TYPE = { TASUILINGXIAO = 19, --踏碎凌霄 FIGHTLEVEL = 20, --山河社稷图主关卡 FIGHT_ASSISTANT_LEVEL = 21, --山河社稷图副关卡战斗 - BACK_BATTLE = 1000, -- 系统战斗回放 EndlessMpaFight = 22, -- 无尽副本 - QIJIE_FIGHT = 24, --七界试炼 - FOURELEMENT = 23, - LINGMAIMIJING = 25, --灵脉秘境 + FOURELEMENT = 23, -- 四灵试炼 + QIJIE_FIGHT = 24, -- 七界试炼 + LINGMAIMIJING = 25, -- 灵脉秘境 + XUAN_YUAN_MIRROR = 26, -- 轩辕宝镜 + TRIAL_FIGHT = 27, -- 森罗幻境 + } --isRankingMainPanelShow:_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 --0非跨服界面内排行榜(达人) --本服排行 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua index 97243f3771..7fb94a9ab9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua @@ -236,7 +236,7 @@ function this.ExecuteFightBattle(id,type,func) NetManager.StartSituationChallengeRequest(id,type,function(msg) if type == 1 then local fightData = BattleManager.GetBattleServerData(msg,0) - UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE,function(result) + UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.XUAN_YUAN_MIRROR,function(result) if func then func() end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index dc40fdc7eb..e929ddaf99 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -98,7 +98,7 @@ function this:BindEvent() local fightData = BattleManager.GetBattleServerData(msg) - UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE, function() + UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.TRIAL_FIGHT, function() --更新精气值 --LogGreen("战斗后的更新精气值:"..msg.essenceValue) MapTrialManager.powerValue = msg.essenceValue diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index 1ae1548600..f63854f098 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -55,12 +55,14 @@ function BattleWinPopup:NextStep() this.ShowBattleResultByFourElement(m_battleResult.drop) elseif m_fightType == BATTLE_TYPE.EXECUTE_FIGHT then -- 猎妖之路 this.ShowBattleResultByExpedition(m_battleResult.drop) - elseif m_fightType == BATTLE_TYPE.DAILY_CHALLENGE then -- 日常副本 + elseif m_fightType == BATTLE_TYPE.DAILY_CHALLENGE + or m_fightType == BATTLE_TYPE.XUAN_YUAN_MIRROR + or m_fightType == BATTLE_TYPE.TRIAL_FIGHT then -- 日常副本 m_battlePanel:ClosePanel() self:ClosePanel(m_battleResult.drop) elseif m_fightType == BATTLE_TYPE.GUILD_CAR_DELAY then -- 车迟 this.ShowBattleResultByCarDeleayType(m_battleResult.drop) elseif m_fightType == BATTLE_TYPE.XIAOYAOYOU then - if m_battlePanel then m_battlePanel:ClosePanel()end self:ClosePanel() + if m_battlePanel then m_battlePanel:ClosePanel()end self:ClosePanel() elseif m_fightType == BATTLE_TYPE.FIGHTLEVEL then--山河社稷图主关卡 this.ShowBattleResultByFightLevelType(m_battleResult.drop) elseif m_fightType == BATTLE_TYPE.FIGHT_ASSISTANT_LEVEL then--山河社稷图副关卡 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_FightReturnLookFourEle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_FightReturnLookFourEle.lua index 55c1ea85ec..7be644f393 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_FightReturnLookFourEle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_FightReturnLookFourEle.lua @@ -98,7 +98,7 @@ function this:SetSingleData(go,data,index) return else local fightData = BattleManager.GetBattleServerData(msg) - UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE,function(result) + UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.BACK,function(result) MonsterCampManager.CurOffsetIndex = waveId if MonsterCampManager.fourMonsterData[curType].openState ~= 0 then UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,curType)