Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

lua/app/module/battle/component/battle_unit_comp.lua

@@ -907,6 +907,23 @@ function BattleUnitComp:enterSkillAttackState()
 		local attackName = skill:getSkillAttackName()
 		if self.normalSkillCount > 0 then
 			self:attackAndSpeedUp()
+		else
+			if not attackName then -- 没有攻击动画
+				self.currAttackDuration = 0
+				self.currAttackKeyTime = 0
+				self.battleController:resetTimeSpeed()
+				local isFinalBlock = true
+				local isHaveNextAttack = self:getIsHaveNextAvailableActiveSkill()
+				if not isHaveNextAttack and isFinalBlock then
+					self.team:setCentralizedAttack(false)
+					self.team:setIsFinalBlock(isFinalBlock)
+				end
+				self:onSkillTakeEffect(skill, isFinalBlock)
+				if not isHaveNextAttack and isFinalBlock then
+					self.battleController:setIsPauseHpProgress(false)
+				end
+				return
+			end
 		end
 		self.currAttackDuration = self:getAnimationDuration(attackName)
 		self.currAttackKeyTime = self:getKeyFrameTime(skill, 1, attackName)