From cf2d56a012082ceb2a0906d97935d05d947ea595 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 18 九月 2018 15:15:34 +0800
Subject: [PATCH] 1 召唤陷阱 延迟0.5秒后可触发,进入攻击范围中陷阱,陷阱消失

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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 36862b2..293d7c0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -13,7 +13,7 @@
 #
 # @change: "2016-11-16 15:30" hxp 增加获取衰弱效果信息列表
 #
-# 详细描述: 被动buff效果管理
+# 详细描述: 被动buff效果管理s
 #
 #---------------------------------------------------------------------
 #"""Version = 2016-11-16 15:30"""
@@ -26,7 +26,6 @@
 import GameWorld
 import ChConfig
 import IpyGameDataPY
-#import SkillBoosts
 import SkillCommon
 import BuffSkill
 import SkillShell
@@ -41,8 +40,8 @@
 import EventShell
 import NPCCommon
 import PetControl
+import QuestCommon
 
-#GameWorld.ImportAll("Script\\Skill\\", "SkillBoosts")
 GameWorld.ImportAll("Script\\Skill\\", "PassiveBuff")
 
 
@@ -95,6 +94,17 @@
                     return
             if key == "MountLv":
                 if PlayerHorse.GetHorseSumLV(curPlayer) < value:
+                    return
+            
+
+            # 多加一种任务判断
+            if key == "OpenSkillSlots":
+                # 主线任务完成时会设置标志可进地图标志
+                mission_1 = QuestCommon.GetCommonMission(curPlayer)
+                if not mission_1:
+                    return
+
+                if (pow(2, int(strIndex)) & mission_1.GetProperty("OpenSkillSlots")) == 0:
                     return
                 
     PlayerControl.NomalDictSetProperty(curPlayer, 
@@ -314,6 +324,7 @@
              4048:ChConfig.TriggerType_MissSkill,   # 闪避后触发释放技能
              4049:ChConfig.TriggerType_MissSuccessPer, # 闪避成功率提升
              4050:ChConfig.TriggerType_OneDamage,   # 伤害降低到1点
+             4051:ChConfig.TriggerType_LuckyHit, # 会心一击时增加会心伤害百分比 50
              }
     return tdict.get(effectID, -1)
     #===========================================================================
@@ -344,6 +355,7 @@
              4511:ChConfig.TriggerType_AttackAddFinalValue,   #攻击增加输出伤害11
              4512:ChConfig.TriggerType_ReduceHurtHPPer, # 百分比减少攻击计算后伤害 
              4513:ChConfig.TriggerType_AttackAddFinalValue,   #攻击增加输出伤害11
+             4515:ChConfig.TriggerType_AddIceAtkPer,    # BUFF类:攻击附加真实伤害百分比 
              803:ChConfig.TriggerType_BloodShield,  # 血盾
              806:ChConfig.TriggerType_BloodShield,  # 血盾
              808:ChConfig.TriggerType_BloodShield,  # 血盾

--
Gitblit v1.8.0