From 10ea4ca1144e37ec8936f51a9fa3657ab13fe364 Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Fri, 21 Jul 2023 11:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=A1=8C=E8=AF=81=E8=B5=9B=E5=AD=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/bounty/bounty_main_ui.lua    | 15 +++++++++------
 lua/app/userdata/bounty/bounty_data.lua | 10 +++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lua/app/ui/bounty/bounty_main_ui.lua b/lua/app/ui/bounty/bounty_main_ui.lua
index 11909973..ed271ad4 100644
--- a/lua/app/ui/bounty/bounty_main_ui.lua
+++ b/lua/app/ui/bounty/bounty_main_ui.lua
@@ -67,12 +67,15 @@ function BountyMainUI:onLoadRootComplete()
 end
 
 function BountyMainUI:initTitle()
-	self.titleSpine = self.uiMap["bounty_main_ui.top_node.ui_spine_obj"]
-	local trackEntry = self.titleSpine:playAnim("born", false)
-    local time = self.titleSpine:getAnimation(trackEntry).Duration
-    self:performWithDelayGlobal(function()
-        self.titleSpine:playAnim("idle", true)
-    end, time)
+	self.titleSpine = self.uiMap["bounty_main_ui.top_node.spine_title"]
+
+	self.titleSpine:setVisible(false)
+	self.titleSpine:loadAssetAsync(DataManager.BountyData:getBannerSpineName(), function()
+		self.titleSpine:setVisible(true)
+		self.titleSpine:playAnimComplete("born", false, true, function()
+			self.titleSpine:playAnim("idle", true, true, true)
+		end, true)
+	end, false)
 end
 
 function BountyMainUI:initTime()
diff --git a/lua/app/userdata/bounty/bounty_data.lua b/lua/app/userdata/bounty/bounty_data.lua
index f90b7f51..5c213684 100644
--- a/lua/app/userdata/bounty/bounty_data.lua
+++ b/lua/app/userdata/bounty/bounty_data.lua
@@ -168,13 +168,21 @@ function BountyData:getIsOpen()
 end
 
 function BountyData:getBannerName()
-    return "bounty_btn_main_1"
+    return "bounty_btn_main_" .. self.season
 end
 
 function BountyData:getRewardBannerName()
     return "bounty_btn_main_0"
 end
 
+function BountyData:getBannerSpineName()
+    if self.season == 1 then
+        return "ui_bounty_banner"
+    else
+        return "ui_bounty_banner_" .. self.season
+    end
+end
+
 function BountyData:getSeason()
     return self.season
 end