From 62f26436a4a204a3919ba7fa98319ee72d66a411 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 22 十月 2018 21:11:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
index 4099682..3b3543c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -816,6 +816,11 @@
return True
+
+#ntSummon：（3）普通召唤兽，可继承主人基础属性如攻击
+#ntElf：（4）玩家替身，完全拥有玩家属性和被动功能
+#ntFairy ：（7）同ntSummon，但技能可触发被动功能
+
# ntElf 定义为人物使用对地持续性技能，并且人物可以移动，则需要ntElf做依托物的情况
# 那么ntElf执行人物的伤害计算和被动触发效果
# 被动技能只处理玩家，宠物，和灵
@@ -825,7 +830,7 @@
return attacker
npcType = attacker.GetType()
- if npcType not in [IPY_GameWorld.ntPet, IPY_GameWorld.ntElf]:
+ if npcType not in [IPY_GameWorld.ntPet, IPY_GameWorld.ntElf, IPY_GameWorld.ntFairy]:
if attacker.GetIsBoss():
return attacker
return
@@ -834,7 +839,7 @@
# --宠物
return attacker
- if npcType == IPY_GameWorld.ntElf:
+ else:
# ntElf 定义为人物使用对地持续性技能，并且人物可以移动，则需要ntElf做依托物的情况
# 那么ntElf执行人物的伤害计算和被动触发效果
attacker = NPCCommon.GetSummonNPCOwner(IPY_GameWorld.gotPlayer, attacker)
--
Gitblit v1.8.0