This commit is contained in:
xiekaidong 2023-05-19 20:44:38 +08:00
parent 1fcf0137e3
commit 5309687502
18 changed files with 1982 additions and 32 deletions

View File

@ -1580,6 +1580,7 @@ local chapter = {
}, },
[10]={ [10]={
["before_chapter"]=9, ["before_chapter"]=9,
["next_chapter"]=11,
["icon"]="chapter_10", ["icon"]="chapter_10",
["scene"]="bg_7", ["scene"]="bg_7",
["block_icon"]="battle_hinder_7", ["block_icon"]="battle_hinder_7",
@ -1775,9 +1776,458 @@ local chapter = {
["weight"]=100 ["weight"]=100
} }
} }
},
[11]={
["before_chapter"]=10,
["next_chapter"]=12,
["icon"]="chapter_9",
["scene"]="bg_7",
["block_icon"]="battle_hinder_7",
["chess_board"]="chessboard_2",
["board"]={
35,
36,
37,
38
},
["monster"]={
15101,
15201,
15301,
15401,
15501,
15601,
15701,
15801,
15901,
16001,
16101,
16201,
16301,
16401,
16501,
16601,
16701,
16801,
16901,
17001
},
["mystery_box"]={
1,
3
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=3,
["num_for_nothing"]="VQ=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
},
["boss_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=3,
["num_for_nothing"]="VQ=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=5000,
["num_for_nothing"]="UwhcAw=="
}
},
["box_num"]={
10,
15,
20
},
["box_reward_1"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=200,
["num_for_nothing"]="VAhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=20000,
["num_for_nothing"]="VAhcA2U="
}
},
["box_reward_2"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=30000,
["num_for_nothing"]="VQhcA2U="
}
},
["box_reward_3"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=60000,
["num_for_nothing"]="UAhcA2U="
}
},
["finish_exp"]=1900,
["challenge_exp"]=950,
["idle_exp"]=20,
["idle_gold"]=25,
["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=100
}
}
},
[12]={
["before_chapter"]=11,
["icon"]="chapter_10",
["scene"]="bg_7",
["block_icon"]="battle_hinder_7",
["chess_board"]="chessboard_2",
["board"]={
39,
40,
41,
42
},
["monster"]={
15101,
15201,
15301,
15401,
15501,
15601,
15701,
15801,
15901,
16001,
16101,
16201,
16301,
16401,
16501,
16601,
16701,
16801,
16901,
17001
},
["mystery_box"]={
2,
3
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=3,
["num_for_nothing"]="VQ=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
},
["boss_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=3,
["num_for_nothing"]="VQ=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=5000,
["num_for_nothing"]="UwhcAw=="
}
},
["box_num"]={
10,
15,
20
},
["box_reward_1"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=200,
["num_for_nothing"]="VAhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=20000,
["num_for_nothing"]="VAhcA2U="
}
},
["box_reward_2"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=30000,
["num_for_nothing"]="VQhcA2U="
}
},
["box_reward_3"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=60000,
["num_for_nothing"]="UAhcA2U="
}
},
["finish_exp"]=1900,
["challenge_exp"]=950,
["idle_exp"]=20,
["idle_gold"]=25,
["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=100
}
}
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

File diff suppressed because it is too large Load Diff

View File

