1.增加战斗选择目标策略37 2.增加被动类型为15的被动技能不受连击影响 3.取消处于连击状态时buff概率只有一半的设置

script/module/combat/BeSkill.lua

@@ -280,6 +280,7 @@ NO_CHECK_COMBO_LIST = {
     [BESKILL_TYPE37] = 1,
 	[BESKILL_TYPE38] = 1,
 	[BESKILL_TYPE43] = 1,
+	[BESKILL_TYPE15] = 1,
 }
 
 local function checkLimit(data)

script/module/combat/CombatBuff.lua

@@ -588,12 +588,12 @@ local function canAdd(obj, id, random, attacker, skillConfig)
 	-- end
 
 	--连击 BUFF率为 本来的一半
-	if CombatImpl.comboType > 0 then
-		local random = math.random(1, 10000)
-		if random < 5000 then
-			return
-		end
-	end
+	-- if CombatImpl.comboType > 0 then
+	-- 	local random = math.random(1, 10000)
+	-- 	if random < 5000 then
+	-- 		return
+	-- 	end
+	-- end
 	return true
 end
 --根据cmd删除buff

script/module/combat/TargetMode.lua

@@ -192,7 +192,10 @@ local function handlerStatus(attacker,status)
 	end
 end
 --
-CAN_EMPTY_TARGET = { [22] = 1 }
+CAN_EMPTY_TARGET = { 
+	[22] = 1,
+	[37] = 1,
+}
 function getTargets(attacker, targetMode, skillTargets, cmdTargets, checkChaofen, isNormalAtk, skillID, isNeedFentanObjs)
     for i = 1, #targets do
         targets[i] = nil
@@ -1382,6 +1385,15 @@ local function handler36(attacker,targetMode)
 	end
 end
 
+-- 在技能目标中选择友方/敌方
+local function handler37(attacker,targetMode,skillTargets)
+	local targetSide = getTargetSide(attacker,targetMode)
+	for _,obj in ipairs (skillTargets) do
+		if obj.side == targetSide then
+			targets[#targets + 1] = obj
+		end
+	end
+end
 
 
 ------------------------------ 分界线 ------------------------------
@@ -1428,5 +1440,6 @@ handler[0] = handler0 -- 技能选取 和11相同
 handler[34] = handler34	--从技能目标中根据职业选择
 handler[35] = handler35	--从全体中根据种族选择
 handler[36] = handler36	--按照属性X排序，选择前Y个目标, 且排除技能施放者，属性值需要比技能施放者高/低
+handler[37] = handler37 -- 在技能目标中选择友方/敌方
 
 --对象选择器end