diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index b93567bd..ac6dfe34 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -1,30 +1,6 @@ local chapter_board = { [1]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, { 1, 0 @@ -45,6 +21,30 @@ local chapter_board = { 0, 2 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, { 0, 2 @@ -61,6 +61,14 @@ local chapter_board = { 1, 0 }, + { + 0, + 3 + }, + { + 0, + 3 + }, { 0, 4 @@ -73,14 +81,6 @@ local chapter_board = { 0, 3 }, - { - 0, - 3 - }, - { - 0, - 2 - }, { 1, 0 @@ -89,18 +89,18 @@ local chapter_board = { 1, 0 }, - { - 0, - 2 - }, - { - 0, - 2 - }, { 0, 4 }, + { + 0, + 4 + }, + { + 0, + 2 + }, { 0, 2 @@ -199,9 +199,16 @@ local chapter_board = { } }, ["control_element"]={ - 3, - 3, - 3 + 2, + 2, + 2, + 4, + 2, + 4, + 2, + 2, + 2, + 2 } }, [2]={ diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 014be4c7..a9ed8382 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -38,9 +38,8 @@ local LocalizationGlobalConst = REWARD_PREVIEW_DESC = "REWARD_PREVIEW_DESC", HERO_DESC_8 = "HERO_DESC_8", HERO_DESC_9 = "HERO_DESC_9", - - BATTLE_DESC_8 = "BATTLE_DESC_8", HERO_DESC_10 = "HERO_DESC_10", + BATTLE_DESC_8 = "BATTLE_DESC_8", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 63222814..f92aaafc 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -259,7 +259,7 @@ local skill = { [220011]={ ["energy"]=10, ["position"]=2, - ["method"]=2, + ["method"]=1, ["skill_type"]=0, ["icon"]=20, ["battle_icon"]="2", @@ -336,7 +336,7 @@ local skill = { [420011]={ ["energy"]=10, ["position"]=4, - ["method"]=2, + ["method"]=1, ["skill_type"]=1, ["boardrange"]={ { @@ -366,7 +366,7 @@ local skill = { [520011]={ ["energy"]=10, ["position"]=5, - ["method"]=2, + ["method"]=1, ["skill_type"]=0, ["icon"]=40, ["battle_icon"]="4", @@ -436,7 +436,7 @@ local skill = { [330011]={ ["energy"]=10, ["position"]=3, - ["method"]=2, + ["method"]=1, ["skill_type"]=0, ["icon"]=60, ["battle_icon"]="6", @@ -472,7 +472,7 @@ local skill = { [230011]={ ["energy"]=10, ["position"]=2, - ["method"]=2, + ["method"]=1, ["skill_type"]=0, ["icon"]=70, ["battle_icon"]="7", @@ -605,7 +605,7 @@ local skill = { [430011]={ ["energy"]=10, ["position"]=4, - ["method"]=2, + ["method"]=1, ["skill_type"]=0, ["icon"]=80, ["battle_icon"]="8", @@ -631,7 +631,7 @@ local skill = { [430012]={ ["energy"]=10, ["position"]=4, - ["method"]=2, + ["method"]=1, ["skill_type"]=1, ["boardrange"]={ { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index a7956554..36d16819 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -38,7 +38,6 @@ local localization_global = ["REWARD_PREVIEW_DESC"] = "奖励预览", ["HERO_DESC_8"] = "使用", ["HERO_DESC_9"] = "信息", - ["HERO_DESC_10"] = "通关章节{0}解锁", ["BATTLE_DESC_8"] = "还有可上阵英雄", } diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 728e0cb5..5ceef74e 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1436,6 +1436,10 @@ function BattleController:findLinkLine(posId, posIdMap, hadSkill, mainElementTyp return hadSkill end + if #lineList >= self:getMinEliminationCount() then + return hadSkill + end + local lineCount = 0 local maxLineList local maxPosIdMap