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:
CloudJ 2023-06-06 11:15:05 +08:00
commit d8814f4153
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,11 @@ AudioManager.EFFECT_ID = {
PLAYER_UP = "assets/arts/sounds/sfx/ui/player_up.wav", PLAYER_UP = "assets/arts/sounds/sfx/ui/player_up.wav",
BOSS_WARNING = "assets/arts/sounds/sfx/battle/warning_boss.wav", BOSS_WARNING = "assets/arts/sounds/sfx/battle/warning_boss.wav",
LINK_CANCEL = "assets/arts/sounds/sfx/battle/link_cancel.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 = { AudioManager.BO_EFFECT_ID = {

2
lua/app/module/battle/controller/battle_controller.lua
View File

@ -2560,7 +2560,9 @@ function BattleController:battleEnd()
self.battleUI:enableUITouch() self.battleUI:enableUITouch()
end end
self:controllBattleEnd() self:controllBattleEnd()
if self.victory then
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_BATTLE_VICTORY) ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_BATTLE_VICTORY)
end
end, 1) end, 1)
end end