From e174e24bc1c5204f911d2dc5049cd2caa65e2e06 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 18 Nov 2021 10:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E8=84=89=E7=A7=98=E5=A2=83?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/LingMaiMiJin/LingMaiMiJingPanel.prefab | 4 +- .../~Lua/Modules/Battle/View/BattlePanel.lua | 24 +++++++++++ .../Formation/View/LingMaiFormation.lua | 40 +++++++++++-------- .../LingMaiMiJing/LingMaiMiJingPanel.lua | 4 +- 4 files changed, 51 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index ffa8356025..5d09a76390 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -376,7 +376,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -456,7 +456,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index e758b2851a..c1e530f689 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -534,6 +534,8 @@ function this.ShowBattleResult(result, msg) end elseif fightType == BATTLE_TYPE.TASUILINGXIAO then this.ShowBattleResultByTaSuiLingXiao() + elseif fightType == BATTLE_TYPE.LINGMAIMIJING then + this:ClosePanel() else LogRed("result:"..tostring(result)) if result == 0 then -- 失败 @@ -671,6 +673,28 @@ function this.ShowBattleResultByTaSuiLingXiao() end, 0.1):Start() end +function this.ShowBattleResultByLingMaiMiJing() + -- 延时执行避免事件冲突 + Timer.New(function() + local bestData, allDamage= BattleRecordManager.GetBattleBestData() + if bestData then + -- 胜利显示本场比赛的表现最好的英雄 + UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup) + -- 打开关卡奖励界面 + UIManager.OpenPanel(UIName.RewardItemPopup, CommonActPageManager.TaSuiLingXiaoMsg.drop, 1,function(isBackBattle) + LogPink("isBackBattle "..tostring(isBackBattle)) + if not isBackBattle then + if _BattleBestPopup then + _BattleBestPopup:ClosePanel() + end + this:ClosePanel() + end + end, 7,true,true) + end) + end + end, 0.1):Start() +end + -- 战斗波次变化回调 function this.OnOrderChanged(order) -- body diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua index 4e9d40ef30..4882c20aaf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua @@ -74,23 +74,29 @@ function this.StartFight() else NetManager.LingMaiBattleRequest(this.nodeData.Id,function (msg) this.root:ClosePanel() - local arg = {} - arg.panelType=2 - LogRed("msg.result:"..tostring(msg.result)) - arg.result = msg.result - arg.blue = {} - arg.blue.uid = PlayerManager.uid - arg.blue.name = PlayerManager.nickName - arg.blue.head = PlayerManager.head - arg.blue.frame = HeadManager.GetCurFrameId() - arg.red= {} - arg.red.uid = this.nodeData.uid - arg.red.name = this.nodeData.name - arg.red.head = this.nodeData.head - arg.red.frame = this.nodeData.headFrame - - -- 不用回放直接显示结果 - UIManager.OpenPanel(UIName.ArenaResultPopup, arg) + + + local fightData = BattleManager.GetBattleServerData(msg) + LingMaiMiJingManager.battleResult = msg + UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.LINGMAIMIJING,function () + local arg = {} + arg.panelType=2 + LogRed("msg.result:"..tostring(msg.result)) + arg.result = msg.result + arg.blue = {} + arg.blue.uid = PlayerManager.uid + arg.blue.name = PlayerManager.nickName + arg.blue.head = PlayerManager.head + arg.blue.frame = HeadManager.GetCurFrameId() + arg.red= {} + arg.red.uid = this.nodeData.uid + arg.red.name = this.nodeData.name + arg.red.head = this.nodeData.head + arg.red.frame = this.nodeData.headFrame + -- 不用回放直接显示结果 + UIManager.OpenPanel(UIName.ArenaResultPopup, arg) + end):SetResult(msg.result) + end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index a8cbc4ac4e..38d93ee1cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -78,8 +78,8 @@ function LingMaiMiJingPanel:BindEvent() Util.AddClick(self.jumpBtn,function() if self.inputField.text ~= "" then local num = tonumber(self.inputField.text) - if num > 250 then - num = 250 + if num > 50 then + num = 50 elseif num < 0 then num = 1 end