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

fix bug

Browse Source
This commit is contained in:
puxuan 2025-08-27 18:54:59 +08:00
parent 8df787b289
commit fec693c52f
4 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -18,6 +18,10 @@ local EFFECT_TYPE = BattleConst.EFFECT_TYPE
local TIME_FACTOR = BattleConst.TIME_FACTOR local TIME_FACTOR = BattleConst.TIME_FACTOR
local HURT_ANI_NAME_LIST = {SPINE_ANIMATION_NAME.HIT, SPINE_ANIMATION_NAME.HIT_2} local HURT_ANI_NAME_LIST = {SPINE_ANIMATION_NAME.HIT, SPINE_ANIMATION_NAME.HIT_2}
function BattleUnitComp:setActive(active)
self.baseObject:setActive(active)
end
function BattleUnitComp:ctor() function BattleUnitComp:ctor()
self.hurtNameList = {} self.hurtNameList = {}
end end

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

@ -170,8 +170,8 @@ function BattleBaseController:getNextMonsterId(waveIndex)
return monsterId return monsterId
end end
function BattleBaseController:showBossEnterAni(bornTime, bossName, monsterComp, callback) function BattleBaseController:showBossEnterAni(modelId, bornTime, bossName, monsterComp, callback)
self.battleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback) self.battleUI:showBossEnterAni(modelId, bornTime, bossName, monsterComp, callback)
end end
function BattleBaseController:generateNextMonster() function BattleBaseController:generateNextMonster()
@ -182,10 +182,6 @@ function BattleBaseController:generateNextMonster()
local isBoss = self.defTeam:getIsBoss() local isBoss = self.defTeam:getIsBoss()
local unitEntity = self.battleData:addMonster(monsterId, true, self) local unitEntity = self.battleData:addMonster(monsterId, true, self)
local modelId = unitEntity:getModelId() local modelId = unitEntity:getModelId()
Logger.logHighlight("=========================xxxx2 modelId = %s isBoss = %s", modelId, isBoss)
if isBoss then
modelId = "p0003"
end
BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject)
self.defTeam:removeAllUnits() self.defTeam:removeAllUnits()
local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT)
@ -206,14 +202,15 @@ function BattleBaseController:generateNextMonster()
end end
end end
end end
self.atkTeam:playRunAction()
self.atkTeam:recoverHpOnWaveOver(onFinish)
isBoss = self.defTeam:getIsBoss() isBoss = self.defTeam:getIsBoss()
Logger.logHighlight("=========================xxxx21 modelId = %s isBoss = %s", modelId, isBoss)
if isBoss then if isBoss then
local monsterInfo = ConfigManager:getConfig("monster")[monsterId] local monsterInfo = ConfigManager:getConfig("monster")[monsterId]
self:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() monsterComp:setActive(false)
self:showBossEnterAni(modelId, bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function()
monsterComp:setActive(true)
self.atkTeam:playRunAction()
self.atkTeam:recoverHpOnWaveOver(onFinish)
monsterComp:playEnterBattlefield(true, onFinish) monsterComp:playEnterBattlefield(true, onFinish)
end) end)
else else
@ -236,7 +233,9 @@ function BattleBaseController:generateNextMonster()
isBoss = self.defTeam:getIsBoss() isBoss = self.defTeam:getIsBoss()
if isBoss then if isBoss then
local monsterInfo = ConfigManager:getConfig("monster")[monsterId] local monsterInfo = ConfigManager:getConfig("monster")[monsterId]
self:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() monsterComp:setActive(false)
self:showBossEnterAni(modelId, bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function()
monsterComp:setActive(true)
monsterComp:playEnterBattlefield(false, onFinish) monsterComp:playEnterBattlefield(false, onFinish)
end) end)
else else

26
lua/app/ui/battle/battle_base_ui.lua
View File

