From 84efd33d1fac22ec23c5ff5e5488e302e492a0bc Mon Sep 17 00:00:00 2001
From: chenxi <xi_chen@juzugame.com>
Date: Mon, 5 Jun 2023 20:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BA=A2=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/task/task_main_ui.lua | 47 +++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua
index 2d53dd53..f9f93285 100644
--- a/lua/app/ui/task/task_main_ui.lua
+++ b/lua/app/ui/task/task_main_ui.lua
@@ -74,6 +74,15 @@ function TaskMainUI:initTaskList()
 	sortTask(self.challengeTaskList)
 end
 
+function TaskMainUI:onClose()
+	if self.menuOneRedPointTween then
+		self.menuOneRedPointTween:Kill()
+	end
+	if self.menuTwoRedPointTween then
+		self.menuTwoRedPointTween:Kill()
+	end
+end
+
 function TaskMainUI:onLoadRootComplete()
     self.uiMap = self.root:genAllChildren()
 	self.uiMap["task_main_ui.bg.close_btn"]:addClickListener(function()
@@ -106,6 +115,7 @@ function TaskMainUI:initPage()
 	menuOneOnTx:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_DAILY))
 	local menuOneOffTx = self.uiMap["task_main_ui.bg.menu_1.off.text"]
 	menuOneOffTx:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_DAILY))
+	self.menuOneRedPoint = self.uiMap["task_main_ui.bg.red_point_1"]
 
 	self.menuTwo = self.uiMap["task_main_ui.bg.menu_2"]
 	self.menuTwo:addClickListener(function()
@@ -117,6 +127,7 @@ function TaskMainUI:initPage()
 	menuTwoOnTx:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE))
 	local menuTwoOffTx = self.uiMap["task_main_ui.bg.menu_2.off.text"]
 	menuTwoOffTx:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE))
+	self.menuTwoRedPoint = self.uiMap["task_main_ui.bg.red_point_2"]
 	self:initDaily()
 	self:initChallenge()
 end
@@ -244,10 +255,22 @@ function TaskMainUI:switchPage(page)
 		self.challengeNode:setAnchoredPositionX(GConst.NOT_VISIBLE_POS)
 		self:refreshDaily()
 		if DataManager.DailyTaskData:getIsShowChallengeTaskRedPoint() then
-			self.menuTwoOff:addRedPoint(106, -52)
+			self.menuTwoRedPoint:setVisible(true)
+			if self.menuTwoRedPointTween == nil then
+				self.menuTwoRedPointTween = self:getShakeTween(self.menuTwoRedPoint)
+			else
+				self.menuTwoRedPointTween:Restart()
+			end
 		else
-			self.menuTwoOff:removeRedPoint()
+			if self.menuTwoRedPointTween then
+				self.menuTwoRedPointTween:Pause()
+			end
+			self.menuTwoRedPoint:setVisible(false)
 		end
+		if self.menuOneRedPointTween then
+			self.menuOneRedPointTween:Pause()
+		end
+		self.menuOneRedPoint:setVisible(false)
 	else
 		self.menuOneOn:setVisible(false)
 		self.menuOneOff:setVisible(true)
@@ -257,10 +280,22 @@ function TaskMainUI:switchPage(page)
 		self.challengeNode:setAnchoredPositionX(0)
 		self:refreshChallenge()
 		if DataManager.DailyTaskData:getIsShowDailyTaskRedPoint() then
-			self.menuOneOff:addRedPoint(106, -52)
+			self.menuOneRedPoint:setVisible(true)
+			if self.menuOneRedPointTween == nil then
+				self.menuOneRedPointTween = self:getShakeTween(self.menuOneRedPoint)
+			else
+				self.menuOneRedPointTween:Restart()
+			end
 		else
-			self.menuOneOff:removeRedPoint()
+			if self.menuOneRedPointTween then
+				self.menuOneRedPointTween:Pause()
+			end
+			self.menuOneRedPoint:setVisible(false)
 		end
+		if self.menuTwoRedPointTween then
+			self.menuTwoRedPointTween:Pause()
+		end
+		self.menuTwoRedPoint:setVisible(false)
 	end
 end
 
@@ -355,4 +390,8 @@ function TaskMainUI:updateTime()
 	self.timeTx:setText(GFunc.getTimeStrWithHMS2(self.resetTime))
 end
 
+function TaskMainUI:getShakeTween(obj)
+	return GFunc.getShakeSeq(obj, false, 1, true)
+end
+
 return TaskMainUI
\ No newline at end of file