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

lua/app/module/battle/battle_const.lua

@@ -154,6 +154,7 @@ BattleConst.PASSIVE_EVENT = {
     ON_UNI_ATTACK_START = 3,    -- 攻击开始前
     HP_LOWER_THAN = 4,          -- 血量低于X%
     USE_NORMAL_SKILL = 5,       -- 使用普攻
+    ACTIVE_SKILL_HIT = 6,       -- 主动技能命中
 }
 
 local BUFF_NAME = {

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

@@ -1010,8 +1010,12 @@ function BattleUnitComp:onSkillTakeEffect(skill)
 			succ = true
 		end
 	end
-	if succ and skill:getIsNormalType() then -- 普攻攻击成功的话
+	if succ then
-		self:checkPassiveEvent(PASSIVE_EVENT.USE_NORMAL_SKILL, target)
+	 	if skill:getIsNormalType() then -- 普攻攻击成功的话
+			self:checkPassiveEvent(PASSIVE_EVENT.USE_NORMAL_SKILL, target)
+		elseif skill:getIsActiveType() then
+			self:checkPassiveEvent(PASSIVE_EVENT.ACTIVE_SKILL_HIT, target)
+		end
 		local shakeType = skill:getShakeType()
 		if shakeType then
 			local shakeTime = skill:getShakeTime() or 0

lua/app/module/battle/helper/battle_passive.lua

@@ -45,11 +45,16 @@ local function _checkUseNormalSkill(unitComp, skill, targetComp)
 	return 1
 end
 
+local function _checkActiveSkillHit(unitComp, skill, targetComp)
+	return 1
+end
+
 BattlePassive.checkTrigger = {
 	[PASSIVE_EVENT.ON_UNIT_PREPARE_OVER] = _checkOnUnitPrepareOver,
 	[PASSIVE_EVENT.ON_UNI_ATTACK_START] = _checkOnUniAttackStart,
 	[PASSIVE_EVENT.HP_LOWER_THAN] = _checkhpLowerThan,
 	[PASSIVE_EVENT.USE_NORMAL_SKILL] = _checkUseNormalSkill,
+	[PASSIVE_EVENT.ACTIVE_SKILL_HIT] = _checkActiveSkillHit,
 }
 
 return BattlePassive

lua/app/userdata/battle/skill/battle_skill_entity.lua

@@ -117,6 +117,10 @@ function BattleSkillEntity:getIsNormalType()
 	return self.skillType == BattleConst.SKILL_TYPE_NORMAL
 end
 
+function BattleSkillEntity:getIsActiveType()
+	return self.skillType == BattleConst.SKILL_TYPE_ACTIVE
+end
+
 function BattleSkillEntity:changeSkillId(skillId)
 	self.skillId = skillId
 	self:init()