From a0948adde92689bac0f0566cc257fd848fdfa184 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 13 十一月 2018 10:48:46 +0800
Subject: [PATCH] 4759 【1.2】【后端】开服期间定制运营活动限制几天开出配置

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.py |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.py
index ac475bc..f01be80 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.py
@@ -15,8 +15,24 @@
 import GameWorld
 import SkillCommon
 import BuffSkill
+import SkillShell
+import IPY_GameWorld
 
 def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
+    # 先判断概率
+    rate = passiveEffect.GetEffectValue(0)
+    if rate and not GameWorld.CanHappen(rate):
+        return False
+    
+    # 关联技能
+    checkSkillID = passiveEffect.GetEffectValue(2)
+    if checkSkillID:
+        useSkill = skillkwargs.get("useSkill", None)
+        if not useSkill:
+            return False
+        if useSkill.GetSkillTypeID() != checkSkillID:
+            return False
+        
     curSkill = GameWorld.GetGameData().GetSkillBySkillID(skillID)
     if not curSkill:
         return False
@@ -34,8 +50,21 @@
 
     if buff.GetLayer() <= 0:
         return False
-
+    
     BuffSkill.SetBuffLayer(attacker, buff, buff.GetLayer()-1, skillTypeID=curSkill.GetSkillTypeID())
+    
+    triggerSkillID = passiveEffect.GetEffectValue(1)
+    if triggerSkillID and attacker.GetGameObjType() == IPY_GameWorld.gotPlayer:
+        skillManager = attacker.GetSkillManager()
+        #获得技能
+        curSkill = skillManager.FindSkillBySkillTypeID(triggerSkillID)
+        if curSkill:
+            #玩家技能会升级
+            SkillShell.UsePassiveTriggerSkill(attacker, curSkill, defender, GameWorld.GetGameWorld().GetTick(), isEnhanceSkill = True)
+        else:
+            triggerSkill = GameWorld.GetGameData().GetSkillBySkillID(skillID)
+            if triggerSkill:
+                SkillShell.UsePassiveTriggerSkill(attacker, triggerSkill, defender, GameWorld.GetGameWorld().GetTick(), isEnhanceSkill = True)
     return True
 
 

--
Gitblit v1.8.0