From 5988078971fb13c4f0e24bb557106d8ac2b0bdd6 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 21 六月 2019 14:41:37 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 神火定身
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4536.py | 17 ++++++++++++-----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintSkill.py | 3 ++-
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintSkill.py
index 548dc4d..e0c2c5a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintSkill.py
@@ -54,10 +54,11 @@
12 : "神兽技能",
13 : "诛仙技能",
14 : "套装技能",
+ 15 : "可有专精的被动技能",
}
for funcType, skillList in skillDict.items():
- GameWorld.DebugAnswer(curPlayer, "%s : %s"%(showDict[funcType], skillList))
+ GameWorld.DebugAnswer(curPlayer, "%s : %s"%(showDict.get(funcType, funcType), skillList))
if not cmdList:
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
index 162dabd..a5b2f84 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
@@ -413,7 +413,7 @@
# 此处不能传技能curSkill 屏蔽被动触发被动限制
# 暂且特殊处理控制类buff才触发
if SkillCommon.GetBuffType(curSkill) == IPY_GameWorld.bfActionBuff:
- PassiveBuffEffMng.OnPassiveBuffTrigger(curObj, buffOwner, None, ChConfig.TriggerType_AddBuffOver, tick)
+ PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(curObj, buffOwner, curSkill, ChConfig.TriggerType_AddBuffOver)
#是否是持续性技能
isLstSkill = curSkill.GetSkillType() in ChConfig.Def_LstBuff_List
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4536.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4536.py
index bc16386..954f6bc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4536.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4536.py
@@ -20,23 +20,30 @@
def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
if not defender:
return
+
+ useSkill = skillkwargs.get("useSkill", None)
+ if useSkill:
+ if useSkill.GetSkillTypeID() == skillID:
+ # 自己不加时长
+ return
+
findBuff = SkillCommon.FindBuffByOwner(attacker, skillID, defender.GetID(), defender.GetGameObjType())
if not findBuff:
return False
-
curValue = findBuff.GetValue2()
if curValue >= passiveEffect.GetEffectValue(1):
return False
-
remainTime = findBuff.GetRemainTime()
+
findBuff.SetRemainTime(remainTime + passiveEffect.GetEffectValue(0))
+ curSkill = GameWorld.GetGameData().GetSkillBySkillID(skillID)
+ BuffSkill.PYSync_RefreshBuff(attacker, findBuff, SkillCommon.GetBuffType(curSkill), notifyAll=False, owner = defender)
findBuff.SetValue2(curValue + 1)
return False
-def GetSkillData(passiveEffect):
- return None
-
+def GetValue(attacker, defender, passiveEffect):
+ return 0
--
Gitblit v1.8.0