From b8f08c59a39672ac92153ec70c898223d7bf5968 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 6 Jun 2023 11:08:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/audio_manager.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lua/app/common/audio_manager.lua b/lua/app/common/audio_manager.lua index 616141bb..b97f8cfc 100644 --- a/lua/app/common/audio_manager.lua +++ b/lua/app/common/audio_manager.lua @@ -31,6 +31,11 @@ AudioManager.EFFECT_ID = { BATTLE_DEFEAT = "assets/arts/sounds/sfx/ui/battle_defeat.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 = { From 7a83365fe2d2f60e3834d76d07fd0bb570916310 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 6 Jun 2023 11:10:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=88=98=E6=96=97?= =?UTF-8?q?=E8=83=9C=E5=88=A9=E6=89=8D=E7=AE=97=E5=AE=8C=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/controller/battle_controller.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index adf9994f..b113436a 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -2560,7 +2560,9 @@ function BattleController:battleEnd() self.battleUI:enableUITouch() end self:controllBattleEnd() - ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_BATTLE_VICTORY) + if self.victory then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_BATTLE_VICTORY) + end end, 1) end