From e17fcba64e93fceb1459b12cbe70663039d40314 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 一月 2024 18:22:45 +0800
Subject: [PATCH] 10019 【砍树】回合战斗（回合战斗buff持续时间处理及持续性buff定时触发时机处理支持；增加回合战斗死亡及复活支持；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 37c6264..5e7d9ce 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
@@ -62,6 +62,7 @@
import ChNPC
import BossHurtMng
import NPCHurtMgr
+import TurnAttack
import datetime
import math
@@ -2285,7 +2286,7 @@
dFinalHurtReduce = PlayerControl.GetFinalHurtReduce(defObj) # 最终固定伤害减少
dBeHurtPer = PlayerControl.GetBeHurtPer(defObj) # 加深受到伤害百分比
dFightPower = PlayerControl.GetFightPower(defObj)
- dFinalHurtReducePer = PlayerControl.GetFinalHurtReducePer(defObj)
+ dFinalHurtReducePer = GameObj.GetFinalHurtReducePer(defObj)
dFinalHurtReducePer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(defObj, atkObj, curSkill, ChConfig.TriggerType_dFinalHurtReducePer)
else:
@@ -2296,7 +2297,7 @@
dFinalHurtReduce = 0 # 最终固定伤害减少
dBeHurtPer = 0
dFightPower = NPCCommon.GetSuppressFightPower(defObj)
- dFinalHurtReducePer = 0 # 最终伤害减少百分比 默认0
+ dFinalHurtReducePer = GameObj.GetFinalHurtReducePer(defObj)
#攻击字典 { 攻击类型 : '公式' }
mapID = FBCommon.GetRecordMapID(GameWorld.GetMap().GetMapID())
@@ -2603,7 +2604,7 @@
if not hurtValue:
return
- if atkObj.GetDictByKey(ChConfig.Def_Obj_Dict_TurnFightNum):
+ if atkObj.GetDictByKey(ChConfig.Def_Obj_Dict_TurnFightTimeline):
pass
else:
tick = GameWorld.GetGameWorld().GetTick()
@@ -3014,6 +3015,9 @@
if GameObj.GetHP(curObjDetel) > 0:
return
+ if TurnAttack.SetKilled(curObjDetel):
+ return
+
#---玩家处理---
if curObjDetel.GetGameObjType() == IPY_GameWorld.gotPlayer:
playerControl = PlayerControl.PlayerControl(curObjDetel)
--
Gitblit v1.8.0