This commit is contained in:
xiekaidong 2023-09-18 16:38:13 +08:00
parent 6ed811ca75
commit 10e4e1ffc6
5 changed files with 28 additions and 0 deletions

View File

@ -8,6 +8,9 @@ local AUDIO_CLIP = typeof(CS.UnityEngine.AudioClip)
AudioManager.BGM_ID = { AudioManager.BGM_ID = {
MAINCITY = "assets/arts/sounds/music/main_city.wav", MAINCITY = "assets/arts/sounds/music/main_city.wav",
BATTLE = "assets/arts/sounds/music/battle.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 = { AudioManager.CLICK_ID = {
@ -41,6 +44,7 @@ AudioManager.EFFECT_ID = {
EQUIP_ARMOR_UP = "assets/arts/sounds/sfx/ui/armor_up.wav", EQUIP_ARMOR_UP = "assets/arts/sounds/sfx/ui/armor_up.wav",
DUNGEON_SMASH = "assets/arts/sounds/sfx/ui/smash.wav", DUNGEON_SMASH = "assets/arts/sounds/sfx/ui/smash.wav",
STAR_GET = "assets/arts/sounds/sfx/ui/star_get.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 = { AudioManager.BO_EFFECT_ID = {

View File

@ -27,6 +27,10 @@ function ActPvpMainUI:ctor()
end end
function ActPvpMainUI:getBGMId()
return AudioManager.BGM_ID.ACT_PVP_MAINBGM
end
function ActPvpMainUI:getCurrencyParams() function ActPvpMainUI:getCurrencyParams()
if self.currencyParams == nil then if self.currencyParams == nil then
self.currencyParams = { self.currencyParams = {

View File

@ -14,6 +14,10 @@ function ActPvpPlayingUI:ctor()
end end
function ActPvpPlayingUI:getBGMId()
return AudioManager.BGM_ID.ACT_PVP_MAINBGM
end
function ActPvpPlayingUI:getPrefabPath() function ActPvpPlayingUI:getPrefabPath()
return "assets/prefabs/ui/activity/act_pvp/act_pvp_playing_ui.prefab" return "assets/prefabs/ui/activity/act_pvp/act_pvp_playing_ui.prefab"
end end

View File

@ -17,6 +17,10 @@ local BG_SPINE = {
local SIMPLE_HERO_CELL = "app/ui/activity/act_pvp/cell/simple_hero_cell" 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() function ActPvpSelectUI:getPrefabPath()
return "assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab" return "assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab"
end end
@ -36,6 +40,7 @@ end
function ActPvpSelectUI:_display() function ActPvpSelectUI:_display()
local curPairIds = DataManager.ActPvpData:getCurSelectPairId() local curPairIds = DataManager.ActPvpData:getCurSelectPairId()
if not curPairIds or not curPairIds[1] then if not curPairIds or not curPairIds[1] then
AudioManager:playEffect(AudioManager.EFFECT_ID.ACT_PVP_FINISH)
self:closeUI() self:closeUI()
return return
end end
@ -148,6 +153,7 @@ function ActPvpSelectUI:_addListeners()
self:_display() self:_display()
return return
end end
self:disableUITouch()
local targetPos = target:getBaseObject():getTransform().position local targetPos = target:getBaseObject():getTransform().position
local sPoint = UIManager:getUICameraComponent():WorldToScreenPoint(targetPos) local sPoint = UIManager:getUICameraComponent():WorldToScreenPoint(targetPos)
targetPos = CS.BF.Utils.RectTransformScreenPointToLocalPointInRectangle(node:getTransform(), sPoint.x, sPoint.y, UIManager:getUICameraComponent()) 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:Append(cell:getBaseObject():getTransform():DOAnchorPos(targetPos, 0.3))
self.aniSeq:AppendCallback(function() self.aniSeq:AppendCallback(function()
self:_display() self:_display()
self:enableUITouch()
end) end)
elseif params and params.refreshHero then elseif params and params.refreshHero then
self:_display() self:_display()

View File

@ -156,6 +156,15 @@ end
--------------------------------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() function BattleUIPVP:getPrefabPath()
return "assets/prefabs/ui/battle/battle_ui_pvp.prefab" return "assets/prefabs/ui/battle/battle_ui_pvp.prefab"
end end