@ -931,7 +931,7 @@ local skill = {
["energy"]=10, ["energy"]=10,
["link"]=1, ["link"]=1,
["position"]=1, ["position"]=1,
["method"]=2, ["method"]=1,
["skill_type"]=2, ["skill_type"]=2,
["boardrange"]={ ["boardrange"]={
{ {

View File

@ -2090,7 +2090,7 @@ local skill_rogue = {
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=9, ["type"]=9,
["skill_position"]=4, ["skill_position"]=3,
["effect"]={ ["effect"]={
{ {
["type"]="atkp_green_add", ["type"]="atkp_green_add",
@ -2119,12 +2119,14 @@ local skill_rogue = {
["weight"]=30000, ["weight"]=30000,
["qlt"]=4, ["qlt"]=4,
["type"]=6, ["type"]=6,
["skill_position"]=3,
["icon"]="67" ["icon"]="67"
}, },
[3400101]={ [3400101]={
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,
["type"]=12, ["type"]=12,
["skill_position"]=3,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
@ -2167,7 +2169,7 @@ local skill_rogue = {
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=9, ["type"]=9,
["skill_position"]=4, ["skill_position"]=3,
["effect"]={ ["effect"]={
{ {
["type"]="atkp_green_add", ["type"]="atkp_green_add",
@ -2185,6 +2187,7 @@ local skill_rogue = {
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=12, ["type"]=12,
["skill_position"]=3,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
@ -2200,6 +2203,7 @@ local skill_rogue = {
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,
["type"]=12, ["type"]=12,
["skill_position"]=3,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
@ -2217,6 +2221,7 @@ local skill_rogue = {
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=12, ["type"]=12,
["skill_position"]=3,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
@ -2235,6 +2240,7 @@ local skill_rogue = {
["parameter"]={ ["parameter"]={
4 4
}, },
["skill_position"]=3,
["effect"]={ ["effect"]={
{ {
["type"]="skill_fire_times", ["type"]="skill_fire_times",
@ -2374,6 +2380,7 @@ local skill_rogue = {
["weight"]=30000, ["weight"]=30000,
["qlt"]=4, ["qlt"]=4,
["type"]=6, ["type"]=6,
["skill_position"]=4,
["icon"]="57" ["icon"]="57"
}, },
[4300101]={ [4300101]={
@ -2500,6 +2507,7 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=30000, ["weight"]=30000,
["qlt"]=4, ["qlt"]=4,
["skill_position"]=4,
["icon"]="57" ["icon"]="57"
}, },
[4300301]={ [4300301]={
@ -2511,12 +2519,14 @@ local skill_rogue = {
2, 2,
1 1
}, },
["skill_position"]=4,
["icon"]="39" ["icon"]="39"
}, },
[4300302]={ [4300302]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,
["skill_position"]=4,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
@ -2551,6 +2561,7 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["skill_position"]=4,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
@ -2566,6 +2577,7 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,
["skill_position"]=4,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
@ -2609,6 +2621,7 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,
["skill_position"]=4,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
@ -3122,7 +3135,8 @@ local skill_rogue = {
["weight"]=30000, ["weight"]=30000,
["qlt"]=4, ["qlt"]=4,
["type"]=6, ["type"]=6,
["skill_position"]=5 ["skill_position"]=5,
["icon"]="58"
}, },
[5400101]={ [5400101]={
["limit_times"]=1, ["limit_times"]=1,
@ -3133,7 +3147,8 @@ local skill_rogue = {
1, 1,
30000 30000
}, },
["skill_position"]=5 ["skill_position"]=5,
["icon"]="41"
}, },
[5400102]={ [5400102]={
["limit_times"]=1, ["limit_times"]=1,
@ -3148,7 +3163,8 @@ local skill_rogue = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
} }
} },
["icon"]="44"
}, },
[5400103]={ [5400103]={
["limit_times"]=1, ["limit_times"]=1,
@ -3163,7 +3179,8 @@ local skill_rogue = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
} }
} },
["icon"]="42"
}, },
[5400104]={ [5400104]={
["limit_times"]=1, ["limit_times"]=1,
@ -3190,7 +3207,8 @@ local skill_rogue = {
["parameter"]={ ["parameter"]={
5400123 5400123
}, },
["skill_position"]=5 ["skill_position"]=5,
["icon"]="66"
}, },
[5400106]={ [5400106]={
["limit_times"]=1, ["limit_times"]=1,
@ -3205,7 +3223,8 @@ local skill_rogue = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
} }
} },
["icon"]="58"
}, },
[5400107]={ [5400107]={
["limit_times"]=1, ["limit_times"]=1,
@ -3220,7 +3239,8 @@ local skill_rogue = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
} }
} },
["icon"]="66"
} }
} }
local config = { local config = {

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
["name"]="10.城堡深处" ["name"]="10.城堡深处"
},
[11]={
["name"]="11.城堡内部"
},
[12]={
["name"]="12.城堡深处"
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
["name"]="10. Inner Castle" ["name"]="10. Inner Castle"
},
[11]={
["name"]="11. Castle Inside"
},
[12]={
["name"]="12. Inner Castle"
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
},
[11]={
},
[12]={
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -28,9 +28,15 @@ local chapter = {
}, },
[10]={ [10]={
["name"]="10.城堡深處" ["name"]="10.城堡深處"
},
[11]={
["name"]="11.城堡內部"
},
[12]={
["name"]="12.城堡深處"
} }
} }
local config = { local config = {
data=chapter,count=10 data=chapter,count=12
} }
return config return config

View File

@ -456,20 +456,32 @@ end
function BattleController:enterRoundBegin() function BattleController:enterRoundBegin()
self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_BEGIN self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_BEGIN
self:takeGridEffect()
self:enterEliminationBegin()
end
function BattleController:takeGridEffect()
local gridEntities = self.battleData:getGridEnties() local gridEntities = self.battleData:getGridEnties()
local effectGrid = {} local effectGrid = {}
for posId, entity in pairs(gridEntities) do for posId, entity in pairs(gridEntities) do
if entity:getEffectType() then if entity:getEffectType() then
table.insert(effectGrid, posId) table.insert(effectGrid, entity)
end end
end end
for _, posId in ipairs(effectGrid) do local availableEffectTypeMap
BATTLE_GRID_EFFECT_HANDLE.gridEffectOn(posId, gridEntities, BattleConst.GRID_EFFECT_TRIGGER_TYPE.ON_ROUND_BEGIN, self) for _, entity in ipairs(effectGrid) do
local effectType = entity:getEffectType()
if not availableEffectTypeMap or not availableEffectTypeMap[effectType] then
local succ = BATTLE_GRID_EFFECT_HANDLE.gridEffectOn(entity:getPosId(), gridEntities, BattleConst.GRID_EFFECT_TRIGGER_TYPE.ON_ROUND_BEGIN, self)
if succ and effectType == BattleConst.GRID_EFFECT_TYPE.CROSS_SPREAD then
if not availableEffectTypeMap then
availableEffectTypeMap = {}
end
availableEffectTypeMap[effectType] = true
end
end
end end
self:enterEliminationBegin()
end end
function BattleController:enterEliminationBegin() function BattleController:enterEliminationBegin()

View File

@ -25,15 +25,16 @@ local function _crossSpread(entity, gridEntities, battleController, onlyCheck)
return return
end end
local succ = false
for _, posId in ipairs(tempList) do for _, posId in ipairs(tempList) do
local gridEntity = gridEntities[posId] local gridEntity = gridEntities[posId]
if gridEntity:isEmptyIdle() then if gridEntity:isEmptyIdle() then
battleController.battleData:setGridType(posId, BattleConst.GRID_TYPE.JELLY) battleController.battleData:setGridType(posId, BattleConst.GRID_TYPE.JELLY)
succ = true
end end
end end
local list = GFunc.getTable(tempList) return succ
return list
end end
local function _selectCommonSkill(entity, gridEntities, battleController, onlyCheck) local function _selectCommonSkill(entity, gridEntities, battleController, onlyCheck)
@ -42,6 +43,7 @@ local function _selectCommonSkill(entity, gridEntities, battleController, onlyCh
end end
battleController:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.SKILL_BOX_OPEN, 1) battleController:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.SKILL_BOX_OPEN, 1)
battleController.battleData:addCommonSelectSkillCount() battleController.battleData:addCommonSelectSkillCount()
return true
end end
local function _rewardBox(entity, gridEntities, battleController, onlyCheck) local function _rewardBox(entity, gridEntities, battleController, onlyCheck)
@ -49,6 +51,7 @@ local function _rewardBox(entity, gridEntities, battleController, onlyCheck)
return return
end end
battleController:onGotMysteryBoxIndexs() battleController:onGotMysteryBoxIndexs()
return true
end end
BattleGridEffectHandle._gridEffectOn = { BattleGridEffectHandle._gridEffectOn = {