From 55c6ba1263656e8c6d6c66fe7890fd60c1b21b07 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 19 May 2023 20:14:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/mail/mail_ui.lua | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lua/app/ui/mail/mail_ui.lua b/lua/app/ui/mail/mail_ui.lua index 0703ce82..55b45258 100644 --- a/lua/app/ui/mail/mail_ui.lua +++ b/lua/app/ui/mail/mail_ui.lua @@ -68,16 +68,6 @@ function MailUI:_display() uiMap["mail_ui.bg.title_bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.MAIL_TITLE)) uiMap["mail_ui.bg.btn_delect.btn_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DELETE_ALL)) uiMap["mail_ui.bg.btn_claimed.btn_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM_ALL)) - - local uiSpine1 = uiMap["mail_ui.ui_spine_1"] - local uiSpine2 = uiMap["mail_ui.ui_spine_2"] - uiSpine1:playAnimComplete("born", false, false, function () - uiSpine1:playAnim("idle", true, false) - end) - uiSpine2:clearTrack() - uiSpine2:playAnimComplete("born", false, true, function () - uiSpine2:playAnim("idle", true, false) - end) end function MailUI:_addListeners() From e85131f0417913657ce9a67217788d0fb6d4411a Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 19 May 2023 20:43:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 1 + lua/app/module/task/task_manager.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 40610180..53688d46 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -744,6 +744,7 @@ BattleConst.BATTLE_TASK_FIELD = { LINK_COUNT_OVER_8 = "clear_8_combo", -- 8连消个数 COMBO_OVER_10 = "clear_10_hit", -- 10连击以上次数 BOARD_SKILL_RELEASE_COUNT = "skills_cast", -- 释放技能次数 + PASS_WAVE = "pass_wave", -- 通关波数 } return BattleConst \ No newline at end of file diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index 7cf848ae..32d6a78c 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -220,6 +220,10 @@ function TaskManager:xUseSkill(count) self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_USE_SKILL, count) end +function TaskManager:xBattlePassWave(count) + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_BATTLE_PASS_WAVE, count) +end + ---- 没有特殊说明，方法均返回任务增量 TaskManager.TYPE_DEAL_FUNC = { [GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd, @@ -240,6 +244,7 @@ TaskManager.TYPE_DEAL_FUNC = { [GConst.TaskConst.TASK_TYPE.X_ELIMINATE_EIGHT_ONCE] = TaskManager.xEliminateEightOnce, [GConst.TaskConst.TASK_TYPE.X_COMBO_TEN] = TaskManager.xComboTen, [GConst.TaskConst.TASK_TYPE.X_USE_SKILL] = TaskManager.xUseSkill, + [GConst.TaskConst.TASK_TYPE.X_BATTLE_PASS_WAVE] = TaskManager.xBattlePassWave, } function TaskManager:taskGoto(taskType) @@ -316,6 +321,7 @@ TaskManager.fightTaskProgressToTaskType = { [BATTLE_TASK_FIELD.LINK_COUNT_OVER_8] = GConst.TaskConst.TASK_TYPE.X_ELIMINATE_EIGHT_ONCE, [BATTLE_TASK_FIELD.COMBO_OVER_10] = GConst.TaskConst.TASK_TYPE.X_COMBO_TEN, [BATTLE_TASK_FIELD.BOARD_SKILL_RELEASE_COUNT] = GConst.TaskConst.TASK_TYPE.X_USE_SKILL, + [BATTLE_TASK_FIELD.PASS_WAVE] = GConst.TaskConst.TASK_TYPE.X_BATTLE_PASS_WAVE, } return TaskManager \ No newline at end of file