From 3ea80a39cf950e4dd7f65f44b3487b6787f45f4a Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 14 五月 2019 20:46:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4015.py | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4015.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4015.py
index 9cdd325..77da405 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4015.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4015.py
@@ -21,12 +21,16 @@
if not defender:
return False
- if GameObj.GetPyPlayerState(defender, effect.GetEffectValue(1)):#ChConfig.Def_PlayerState_Stun):
- GameWorld.DebugLog("状态触发----%s"%effect.GetEffectValue(1))
+ ownerID, ownerType = 0, 0
+ if effect.GetEffectValue(2):
+ ownerID, ownerType = attacker.GetID(), attacker.GetGameObjType()
+
+ if GameObj.GetPyPlayerState(defender, effect.GetEffectValue(1), ownerID, ownerType):#ChConfig.Def_PlayerState_Stun):
+ #GameWorld.DebugLog("状态触发----%s"%effect.GetEffectValue(1))
return True
return False
def GetValue(attacker, defender, effect):
- return float(effect.GetEffectValue(0))/ChConfig.Def_MaxRateValue
+ return effect.GetEffectValue(0)
--
Gitblit v1.8.0