SnxxServerCode.git

			@@ -441,6 +441,18 @@

			return ChConfig.Def_BattleRelationType_PVE

			# 判断PK关系是否可攻击 Def_BattleRelationType_CommNoBoss也可攻击只是攻击无效果
			def CheckBattleRelationType(skillBattleType, battleRelationType):
			if skillBattleType in [ChConfig.Def_BattleRelationType_Comm, ChConfig.Def_BattleRelationType_CommNoBoss]:
			return True

			#if battleRelationType in [ChConfig.Def_BattleRelationType_Comm, ChConfig.Def_BattleRelationType_CommNoBoss]:
			# return True

			if skillBattleType != battleRelationType:
			# PK模式的判定
			return False
			return True

			## 获取攻击类型
			# @param attack 攻击方对象
			@@ -1547,7 +1559,6 @@

			# 血盾
			hurtValue = CalcBloodShield(atkObj, defObj, hurtValue)

			remainHP = min(dMaxHP, max(0, dHP - hurtValue)) # 剩余血量

			remainHP = int(remainHP) #防范
			@@ -1569,6 +1580,12 @@
			else:
			GameWorld.ErrLog('计算伤血值时,防守方类型错误：defObjType = %s' % (defObjType))
			return resultHurtType

			if GameObj.GetHP(defObj) > 0:
			# 被攻击者将部分伤害转化为血量, 返回转化的百分比(小数点)
			changePer = PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(defObj, atkObj, None, ChConfig.TriggerType_ChangeHurtToHP)
			if changePer:
			SkillCommon.SkillAddHP(defObj, 0, int(changePer*hurtValue))

			lostValue = dHP - GameObj.GetHP(defObj) # 实际掉血量
			resultHurtType.LostHP = lostValue
			@@ -1577,7 +1594,7 @@

			#攻击触发事件, 该代码应该放在DoAttack函数中处理逻辑比较清晰，也不会破坏GetHurtHP函数
			#因为DoAttack修改点比较多，暂不迁移，相关攻击事件逻辑，就往此函数中添加
			AttackEventTrigger(atkObj, defObj, resultHurtType, tick)
			AttackEventTrigger(atkObj, defObj, curSkill, resultHurtType, tick)
			#===========================================================================
			# if atkObj.GetGameObjType() == IPY_GameWorld.gotPlayer:
			# GameWorld.DebugAnswer(atkObj, "--%s剩余血量 %s"%(defObj.GetID(), defObj.GetHP()))
			@@ -1705,6 +1722,7 @@

			# atkSkillPer 包含普攻，所以不是用技能增强处理
			atkSkillPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackAddSkillPer)

			atkSkillPer += PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackAddSkillPer)


			@@ -1719,6 +1737,10 @@

			# 暴击增加技能伤害
			atkSkillPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_SuperHitSkillPer)

			if isLuckyHit:
			# 会心一击时增加会心伤害百分比
			aLuckyHit += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_LuckyHit)

			#参与运算的数值
			rand = random.random() #种子数 0~1
			@@ -1749,6 +1771,8 @@
			aNPCHurtAddPer = PlayerControl.GetNPCHurtAddPer(atkObj) # PVE伤害加成
			aDamagePerPVP = PlayerControl.GetDamagePerPVP(atkObj) # 外层PVP伤害加成
			aFinalHurtPer = PlayerControl.GetFinalHurtPer(atkObj) # 最外层伤害加成, 可能为负值
			aFinalHurtPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackAddFinalPer)

			aFinalHurt = PlayerControl.GetFinalHurt(atkObj) # 最终固定伤害
			# 被动增加最终伤害
			aFinalHurt += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackAddFinalValue)
			@@ -1926,12 +1950,12 @@
			## 攻击时事件处理，反弹吸血或者额外触发技能等
			# @param resultHurtType 伤害结构体
			# @return
			def AttackEventTrigger(atkObj, defObj, resultHurtType, tick):
			def AttackEventTrigger(atkObj, defObj, curSkill, resultHurtType, tick):

			#反弹伤害
			CalcBounceHP(atkObj, defObj, resultHurtType.LostHP, resultHurtType.HurtType)
			#吸血
			CalcSuckBlood(atkObj, defObj, resultHurtType.RealHurtHP, tick)
			CalcSuckBlood(atkObj, defObj, curSkill, resultHurtType.RealHurtHP, tick)

			if atkObj.GetGameObjType() == IPY_GameWorld.gotPlayer:
			# 记录最后一次伤害值
			@@ -2053,7 +2077,7 @@
			# @param atkObj 攻击者
			# @param defObj 防守者
			# @return None
			def CalcSuckBlood(atkObj, defObj, hurtValue, tick):
			def CalcSuckBlood(atkObj, defObj, curSkill, hurtValue, tick):

			if atkObj.GetGameObjType() != IPY_GameWorld.gotPlayer:
			return
			@@ -2079,7 +2103,9 @@
			#PVP 攻击回血
			atkBackHP += PlayerControl.GetPVPAtkBackHP(atkObj)
			# 百分比吸血
			atkBackHPPer = PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, None, None, ChConfig.TriggerType_Buff_SuckBloodPer)
			atkBackHPPer = PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, defObj, None, ChConfig.TriggerType_Buff_SuckBloodPer)
			atkBackHPPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_Buff_SuckBloodPer)

			atkBackHP += int(hurtValue * atkBackHPPer*1.0 / ChConfig.Def_MaxRateValue)

			suckHP += atkBackHP