From 369e52f7a7b980c882ca322615b1995796fe9223 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 06 十一月 2018 21:38:13 +0800
Subject: [PATCH] 4595 【1.2】【后端】装备战力、评分优化(角色装备、神兽装备 )

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.py |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 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 ab20270..fdd6126 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,27 +15,46 @@
 import GameWorld
 import SkillCommon
 import BuffSkill
+import SkillShell
+import IPY_GameWorld
 
-def CheckCanHappen(attacker, defender, passiveEffect, skillID):
+def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
     curSkill = GameWorld.GetGameData().GetSkillBySkillID(skillID)
     if not curSkill:
         return False
-    
+
     buffType = SkillCommon.GetBuffType(curSkill)
     buffTuple = SkillCommon.GetBuffManagerByBuffType(attacker, buffType)
     #通过类型获取目标的buff管理器为空,则跳出
     if buffTuple == ():
         return False
-    
+
     buffManager = buffTuple[0]
-    buff = buffManager.FindBuff(skillID)
+    buff = buffManager.FindBuff(curSkill.GetSkillTypeID())
     if not buff:
         return False
-    
+
     if buff.GetLayer() <= 0:
         return False
 
+    rate = passiveEffect.GetEffectValue(0)
+    if rate and not GameWorld.CanHappen(rate):
+        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