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

skill

Browse Source
This commit is contained in:
puxuan 2025-06-03 23:57:45 +08:00
parent 5cfdb4c8d8
commit c026ff582c
5 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lua/app/module/battle/controller/battle_base_controller.lua
View File

@ -680,6 +680,7 @@ function BattleBaseController:prepareFight()
self:initDefUnits(onPreloadFinished)
self.battleUI:refreshChessBoard(self:getChessBoardBgName())
self.battleUI:loadBg(self:getScene())
self.battleData:initAllRogueSkills()
end)
BattleHelper:setBaseOrder(self.battleUI:getUIOrder())
BattleHelper:setBattleData(self.battleData)
@ -2368,10 +2369,10 @@ function BattleBaseController:dealSelectSkill(skillId, value, side, isSnapshot)
end
function BattleBaseController:onSelectSkill(skillId, value, pos, side)
if not self.canChoseSkillCount or self.canChoseSkillCount <= 0 then
return
end
self.canChoseSkillCount = self.canChoseSkillCount - 1
-- if not self.canChoseSkillCount or self.canChoseSkillCount <= 0 then
-- return
-- end
-- self.canChoseSkillCount = self.canChoseSkillCount - 1
side = side or self:getCurActionSide()
self:dealSelectSkill(skillId, value, side)
@ -2389,6 +2390,10 @@ function BattleBaseController:onSelectSkill(skillId, value, pos, side)
end
end
if not self.battleUI then
return
end
self:selectSKillNextToStep()
self.battleUI:showCommonSkillTips(skillId)
@ -2402,7 +2407,6 @@ function BattleBaseController:selectSKillNextToStep()
end
end
function BattleBaseController:changeElementType(count, elementType, side)
self.changeElementTypeMap = table.clearOrCreate(self.changeElementTypeMap)
self.changeElementTypeList = table.clearOrCreate(self.changeElementTypeList)

62
lua/app/userdata/battle/battle_base_data.lua
View File

@ -54,8 +54,8 @@ function BattleBaseData:init(params, snapInfo)
BattleSkillEntity.sid = 0
self.atkTeam = self:initTeam(SIDE_ATK, params.atkFormation)
self.defTeam = self:initTeam(SIDE_DEF, params.defFormation)
-- self:initRogueSkills(SIDE_ATK, params.atkFormation)
-- self:initRogueSkills(SIDE_DEF, params.defFormation)
self:initRogueSkills(SIDE_ATK, params.atkFormation)
self:initRogueSkills(SIDE_DEF, params.defFormation)
self.atkFormation = params.atkFormation or {}
self.defFormation = params.defFormation or {}
self:setMaxBattleLv(nil)
@ -148,32 +148,38 @@ function BattleBaseData:setTimeSpeed(timeSpeed, timeScale)
self.data.timeSpeed = timeSpeed
end
-- function BattleBaseData:initRogueSkills(side, formation)
-- self.skillPool = self.skillPool or {}
-- self.skillMap = self.skillMap or {}
-- self.skillPool[side] = self.skillPool[side] or {}
-- self.skillMap[side] = self.skillMap[side] or {}
-- if not formation then
-- return
-- end
-- local skillmap = {}
-- for matchType, heroEntity in pairs(formation) do
-- local skillId = heroEntity:getBaseSkill()
-- local cfg = SKILL_CFG[skillId]
-- self.skillMap[side][cfg.position] = BATTLE_BOARD_SKILL_ENTITY:create(skillId, side)
-- self.skillMap[side][cfg.position]:addUpSkills(heroEntity:getRogueSkillList())
-- self.skillMap[side][cfg.position]:setUnlockId(heroEntity:getUnlockRogueId())
-- for _, id in ipairs(heroEntity:getActiveRogueSkills()) do
-- if not skillmap[id] then
-- if not self.skillPool[side][cfg.position] then
-- self.skillPool[side][cfg.position] = {}
-- end
-- table.insert(self.skillPool[side][cfg.position], id)
-- skillmap[id] = true
-- end
-- end
-- end
-- end
function BattleBaseData:initAllRogueSkills()
self.atkTeam:initRougeSkills()
self.defTeam:initRougeSkills()
end
function BattleBaseData:initRogueSkills(side, formation)
self.skillPool = self.skillPool or {}
self.skillMap = self.skillMap or {}
self.skillPool[side] = self.skillPool[side] or {}
self.skillMap[side] = self.skillMap[side] or {}
if not formation then
return
end
local skillmap = {}
for matchType, heroEntity in pairs(formation) do
local skillId = heroEntity:getBaseSkill()
local cfg = SKILL_CFG[skillId]
self.skillMap[side][cfg.position] = BATTLE_BOARD_SKILL_ENTITY:create(skillId, side)
-- self.skillMap[side][cfg.position]:addUpSkills(heroEntity:getRogueSkillList())
-- self.skillMap[side][cfg.position]:setUnlockId(heroEntity:getUnlockRogueId())
-- for _, id in ipairs(heroEntity:getActiveRogueSkills()) do
-- if not skillmap[id] then
-- if not self.skillPool[side][cfg.position] then
-- self.skillPool[side][cfg.position] = {}
-- end
-- table.insert(self.skillPool[side][cfg.position], id)
-- skillmap[id] = true
-- end
-- end
end
Logger.logHighlight("===========")
end
function BattleBaseData:refreshBoard(board, boardEdge, blockIcon, snapshot)
local r = 1

3
lua/app/userdata/battle/skill/battle_board_skill_entity.lua
View File

@ -34,7 +34,8 @@ function BattleBoardSkillEntity:getSkillId()
end
function BattleBoardSkillEntity:getUnlocked()
return self.unlocked
-- return self.unlocked
return true
end
function BattleBoardSkillEntity:setUnlock()

8
lua/app/userdata/battle/team/battle_team_entity.lua
View File

@ -495,4 +495,12 @@ function BattleTeamEntity:getIsDead()
return self.isDead
end
--@region 自带rouge
function BattleTeamEntity:initRougeSkills()
for k,v in pairs(self.members) do
v:initRougeSkills()
end
end
--@endregion
return BattleTeamEntity

19
lua/app/userdata/battle/team/battle_unit_entity.lua
View File

@ -52,12 +52,6 @@ function BattleUnitEntity:initSkill()
table.insert(self.passiveSkills, skill)
end
end
if self.unitData.rougeSkills then
for i,v in ipairs(self.unitData.rougeSkills) do
ModuleManager.BattleManager:onSelectSkill(v)
end
end
end
function BattleUnitEntity:getIsBoss()
@ -68,6 +62,19 @@ function BattleUnitEntity:getId()
return self.unitData.id
end
function BattleUnitEntity:initRougeSkills()
if self.unitData.rougeSkills then
local SKILL_ICON_POS = {
{x =-240, y= 165},
{x =-240, y= 0},
{x =-240, y= -165}
}
for i,v in ipairs(self.unitData.rougeSkills) do
ModuleManager.BattleManager:onSelectSkill(v, nil, SKILL_ICON_POS[i])
end
end
end
function BattleUnitEntity:addSkill(skillId)
local skillInfo = ConfigManager:getConfig("skill")[skillId]
if skillInfo == nil then