From 010db2152c26061cf4ac03a72fbd574196001f74 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 14 五月 2019 14:13:19 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 被动技能

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 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 47def0e..b39b849 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -43,7 +43,12 @@
 
 GameWorld.ImportAll("Script\\Skill\\", "PassiveBuff")
 
-
+# 被动关联的技能模块
+# 获得关联技能,0 全部 1是主动型技能(法宝,普攻) 2 为人族法宝技能 3为普攻  其他技能ID
+Def_ConnSkill_Template = {
+             ChConfig.Def_SkillFuncType_FbSkill:[1,2],
+             ChConfig.Def_SkillFuncType_NormalAttack:[1,3],
+             }
 
 # --------被动功法设置--------------------------------------------------------------------
 
@@ -432,6 +437,7 @@
              4533:ChConfig.TriggerType_BurnDisappear, # 灼烧消失触发 81
              4534:ChConfig.TriggerType_DebuffOff,   # BUFF类: 抵消debuff
              4535:ChConfig.TriggerType_BeAttackAddSkillPer, # buff中, 被攻击提高技能伤害
+             4536:ChConfig.TriggerType_AddBuffOver, 
              
              803:ChConfig.TriggerType_BloodShield,  # 血盾
              806:ChConfig.TriggerType_BloodShield,  # 血盾
@@ -696,12 +702,14 @@
         skillList.extend(self.AffectSuperEquipSkillDict.get((triggerType, connSkillID), []))
         
         # 指定特殊类型可触发
+        # 获得关联技能,0 全部 1是主动型技能(法宝,普攻) 2 为人族法宝技能 3为普攻  其他技能ID
         if connSkill and connSkill.GetFuncType() in [ChConfig.Def_SkillFuncType_FbSkill, ChConfig.Def_SkillFuncType_NormalAttack]:
-            funcType = 1
-            skillList.extend(self.AffectSkillDict.get((triggerType, funcType), []))
-            skillList.extend(self.AffectPassiveSkillSetDict.get((triggerType, funcType), []))
-            skillList.extend(self.AffectDogzSkillDict.get((triggerType, funcType), []))
-            skillList.extend(self.AffectSuperEquipSkillDict.get((triggerType, funcType), []))
+            funcTypeList = Def_ConnSkill_Template.get(connSkill.GetFuncType(), [])
+            for funcType in funcTypeList:
+                skillList.extend(self.AffectSkillDict.get((triggerType, funcType), []))
+                skillList.extend(self.AffectPassiveSkillSetDict.get((triggerType, funcType), []))
+                skillList.extend(self.AffectDogzSkillDict.get((triggerType, funcType), []))
+                skillList.extend(self.AffectSuperEquipSkillDict.get((triggerType, funcType), []))
         
         # 被动再触发被动限制为指定
         if connSkill and SkillCommon.isPassiveSkill(connSkill):

--
Gitblit v1.8.0