From 0ce10692f53e9df632d848368f7081440974091f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 23 九月 2025 19:43:42 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（张飞技能；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6007.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6006.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6008.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6009.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py | 3 ++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6003.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6002.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.py | 9 ++++++++-
9 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6002.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6002.py
index f315b77..24c5f9c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6002.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6002.py
@@ -15,7 +15,7 @@
#"""Version = 2025-09-16 17:00"""
#-------------------------------------------------------------------------------
-def GetHappenValue(attacker, defender, curEffect, effSkill, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
checkInStateList = curEffect.GetEffectValue(1)
if checkInStateList:
if not defender.CheckInState(checkInStateList):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6003.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6003.py
index f38a750..213331c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6003.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6003.py
@@ -15,7 +15,7 @@
#"""Version = 2025-09-16 17:30"""
#-------------------------------------------------------------------------------
-def GetHappenValue(attacker, defender, curEffect, effSkill, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
checkInStateList = curEffect.GetEffectValue(1)
if checkInStateList:
if not defender.CheckInState(checkInStateList):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.py
index 218145c..df51e52 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.py
@@ -18,7 +18,7 @@
import BattleObj
#import GameWorld
-def GetHappenValue(attacker, defender, curEffect, effSkill, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
checkInStateList = curEffect.GetEffectValue(1)
if checkInStateList:
checkMainSkillTag = curEffect.GetEffectValue(2)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6006.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6006.py
index f884724..4aa70f7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6006.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6006.py
@@ -15,7 +15,7 @@
#"""Version = 2025-09-23 17:00"""
#-------------------------------------------------------------------------------
-def GetHappenValue(attacker, defender, curEffect, effSkill, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
checkHeroJob = curEffect.GetEffectValue(1)
if checkHeroJob:
if checkHeroJob != defender.GetJob():
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6007.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6007.py
index 20060e4..cc80f66 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6007.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6007.py
@@ -15,5 +15,5 @@
#"""Version = 2025-09-22 16:00"""
#-------------------------------------------------------------------------------
-def GetHappenValue(attacker, defender, curEffect, effSkill, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
return curEffect.GetEffectValue(0)
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6008.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6008.py
index 176d158..c87f29c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6008.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6008.py
@@ -15,7 +15,7 @@
#"""Version = 2025-09-22 16:00"""
#-------------------------------------------------------------------------------
-def GetHappenValue(attacker, defender, curEffect, effSkill, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
lowerThanPer = curEffect.GetEffectValue(0)
nowPer = attacker.GetHP() / float(attacker.GetMaxHP()) * 100
return 1 if nowPer < lowerThanPer else 0
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6009.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6009.py
index 1c4d994..6f4f256 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6009.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6009.py
@@ -15,7 +15,7 @@
#"""Version = 2025-09-23 19:00"""
#-------------------------------------------------------------------------------
-def GetHappenValue(attacker, defender, curEffect, effSkill, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
lowerThanPer = curEffect.GetEffectValue(0)
nowPer = defender.GetHP() / float(defender.GetMaxHP()) * 100
return 1 if nowPer < lowerThanPer else 0
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.py
index cc3df06..a994394 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.py
@@ -15,13 +15,20 @@
#"""Version = 2025-09-16 14:30"""
#-------------------------------------------------------------------------------
-def GetHappenValue(attacker, defender, curEffect, effSkill, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
checkInStateList = curEffect.GetEffectValue(2)
if checkInStateList:
if not defender.CheckInState(checkInStateList):
return
+ onlyOwner = curEffect.GetEffectValue(3) # 是否仅对buff施法者有效，默认0-否，1-是
+ if onlyOwner:
+ if not effBuff:
+ return
+ if effBuff.GetOwnerID() != defender.GetID():
+ return
+
attrValue = curEffect.GetEffectValue(0)
calcType = curEffect.GetEffectValue(1)
if calcType == 2: # 减少，其他默认增加
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
index e76260f..ef57875 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
@@ -133,6 +133,7 @@
effSkill = skillMgr.FindSkillByID(skillID)
if not effSkill and connSkill and connSkill.GetSkillID() == skillID:
effSkill = connSkill
+ effBuff = None
elif sign == "buff":
buffID, effIDList = effInfo[1:]
effBuff = buffMgr.GetBuff(buffID)
@@ -161,7 +162,7 @@
callFunc = GameWorld.GetExecFunc(PassiveTrigger, "%s.%s" % (pyName, "GetHappenValue"))
if not callFunc:
continue
- value = callFunc(atkObj, defObj, effect, effSkill, **kwargs)
+ value = callFunc(atkObj, defObj, effect, effSkill, effBuff, **kwargs)
if value is None:
continue
--
Gitblit v1.8.0