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

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

Browse Source
This commit is contained in:
xiekaidong 2023-05-19 20:44:41 +08:00
commit 9067a7ffa1
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua/app/module/battle/battle_const.lua
View File

@ -744,6 +744,7 @@ BattleConst.BATTLE_TASK_FIELD = {
LINK_COUNT_OVER_8 = "clear_8_combo", -- 8连消个数 LINK_COUNT_OVER_8 = "clear_8_combo", -- 8连消个数
COMBO_OVER_10 = "clear_10_hit", -- 10连击以上次数 COMBO_OVER_10 = "clear_10_hit", -- 10连击以上次数
BOARD_SKILL_RELEASE_COUNT = "skills_cast", -- 释放技能次数 BOARD_SKILL_RELEASE_COUNT = "skills_cast", -- 释放技能次数
PASS_WAVE = "pass_wave", -- 通关波数
} }
return BattleConst return BattleConst

6
lua/app/module/task/task_manager.lua
View File

@ -220,6 +220,10 @@ function TaskManager:xUseSkill(count)
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_USE_SKILL, count) self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_USE_SKILL, count)
end end
function TaskManager:xBattlePassWave(count)
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_BATTLE_PASS_WAVE, count)
end
---- 没有特殊说明，方法均返回任务增量 ---- 没有特殊说明，方法均返回任务增量
TaskManager.TYPE_DEAL_FUNC = { TaskManager.TYPE_DEAL_FUNC = {
[GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd, [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_ELIMINATE_EIGHT_ONCE] = TaskManager.xEliminateEightOnce,
[GConst.TaskConst.TASK_TYPE.X_COMBO_TEN] = TaskManager.xComboTen, [GConst.TaskConst.TASK_TYPE.X_COMBO_TEN] = TaskManager.xComboTen,
[GConst.TaskConst.TASK_TYPE.X_USE_SKILL] = TaskManager.xUseSkill, [GConst.TaskConst.TASK_TYPE.X_USE_SKILL] = TaskManager.xUseSkill,
[GConst.TaskConst.TASK_TYPE.X_BATTLE_PASS_WAVE] = TaskManager.xBattlePassWave,
} }
function TaskManager:taskGoto(taskType) 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.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.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.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 return TaskManager

10
lua/app/ui/mail/mail_ui.lua
View File

@ -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.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_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)) 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 end
function MailUI:_addListeners() function MailUI:_addListeners()