From 54c13f69ac0f3f043ae964fb6174c49876a92941 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 24 六月 2019 11:50:04 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 新增技能类型
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4109.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py | 20 ++++++++++++--------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 10 ++++++----
4 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index babd797..c8002e4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -1224,7 +1224,7 @@
) = range( 0, Def_AutoAtkSkillType )
#技能类型
-Def_SkillType_Count = 24
+Def_SkillType_Count = 25
(
Def_SkillType_Special , #特殊技能 0
Def_SkillType_Atk , #攻击类 1
@@ -1250,6 +1250,7 @@
Def_SkillType_PassiveLstPlsBuff, #被动触发持续增益类buff 21
Def_SkillType_PassiveLstDepBuff, #被动触发持续减益类buff 22
Def_SkillType_AttrSkillNoLearn, # 可叠加的同类型ID属性类技能 不可学习 算属性直接取表 目前用于神兽技能 23
+ Def_SkillType_PassiveLstPlsBuffAtk, #被动持续攻击类BUFF 24
) = range( 0, Def_SkillType_Count )
@@ -1273,20 +1274,21 @@
Def_SkillType_PassiveActionBuff : IPY_GameWorld.bfActionBuff , #影响行为BUFF 14
Def_SkillType_PassiveLstPlsBuff: IPY_GameWorld.bfProcessBuff, #被动触发持续增益类buff 3
Def_SkillType_PassiveLstDepBuff: IPY_GameWorld.bfProcessDeBuff, #被动触发持续减益类buff 4
+ Def_SkillType_PassiveLstPlsBuffAtk : IPY_GameWorld.bfProcessBuff , #持续增益BUFF 3
}
# 伤害型技能
-Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk]
+Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk]
#持续型技能列表
-Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk,
+Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
Def_SkillType_PassiveLstPlsBuff, Def_SkillType_PassiveLstDepBuff ]
#对敌使用技能列表
Def_CanAttackSkill_List = [ Def_SkillType_LstDepBuff, Def_SkillType_DepBuff, Def_SkillType_Atk,
- Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk,
+ Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
Def_SkillType_PassiveDepBuff, Def_SkillType_PassiveActionBuff, Def_SkillType_PassiveLstDepBuff ]
#不利BUFF给NPC添加仇恨
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 c2f464a..b3cc67c 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
@@ -1610,14 +1610,16 @@
#---添加的Buff值---
addBuffValue = 0
- #是否是持续性技能
- if curSkill.GetSkillType() in ChConfig.Def_LstBuff_List:
- callFunc = GameWorld.GetExecFunc(GameSkills, "SkillBuff_AddBuffValue.AddBuffValue")
-
- if callFunc != None:
- addBuffValue = int(callFunc(curObj, None, curSkill, tick))
- else:
- GameWorld.ErrLog("SkillBuff_AddBuffValue.AddBuffValue")
+ #===========================================================================
+ # #是否是持续性技能
+ # if curSkill.GetSkillType() in ChConfig.Def_LstBuff_List:
+ # callFunc = GameWorld.GetExecFunc(GameSkills, "SkillBuff_AddBuffValue.AddBuffValue")
+ #
+ # if callFunc != None:
+ # addBuffValue = int(callFunc(curObj, None, curSkill, tick))
+ # else:
+ # GameWorld.ErrLog("SkillBuff_AddBuffValue.AddBuffValue")
+ #===========================================================================
return BuffSkill.DoAddBuff(curObj , buffType, curSkill , tick, [addBuffValue])
@@ -1876,6 +1878,7 @@
ChConfig.Def_SkillType_PassiveActionBuff, #被动触发的控制类buff 18
ChConfig.Def_SkillType_PassiveLstPlsBuff, #被动触发持续增益类buff 21
ChConfig.Def_SkillType_PassiveLstDepBuff, #被动触发持续减益类buff 22
+ ChConfig.Def_SkillType_PassiveLstPlsBuffAtk,
]
## 被动触发的技能效果或者释放技能
@@ -1887,6 +1890,7 @@
ChConfig.Def_SkillType_PassiveActionBuff, #被动触发的控制类buff 18
ChConfig.Def_SkillType_PassiveLstPlsBuff, #被动触发持续增益类buff 21
ChConfig.Def_SkillType_PassiveLstDepBuff, #被动触发持续减益类buff 22
+ ChConfig.Def_SkillType_PassiveLstPlsBuffAtk,
]
def isPassiveAttr(curSkill):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4109.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4109.py
index fbae1ab..1169182 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4109.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4109.py
@@ -20,5 +20,5 @@
def GetValue(attacker, defender, effect):
- return effect.GetEffectValue(0)*GameObj.GetMaxHP(GameObj)/ChConfig.Def_MaxRateValue
+ return effect.GetEffectValue(0)*GameObj.GetMaxHP(attacker)/ChConfig.Def_MaxRateValue
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
index 2c0fed2..35e701d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -3468,7 +3468,7 @@
#这个技能是Buff
if SkillCommon.IsBuff(curSkill):
- if ChConfig.Def_SkillType_LstPlsBuffAtk == curSkill.GetSkillType():
+ if curSkill.GetSkillType() in [ChConfig.Def_SkillType_LstPlsBuffAtk, ChConfig.Def_SkillType_PassiveLstPlsBuffAtk]:
defender = attacker
return __DoLogic_AddBuff(attacker, defender, curSkill, isEnhanceSkill, tick, tagRoundPosX, tagRoundPosY)
--
Gitblit v1.8.0