From e68de8da6c8231729dd9d28d49d1f25d86380aeb Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Mon, 10 Jul 2023 15:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E5=BC=95=E5=AF=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/module/tutorial/tutorial_manager.lua |  3 +--
 lua/app/ui/arena/arena_match_ui.lua          |  5 -----
 lua/app/ui/tutorial/tutorial_ui.lua          | 10 ++++++++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lua/app/module/tutorial/tutorial_manager.lua b/lua/app/module/tutorial/tutorial_manager.lua
index a46cecd7..bbeba189 100644
--- a/lua/app/module/tutorial/tutorial_manager.lua
+++ b/lua/app/module/tutorial/tutorial_manager.lua
@@ -83,7 +83,6 @@ function TutorialManager:startTutorial()
 		self:finishAndNextTutorial(tutorialId)
 	else
 		-- 开始当前步骤的引导
-		self.tutorialUIComp:setVisible(true)
 		self.tutorialUIComp:onTutorialStart()
 		self.tutorialAction:doTutorial(tutorialId)
 	end
@@ -129,7 +128,7 @@ function TutorialManager:finishAndNextTutorial(tutorialId)
 
 	local haveNext = DataManager.TutorialData:nextTutorial()
 	if haveNext then
-		self.tutorialUIComp:setVisible(false)
+		self.tutorialUIComp:hideAllTips()
 		local delay = DataManager.TutorialData:getDelayStartTime()
 		self:performWithDelayGlobal(function()
 			self:startTutorial()
diff --git a/lua/app/ui/arena/arena_match_ui.lua b/lua/app/ui/arena/arena_match_ui.lua
index 4e2a1998..97c29253 100644
--- a/lua/app/ui/arena/arena_match_ui.lua
+++ b/lua/app/ui/arena/arena_match_ui.lua
@@ -94,11 +94,6 @@ function ArenaMatchUI:onLoadRootComplete()
 	self.btnFormation = uiMap["arena_match_ui.match_result.btn_formation"]
 	self.txFormation = uiMap["arena_match_ui.match_result.btn_formation.tx_formation"]
 
-	if DataManager.TutorialData:getIsInTutorial() then -- 容错
-		self.btnCancel:setTouchEnable(false)
-	else
-		self.btnCancel:setTouchEnable(true)
-	end
 	self.btnCancel:addClickListener(function()
 		self:closeUI()
 	end)
diff --git a/lua/app/ui/tutorial/tutorial_ui.lua b/lua/app/ui/tutorial/tutorial_ui.lua
index 28054768..26e302b6 100644
--- a/lua/app/ui/tutorial/tutorial_ui.lua
+++ b/lua/app/ui/tutorial/tutorial_ui.lua
@@ -70,6 +70,16 @@ function TutorialUI:onTutorialStart()
 	self:clearScheduler()
 end
 
+function TutorialUI:hideAllTips()
+	self:setBlockTouchEnabled(true)
+	-- 灰色遮罩
+	self:setMaskEnable(false)
+	-- 隐藏手指
+	self:hideGuideFinger()
+	-- 隐藏剧情文本
+	self:hideTalk()
+end
+
 -- 停止引导
 function TutorialUI:onTutorialStop()
 	self:clear()