puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
chenxi 2023-06-06 11:10:39 +08:00
commit 53f18c5b8a
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lua/app/common/audio_manager.lua
View File

@ -29,8 +29,17 @@ AudioManager.EFFECT_ID = {
LINK_SKILL = "assets/arts/sounds/sfx/battle/link_skill.wav",
BATTLE_VICTORY = "assets/arts/sounds/sfx/ui/battle_victory.wav",
BATTLE_DEFEAT = "assets/arts/sounds/sfx/ui/battle_defeat.wav",
SUMMON_START = "assets/arts/sounds/sfx/ui/ui_summon_start.wav",
REWARD = "assets/arts/sounds/sfx/ui/reward.wav",
HERO_UP = "assets/arts/sounds/sfx/ui/hero_up.wav",
PLAYER_UP = "assets/arts/sounds/sfx/ui/player_up.wav",
BOSS_WARNING = "assets/arts/sounds/sfx/battle/warning_boss.wav",
LINK_CANCEL = "assets/arts/sounds/sfx/battle/link_cancel.wav",
UI_FUNC_OPEN = "assets/arts/sounds/sfx/ui/ui_func_open.wav", -- 功能解锁
UI_HERO_LV_UP = "assets/arts/sounds/sfx/ui/ui_hero_lv_up.wav", -- 英雄升级
UI_PLAYER_LV_UP = "assets/arts/sounds/sfx/ui/ui_player_lv_up.wav", -- 角色升级
UI_REWARD_GET = "assets/arts/sounds/sfx/ui/ui_reward_get.wav", -- 奖励获取
UI_SUMMON_START = "assets/arts/sounds/sfx/ui/ui_summon_start.wav", -- 抽卡
}
AudioManager.BO_EFFECT_ID = {

1
lua/app/global/global_func.lua
View File

@ -702,6 +702,7 @@ function GFunc.showRewardBox(rewards, extParams, callback)
params.rewards = newRewards
params.callback = callback
ModuleManager.TipsManager:showRewardsBox(params)
AudioManager:playEffect(AudioManager.EFFECT_ID.REWARD)
end
function GFunc.mergeRewards2(rewards, newRewards, needSort)

2
lua/app/module/hero/hero_manager.lua
View File

@ -31,6 +31,8 @@ function HeroManager:upgradeHeroFinish(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.HeroData:setHeroLv(result.hero.id, result.hero.level)
DataManager.HeroData:setDirty()
AudioManager:playEffect(AudioManager.EFFECT_ID.HERO_UP)
end
end

1
lua/app/ui/player/player_level_up_ui.lua
View File

@ -44,6 +44,7 @@ function PlayerLevelUpUI:_display()
uiMap["player_level_up_ui.l"]:setAnchoredPositionX(-width/2 - 40)
self:refreshRewards()
AudioManager:playEffect(AudioManager.EFFECT_ID.PLAYER_UP)
end
function PlayerLevelUpUI:refreshRewards()

5
lua/app/ui/shop/box_open_ui.lua
View File

@ -1,4 +1,5 @@
local BoxOpenUI = class("BoxOpenUI", BaseUI)
local AUDIO_DELAY_TIME = 0.4
local SPINE_OPEN_TIME = 1.4
local DEFAULT_SPINE_NAME = "ui_shop_box_1" -- 默认的展示动画
@ -55,6 +56,10 @@ function BoxOpenUI:onLoadRootComplete()
ModuleManager.ShopManager:showBoxRewardUI(self.params)
end, SPINE_OPEN_TIME)
end, false)
-- 音频
self:performWithDelayGlobal(function()
AudioManager:playEffect(AudioManager.EFFECT_ID.SUMMON_START)
end, AUDIO_DELAY_TIME)
end
return BoxOpenUI