From 7c0e51ff80d0b00e5c27cef68bc17b0cbebfbb79 Mon Sep 17 00:00:00 2001
From: chenxi <xi_chen@juzugame.com>
Date: Fri, 21 Apr 2023 20:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/common/audio_manager.lua      | 3 ++-
 lua/app/ui/battle/battle_ui.lua       | 5 ++++-
 lua/app/ui/main_city/main_city_ui.lua | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lua/app/common/audio_manager.lua b/lua/app/common/audio_manager.lua
index ef6800a7..96b41397 100644
--- a/lua/app/common/audio_manager.lua
+++ b/lua/app/common/audio_manager.lua
@@ -6,7 +6,8 @@ local MAX_EFFECT_NUM = 30
 local AUDIO_CLIP = typeof(CS.UnityEngine.AudioClip)
 
 AudioManager.BGM_ID = {
-    MAINCITY = "assets/arts/sounds/music/bgm_main.wav",
+    MAINCITY = "assets/arts/sounds/music/main_city.wav",
+    BATTLE = "assets/arts/sounds/music/battle.wav",
 }
 
 AudioManager.CLICK_ID = {
diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua
index db7191af..b2ee218a 100644
--- a/lua/app/ui/battle/battle_ui.lua
+++ b/lua/app/ui/battle/battle_ui.lua
@@ -10,7 +10,6 @@ local BOARD_POS_UP = BF.Vector2(0, 47)
 local BOARD_POS_DOWN = BF.Vector2(0, -740)
 local BG_PATH = "assets/arts/textures/background/battle/%s.png"
 local CacheVector2 = CS.UnityEngine.Vector2(0, 0)
-local CacheVector3 = CS.UnityEngine.Vector3(0, 0, 0)
 
 function BattleUI:getPrefabPath()
     return "assets/prefabs/ui/battle/battle_ui.prefab"
@@ -20,6 +19,10 @@ function BattleUI:onClose()
 	self:clear()
 end
 
+function BattleUI:getBGMId()
+    return AudioManager.BGM_ID.BATTLE
+end
+
 function BattleUI:onLoadRootComplete()
     self:_display()
     self:_addListeners()
diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua
index 8fcb6d4d..10f0285a 100644
--- a/lua/app/ui/main_city/main_city_ui.lua
+++ b/lua/app/ui/main_city/main_city_ui.lua
@@ -21,6 +21,10 @@ function MainCityUI:getUIType()
 	return UIManager.UI_TYPE.MAIN
 end
 
+function MainCityUI:getBGMId()
+    return AudioManager.BGM_ID.MAINCITY
+end
+
  function MainCityUI:getCurrencyParams()
     if self.currencyParams == nil then
         self.currencyParams = {