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:
chenxi 2023-04-20 11:19:41 +08:00
commit 79852d0c6e
5 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
lua/app/config/chapter_board.lua
View File

@ -1,30 +1,6 @@
local chapter_board = { local chapter_board = {
[1]={ [1]={
["board"]={ ["board"]={
{
1,
0
},
{
1,
0
},
{
0,
3
},
{
0,
4
},
{
0,
3
},
{
1,
0
},
{ {
1, 1,
0 0
@ -45,6 +21,30 @@ local chapter_board = {
0, 0,
2 2
}, },
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
0,
4
},
{
0,
2
},
{
0,
3
},
{ {
0, 0,
2 2
@ -61,6 +61,14 @@ local chapter_board = {
1, 1,
0 0
}, },
{
0,
3
},
{
0,
3
},
{ {
0, 0,
4 4
@ -73,14 +81,6 @@ local chapter_board = {
0, 0,
3 3
}, },
{
0,
3
},
{
0,
2
},
{ {
1, 1,
0 0
@ -89,18 +89,18 @@ local chapter_board = {
1, 1,
0 0
}, },
{
0,
2
},
{
0,
2
},
{ {
0, 0,
4 4
}, },
{
0,
4
},
{
0,
2
},
{ {
0, 0,
2 2
@ -199,9 +199,16 @@ local chapter_board = {
} }
}, },
["control_element"]={ ["control_element"]={
3, 2,
3, 2,
3 2,
4,
2,
4,
2,
2,
2,
2
} }
}, },
[2]={ [2]={

3
lua/app/config/localization/localization_global_const.lua
View File

@ -38,9 +38,8 @@ local LocalizationGlobalConst =
REWARD_PREVIEW_DESC = "REWARD_PREVIEW_DESC", REWARD_PREVIEW_DESC = "REWARD_PREVIEW_DESC",
HERO_DESC_8 = "HERO_DESC_8", HERO_DESC_8 = "HERO_DESC_8",
HERO_DESC_9 = "HERO_DESC_9", HERO_DESC_9 = "HERO_DESC_9",
BATTLE_DESC_8 = "BATTLE_DESC_8",
HERO_DESC_10 = "HERO_DESC_10", HERO_DESC_10 = "HERO_DESC_10",
BATTLE_DESC_8 = "BATTLE_DESC_8",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

14
lua/app/config/skill.lua
View File

@ -259,7 +259,7 @@ local skill = {
[220011]={ [220011]={
["energy"]=10, ["energy"]=10,
["position"]=2, ["position"]=2,
["method"]=2, ["method"]=1,
["skill_type"]=0, ["skill_type"]=0,
["icon"]=20, ["icon"]=20,
["battle_icon"]="2", ["battle_icon"]="2",
@ -336,7 +336,7 @@ local skill = {
[420011]={ [420011]={
["energy"]=10, ["energy"]=10,
["position"]=4, ["position"]=4,
["method"]=2, ["method"]=1,
["skill_type"]=1, ["skill_type"]=1,
["boardrange"]={ ["boardrange"]={
{ {
@ -366,7 +366,7 @@ local skill = {
[520011]={ [520011]={
["energy"]=10, ["energy"]=10,
["position"]=5, ["position"]=5,
["method"]=2, ["method"]=1,
["skill_type"]=0, ["skill_type"]=0,
["icon"]=40, ["icon"]=40,
["battle_icon"]="4", ["battle_icon"]="4",
@ -436,7 +436,7 @@ local skill = {
[330011]={ [330011]={
["energy"]=10, ["energy"]=10,
["position"]=3, ["position"]=3,
["method"]=2, ["method"]=1,
["skill_type"]=0, ["skill_type"]=0,
["icon"]=60, ["icon"]=60,
["battle_icon"]="6", ["battle_icon"]="6",
@ -472,7 +472,7 @@ local skill = {
[230011]={ [230011]={
["energy"]=10, ["energy"]=10,
["position"]=2, ["position"]=2,
["method"]=2, ["method"]=1,
["skill_type"]=0, ["skill_type"]=0,
["icon"]=70, ["icon"]=70,
["battle_icon"]="7", ["battle_icon"]="7",
@ -605,7 +605,7 @@ local skill = {
[430011]={ [430011]={
["energy"]=10, ["energy"]=10,
["position"]=4, ["position"]=4,
["method"]=2, ["method"]=1,
["skill_type"]=0, ["skill_type"]=0,
["icon"]=80, ["icon"]=80,
["battle_icon"]="8", ["battle_icon"]="8",
@ -631,7 +631,7 @@ local skill = {
[430012]={ [430012]={
["energy"]=10, ["energy"]=10,
["position"]=4, ["position"]=4,
["method"]=2, ["method"]=1,
["skill_type"]=1, ["skill_type"]=1,
["boardrange"]={ ["boardrange"]={
{ {

1
lua/app/config/strings/cn/global.lua
View File

@ -38,7 +38,6 @@ local localization_global =
["REWARD_PREVIEW_DESC"] = "奖励预览", ["REWARD_PREVIEW_DESC"] = "奖励预览",
["HERO_DESC_8"] = "使用", ["HERO_DESC_8"] = "使用",
["HERO_DESC_9"] = "信息", ["HERO_DESC_9"] = "信息",
["HERO_DESC_10"] = "通关章节{0}解锁", ["HERO_DESC_10"] = "通关章节{0}解锁",
["BATTLE_DESC_8"] = "还有可上阵英雄", ["BATTLE_DESC_8"] = "还有可上阵英雄",
} }

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

@ -1436,6 +1436,10 @@ function BattleController:findLinkLine(posId, posIdMap, hadSkill, mainElementTyp
return hadSkill return hadSkill
end end
if #lineList >= self:getMinEliminationCount() then
return hadSkill
end
local lineCount = 0 local lineCount = 0
local maxLineList local maxLineList
local maxPosIdMap local maxPosIdMap