From 7e061666ff94ee05d08028ab0e4ac41afd3d4419 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 07 十一月 2018 11:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
index 967058e..4bb0a12 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -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 攻击方对象
@@ -1582,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()))
@@ -1710,6 +1722,7 @@
# atkSkillPer 包含普攻，所以不是用技能增强处理
atkSkillPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackAddSkillPer)
+
atkSkillPer += PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackAddSkillPer)
@@ -1758,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)
@@ -1935,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:
# 记录最后一次伤害值
@@ -2062,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
@@ -2088,8 +2103,9 @@
#PVP 攻击回血
atkBackHP += PlayerControl.GetPVPAtkBackHP(atkObj)
# 百分比吸血
- atkBackHPPer = PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, None, None, ChConfig.TriggerType_Buff_SuckBloodPer)
- atkBackHPPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(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
--
Gitblit v1.8.0