From b18ad8487abfd740e769384d8259fbacbd017fe9 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 26 Mar 2021 12:15:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91casting?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=89=93=E5=BC=801=E7=A7=92=E5=90=8E?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/BattleView.lua | 2 +- .../~Lua/Modules/Popup/BattleFailPopup.lua | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index ccc7556c92..ce403c93de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -180,7 +180,7 @@ function this:OnSortingOrderChange(battleSorting) this.FirstEffect:GetComponent("Canvas").sortingOrder = battleSorting + 30 this.skillEffectRoot:GetComponent("Canvas").sortingOrder = battleSorting + 40 - local skillSorting = battleSorting + 300 + local skillSorting = battleSorting + 90 this.mySkillCast:GetComponent("Canvas").sortingOrder = skillSorting this.enemySkillCast:GetComponent("Canvas").sortingOrder = skillSorting diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index cb0717208f..ac02c8cff6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -17,8 +17,12 @@ end --绑定事件(用于子类重写) function BattleFailPopup:BindEvent() - Util.AddClick(this.btnClose, function () + -- 三秒后才能关闭 + if GetTimeStamp() - this.openTime < 1 then + return + end + this.ClosePanelRefreshData() if m_battlePanel then m_battlePanel:ClosePanel() @@ -70,6 +74,7 @@ end --界面打开时调用(用于子类重写) function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType) + this.openTime = GetTimeStamp() LogGreen("isBackBattle = false") isBackBattle = false if battlePanel then