@ -2433,7 +2433,7 @@ function BattleBaseUI:showCommonSkillTips(skillId)
end, 1.5) end, 1.5)
end end
function BattleBaseUI:showBossEnterAni(bornTime, bossName, monsterComp, callback) function BattleBaseUI:showBossEnterAni(modelId, bornTime, bossName, monsterComp, callback)
if not self.bossEnterNode then if not self.bossEnterNode then
if callback then if callback then
callback() callback()
@ -2441,8 +2441,19 @@ function BattleBaseUI:showBossEnterAni(bornTime, bossName, monsterComp, callback
self.battleController:showBuffTips(SIDE_DEF, true) self.battleController:showBuffTips(SIDE_DEF, true)
return return
end end
self.bossSpineObj:setActive(false)
SpineManager:loadHeroSpineAssetAsync(modelId, self.root, function(spineAssets)
self.bossSpineObj:refreshAssets(spineAssets)
self:_showBossEnterAni(bornTime, bossName, monsterComp, callback)
end)
end
function BattleBaseUI:_showBossEnterAni(bornTime, bossName, monsterComp, callback)
AudioManager:playEffect(AudioManager.EFFECT_ID.BOSS_WARNING) AudioManager:playEffect(AudioManager.EFFECT_ID.BOSS_WARNING)
self.bossEnterNode:setVisible(true) self.bossEnterNode:setVisible(true)
self.bossSpineObj:setActive(true)
-- self.bossSpineObj:setTimeScale(1)
self.bossSpineObj:playAnim("idle", true, true)
self.bossEnterImg:setVisible(false) self.bossEnterImg:setVisible(false)
self.bossName:setText(bossName) self.bossName:setText(bossName)
self.bossName:setAnchoredPositionX(-756) self.bossName:setAnchoredPositionX(-756)
@ -2462,17 +2473,24 @@ function BattleBaseUI:showBossEnterAni(bornTime, bossName, monsterComp, callback
self.bossEnterNodeAnimator:Play(1155742626, -1, 0) self.bossEnterNodeAnimator:Play(1155742626, -1, 0)
monsterComp:initPosition() monsterComp:initPosition()
monsterComp:getBaseObject():setParent(self.maxLayerNode, false) monsterComp:getBaseObject():setParent(self.maxLayerNode, false)
if callback then -- if callback then
callback() -- callback()
end -- end
end) end)
self.bossEnterAniSeq:AppendInterval(2) self.bossEnterAniSeq:AppendInterval(2)
-- self.bossEnterAniSeq:AppendCallback(function()
-- self.bossSpineObj:setTimeScale(0)
-- end)
self.bossEnterAniSeq:Append(self.bossEnterNodeCanvasGroup:DOFade(0, 0.2)) self.bossEnterAniSeq:Append(self.bossEnterNodeCanvasGroup:DOFade(0, 0.2))
self.bossEnterAniSeq:AppendCallback(function() self.bossEnterAniSeq:AppendCallback(function()
monsterComp:getBaseObject():setParent(self:getBattleNode(), false) monsterComp:getBaseObject():setParent(self:getBattleNode(), false)
self.bossEnterNode:setVisible(false) self.bossEnterNode:setVisible(false)
self.battleController:showBuffTips(SIDE_DEF, true) self.battleController:showBuffTips(SIDE_DEF, true)
self.bossEnterNodeAnimator.enabled = false self.bossEnterNodeAnimator.enabled = false
self.bossSpineObj:setActive(false)
if callback then
callback()
end
end) end)
end end

2
lua/app/ui/battle/battle_ui.lua
View File

@ -204,10 +204,12 @@ function BattleUI:initBossEnterAni()
self.bossEnterNode = uiMap["battle_ui.bg_2.boss_enter_node"] self.bossEnterNode = uiMap["battle_ui.bg_2.boss_enter_node"]
self.bossEnterImg = uiMap["battle_ui.bg_2.boss_enter_node.ui_spine_obj"] self.bossEnterImg = uiMap["battle_ui.bg_2.boss_enter_node.ui_spine_obj"]
self.bossName = uiMap["battle_ui.bg_2.boss_enter_node.boss_name"] self.bossName = uiMap["battle_ui.bg_2.boss_enter_node.boss_name"]
self.bossSpineObj = uiMap["battle_ui.battle_root.boss_enter_node.boss_spine_obj"]
self.bossEnterNodeAnimator = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR) self.bossEnterNodeAnimator = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR)
self.bossEnterNodeAnimator.enabled = false self.bossEnterNodeAnimator.enabled = false
self.bossEnterNodeCanvasGroup = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) self.bossEnterNodeCanvasGroup = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP)
self.bossEnterNode:setVisible(false) self.bossEnterNode:setVisible(false)
self.bossSpineObj:setActive(false)
end end
function BattleUI:initSkillSelectCells() function BattleUI:initSkillSelectCells()