From f2047f18339e6c6007c7f68f6778bb5798b5a0cf Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Fri, 16 Jun 2023 10:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E5=86=85=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E5=AE=89=E5=8D=93=E8=BF=94=E5=9B=9E=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/battle/battle_pause_ui.lua       |  5 +++++
 lua/app/ui/battle/battle_ui.lua             | 17 +++++++++++++++++
 lua/app/ui/tips/battle_board_skill_tips.lua |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/lua/app/ui/battle/battle_pause_ui.lua b/lua/app/ui/battle/battle_pause_ui.lua
index 23bc6770..b508c3fc 100644
--- a/lua/app/ui/battle/battle_pause_ui.lua
+++ b/lua/app/ui/battle/battle_pause_ui.lua
@@ -9,6 +9,11 @@ local HIDE_ID = {
     [29] = true
 }
 
+-- 响应安卓后退事件
+function BattlePauseUI:onPressBackspace()
+    self:closeUI()
+end
+
 function BattlePauseUI:isFullScreen()
     return false
 end
diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua
index d62dfcb4..45372d46 100644
--- a/lua/app/ui/battle/battle_ui.lua
+++ b/lua/app/ui/battle/battle_ui.lua
@@ -23,6 +23,18 @@ local MAX_LASTSIBLING_TYPE = {
     [11] = true,
 }
 
+-- 响应安卓后退事件
+function BattleUI:onPressBackspace()
+    if self.battleBuffTipsRoot then
+        if self.battleBuffTipsRoot:getTransform().localScale.x > 0 then
+            self:hideBuffTips()
+            return
+        end
+    end
+
+    ModuleManager.BattleManager:showPauseUI(self.battleController.battleType)
+end
+
 function BattleUI:getPrefabPath()
     return "assets/prefabs/ui/battle/battle_ui.prefab"
 end
@@ -383,6 +395,11 @@ function BattleUI:showBuffTips(buffList, autoClose)
 end
 
 function BattleUI:hideBuffTips()
+    if self.autoCloseBuffSid then
+        self:unscheduleGlobal(self.autoCloseBuffSid)
+        self.autoCloseBuffSid = nil
+    end
+
     if not self.battleBuffTipsRoot then
         return
     end
diff --git a/lua/app/ui/tips/battle_board_skill_tips.lua b/lua/app/ui/tips/battle_board_skill_tips.lua
index 427500df..3dac4b06 100644
--- a/lua/app/ui/tips/battle_board_skill_tips.lua
+++ b/lua/app/ui/tips/battle_board_skill_tips.lua
@@ -6,6 +6,11 @@ local MIN_HEIGHT = 248
 local MAX_HEIGHT = 348
 local NO_SKILL_HRIGHT = 136
 
+-- 响应安卓后退事件
+function BattleBoardSkillTips:onPressBackspace()
+    self:closeUI()
+end
+
 function BattleBoardSkillTips:ctor(params)
     local elementType = params.elementType
 	self.params = params