diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index a1786356..c4e3e59e 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -170,8 +170,8 @@ function BattleBaseController:getNextMonsterId(waveIndex) return monsterId end -function BattleBaseController:showBossEnterAni(modelId, bornTime, bossName, monsterComp, callback) - self.battleUI:showBossEnterAni(modelId, bornTime, bossName, monsterComp, callback) +function BattleBaseController:showBossEnterAni(bornTime, bossName, monsterComp, callback) + self.battleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback) end function BattleBaseController:generateNextMonster() @@ -203,14 +203,13 @@ function BattleBaseController:generateNextMonster() end end + self.atkTeam:playRunAction() + self.atkTeam:recoverHpOnWaveOver(onFinish) + isBoss = self.defTeam:getIsBoss() if isBoss then local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - 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) + self:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() monsterComp:playEnterBattlefield(true, onFinish) end) else @@ -233,9 +232,7 @@ function BattleBaseController:generateNextMonster() isBoss = self.defTeam:getIsBoss() if isBoss then local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - monsterComp:setActive(false) - self:showBossEnterAni(modelId, bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:setActive(true) + self:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() monsterComp:playEnterBattlefield(false, onFinish) end) else diff --git a/lua/app/ui/battle/battle_base_ui.lua b/lua/app/ui/battle/battle_base_ui.lua index 54152c29..0fd7ba6c 100644 --- a/lua/app/ui/battle/battle_base_ui.lua +++ b/lua/app/ui/battle/battle_base_ui.lua @@ -2433,7 +2433,7 @@ function BattleBaseUI:showCommonSkillTips(skillId) end, 1.5) end -function BattleBaseUI:showBossEnterAni(modelId, bornTime, bossName, monsterComp, callback) +function BattleBaseUI:showBossEnterAni(bornTime, bossName, monsterComp, callback) if not self.bossEnterNode then if callback then callback() @@ -2441,29 +2441,19 @@ function BattleBaseUI:showBossEnterAni(modelId, bornTime, bossName, monsterComp, self.battleController:showBuffTips(SIDE_DEF, true) return 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) self.bossEnterNode:setVisible(true) - self.bossSpineObj:setActive(true) - self.bossSpineObj:playAnim("idle", true, true, true) self.bossEnterImg:setVisible(false) self.bossName:setText(bossName) self.bossName:setAnchoredPositionX(-756) - -- self.bossEnterNodeCanvasGroup.alpha = 0 + self.bossEnterNodeCanvasGroup.alpha = 0 monsterComp:getBaseObject():setLocalPosition(DEFAULT_X, 0, 0) if self.bossEnterAniSeq then self.bossEnterAniSeq:Kill() self.bossEnterAniSeq = nil end self.bossEnterAniSeq = self.root:createBindTweenSequence() - -- self.bossEnterAniSeq:Append(self.bossEnterNodeCanvasGroup:DOFade(1, 0.2)) + self.bossEnterAniSeq:Append(self.bossEnterNodeCanvasGroup:DOFade(1, 0.2)) self.bossEnterAniSeq:AppendCallback(function() self.bossEnterImg:setVisible(true) self.bossEnterImg:playAnim("idle", false, true) @@ -2472,21 +2462,17 @@ function BattleBaseUI:_showBossEnterAni(bornTime, bossName, monsterComp, callbac self.bossEnterNodeAnimator:Play(1155742626, -1, 0) monsterComp:initPosition() monsterComp:getBaseObject():setParent(self.maxLayerNode, false) - -- if callback then - -- callback() - -- end + if callback then + callback() + end end) self.bossEnterAniSeq:AppendInterval(2) - -- self.bossEnterAniSeq:Append(self.bossEnterNodeCanvasGroup:DOFade(0, 0.2)) + self.bossEnterAniSeq:Append(self.bossEnterNodeCanvasGroup:DOFade(0, 0.2)) self.bossEnterAniSeq:AppendCallback(function() monsterComp:getBaseObject():setParent(self:getBattleNode(), false) self.bossEnterNode:setVisible(false) self.battleController:showBuffTips(SIDE_DEF, true) self.bossEnterNodeAnimator.enabled = false - self.bossSpineObj:setActive(false) - if callback then - callback() - end end) end diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 9aaf8489..a32aed26 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -204,12 +204,10 @@ function BattleUI:initBossEnterAni() self.bossEnterNode = uiMap["battle_ui.bg_2.boss_enter_node"] 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.bossSpineObj = uiMap["battle_ui.battle_root.boss_enter_node.boss_spine_obj"] self.bossEnterNodeAnimator = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR) self.bossEnterNodeAnimator.enabled = false self.bossEnterNodeCanvasGroup = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) self.bossEnterNode:setVisible(false) - self.bossSpineObj:setActive(false) end function BattleUI:initSkillSelectCells()