From 10e4e1ffc668e5f6dc176ec915470ef80a664d99 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Mon, 18 Sep 2023 16:38:13 +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                   | 4 ++++
 lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua    | 4 ++++
 lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua | 4 ++++
 lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua  | 7 +++++++
 lua/app/ui/battle/battle_ui_pvp.lua                | 9 +++++++++
 5 files changed, 28 insertions(+)

diff --git a/lua/app/common/audio_manager.lua b/lua/app/common/audio_manager.lua
index 11d78b31..a033a934 100644
--- a/lua/app/common/audio_manager.lua
+++ b/lua/app/common/audio_manager.lua
@@ -8,6 +8,9 @@ local AUDIO_CLIP = typeof(CS.UnityEngine.AudioClip)
 AudioManager.BGM_ID = {
     MAINCITY = "assets/arts/sounds/music/main_city.wav",
     BATTLE = "assets/arts/sounds/music/battle.wav",
+    ACT_PVP_CHOOSEBGM = "assets/arts/sounds/music/act_pvp_choosebgm.wav",
+    ACT_PVP_FIGHT = "assets/arts/sounds/music/act_pvp_fight.wav",
+    ACT_PVP_MAINBGM = "assets/arts/sounds/music/act_pvp_mainbgm.wav",
 }
 
 AudioManager.CLICK_ID = {
@@ -41,6 +44,7 @@ AudioManager.EFFECT_ID = {
     EQUIP_ARMOR_UP = "assets/arts/sounds/sfx/ui/armor_up.wav",
     DUNGEON_SMASH = "assets/arts/sounds/sfx/ui/smash.wav",
     STAR_GET = "assets/arts/sounds/sfx/ui/star_get.wav",
+    ACT_PVP_FINISH = "assets/arts/sounds/sfx/ui/act_pvp_finish.wav",
 }
 
 AudioManager.BO_EFFECT_ID = {
diff --git a/lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua b/lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua
index 75a2b8b9..a0cd88d4 100644
--- a/lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua
+++ b/lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua
@@ -27,6 +27,10 @@ function ActPvpMainUI:ctor()
 
 end
 
+function ActPvpMainUI:getBGMId()
+    return AudioManager.BGM_ID.ACT_PVP_MAINBGM
+end
+
 function ActPvpMainUI:getCurrencyParams()
     if self.currencyParams == nil then
         self.currencyParams = {
diff --git a/lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua b/lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua
index b4c19c6d..030066bc 100644
--- a/lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua
+++ b/lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua
@@ -14,6 +14,10 @@ function ActPvpPlayingUI:ctor()
 
 end
 
+function ActPvpPlayingUI:getBGMId()
+    return AudioManager.BGM_ID.ACT_PVP_MAINBGM
+end
+
 function ActPvpPlayingUI:getPrefabPath()
     return "assets/prefabs/ui/activity/act_pvp/act_pvp_playing_ui.prefab"
 end
diff --git a/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua b/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua
index c03b6d3f..aa32b34d 100644
--- a/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua
+++ b/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua
@@ -17,6 +17,10 @@ local BG_SPINE = {
 
 local SIMPLE_HERO_CELL = "app/ui/activity/act_pvp/cell/simple_hero_cell"
 
+function ActPvpSelectUI:getBGMId()
+    return AudioManager.BGM_ID.ACT_PVP_CHOOSEBGM
+end
+
 function ActPvpSelectUI:getPrefabPath()
     return "assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab"
 end
@@ -36,6 +40,7 @@ end
 function ActPvpSelectUI:_display()
     local curPairIds = DataManager.ActPvpData:getCurSelectPairId()
     if not curPairIds or not curPairIds[1] then
+        AudioManager:playEffect(AudioManager.EFFECT_ID.ACT_PVP_FINISH)
         self:closeUI()
         return
     end
@@ -148,6 +153,7 @@ function ActPvpSelectUI:_addListeners()
                 self:_display()
                 return
             end
+            self:disableUITouch()
             local targetPos = target:getBaseObject():getTransform().position
             local sPoint = UIManager:getUICameraComponent():WorldToScreenPoint(targetPos)
             targetPos = CS.BF.Utils.RectTransformScreenPointToLocalPointInRectangle(node:getTransform(), sPoint.x, sPoint.y, UIManager:getUICameraComponent())
@@ -162,6 +168,7 @@ function ActPvpSelectUI:_addListeners()
             self.aniSeq:Append(cell:getBaseObject():getTransform():DOAnchorPos(targetPos, 0.3))
             self.aniSeq:AppendCallback(function()
                 self:_display()
+                self:enableUITouch()
             end)
         elseif params and params.refreshHero then
             self:_display()
diff --git a/lua/app/ui/battle/battle_ui_pvp.lua b/lua/app/ui/battle/battle_ui_pvp.lua
index 7c42f0cf..033d3fac 100644
--- a/lua/app/ui/battle/battle_ui_pvp.lua
+++ b/lua/app/ui/battle/battle_ui_pvp.lua
@@ -156,6 +156,15 @@ end
 
 --------------------------------end必须重写的方法--------------------------------
 
+function BattleUIPVP:getBGMId()
+    if self.battleController then
+        if self.battleController.battleType == GConst.BattleConst.BATTLE_TYPE.ACT_PVP then
+            return AudioManager.BGM_ID.ACT_PVP_FIGHT
+        end
+    end
+    return AudioManager.BGM_ID.BATTLE
+end
+
 function BattleUIPVP:getPrefabPath()
     return "assets/prefabs/ui/battle/battle_ui_pvp.prefab"
 end