From ce3255b65c0ab6fb2a93e416d39d547632287b51 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 四月 2024 17:08:38 +0800
Subject: [PATCH] 10019 【砍树】回合战斗(增加技能被动效果5015 5016 5017) 1. 增加技能被动效果ID 5015 - 被攻击触发,附加负面状态判断 2. 增加技能被动效果ID 5016 - 灵宠攻击后触发,附加目标负面状态判断 3. 增加技能被动效果ID 5017 - 攻击时提升攻击力,附加当前血量判

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
index 34f2968..f179b2b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
@@ -1298,11 +1298,12 @@
 # hurtType 飘血类型
 # skillAffect 默认True 会被各种技能BUFF盾等影响伤血数值
 #             False代表一些特殊处理纯固定伤害飘字(如采集固定掉1点血)
-def SkillLostHP(curObj, skillTypeID, buffOwner, lostValue, tick, view=True, 
+def SkillLostHP(curObj, curSkill, buffOwner, lostValue, tick, view=True, 
                 isDoAttackResult=True, hurtType=ChConfig.Def_HurtType_Normal,
                 skillAffect=True):
+    skillID = curSkill.GetSkillID() if curSkill else 0
     if lostValue <= 0:
-        GameWorld.Log('###技能伤害血量异常,数值错误 = %s,技能类型ID = %s' % (lostValue, skillTypeID))
+        GameWorld.Log('###技能伤害血量异常,数值错误 = %s,技能类型ID = %s' % (lostValue, skillID))
         return
     
     if not curObj.GetCanAttack():
@@ -1311,7 +1312,7 @@
         return
     
     curObjType = curObj.GetGameObjType()
-    curSkill = GameWorld.GetGameData().FindSkillByType(skillTypeID, 1)
+    #curSkill = GameWorld.GetGameData().FindSkillByType(skillTypeID, 1)
     
     atkObjType = buffOwner.GetGameObjType() if buffOwner else -1
     
@@ -1362,7 +1363,7 @@
     AttackCommon.WriteHurtLog(buffOwner, curObj, curSkill, lostValue, hurtType, "持续掉血")
     if view:
         #广播伤血类型
-        AttackCommon.ChangeHPView(curObj, buffOwner, skillTypeID, lostValue, hurtType)
+        AttackCommon.ChangeHPView(curObj, buffOwner, skillID, lostValue, hurtType)
         if buffOwner:
             PassiveBuffEffMng.OnPassiveSkillTrigger(buffOwner, curObj, curSkill, ChConfig.TriggerType_AttackOverPassive, tick)
         
@@ -1415,7 +1416,7 @@
     
     #统一调用攻击结束动作
     if isDoAttackResult:
-        BaseAttack.DoLogic_AttackResult(buffOwner, curObj, None, tick)
+        BaseAttack.DoLogic_AttackResult(buffOwner, curObj, curSkill, tick)
     return lostHP
 
 ## 检查增加淬毒buff

--
Gitblit v1.8.0