Merge branch 'master' into dev

# Conflicts:
#	lua/app/module/battle/controller/battle_controller.lua

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

@@ -1004,6 +1004,9 @@ function BattleUnitComp:updateSkillAttack(dt)
 				self:doNextNormalAttack()
 			end
 		else
+			if self.currAttackDuration <= 0 and self.currActiveSkill then -- 当前动画异常 没有进入onSkillTakeEffect，不会攻击次数减一，所以手动调用一次
+				self.currActiveSkill:endUse()
+			end
 			local currActiveSkill = nil
 			local skillCanUseTimes = self.currActiveSkill:getSkillCanUseTimes()
 			if skillCanUseTimes and skillCanUseTimes > 0 then -- 当前技能可以多次使用