From 4a5b10c5ca95f49cf3700619e1033da645c9de89 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 23 十一月 2018 11:37:37 +0800
Subject: [PATCH] 4969 上古战场退出副本清除buff

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

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 1fbe500..c504d6d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -2587,7 +2587,7 @@
         buffState.DeleteEffectByIndex(i)
 
 
-# 通过技能ID列表删除buff对应的效果ID
+# 通过技能ID列表删除buff对应的效果ID, 死亡调用
 def ClearBuffEffectBySkillIDList(curObj, buffState, skillIDList):
     
     effectIndexList = []
@@ -2597,11 +2597,17 @@
         if curEffectID == 0:
             continue
         
-        # [技能ID, 来源对象ID,对象类型]
-        if [buffState.GetEffectFromSkillID(i), 
-            buffState.GetEffectOwnerID(i), 
-            buffState.GetEffectOwnerType(i)] not in skillIDList:
+        #=======================================================================
+        # # [技能ID, 来源对象ID,对象类型]
+        # if [buffState.GetEffectFromSkillID(i), 
+        #    buffState.GetEffectOwnerID(i), 
+        #    buffState.GetEffectOwnerType(i)] not in skillIDList:
+        #    continue
+        #=======================================================================
+        # 改成只判断技能ID
+        if buffState.GetEffectFromSkillID(i) not in skillIDList:
             continue
+        
         effectIndexList.append(i)
         
     # 倒序删除
@@ -2648,6 +2654,20 @@
         OperControlManager.SetObjActState(curObj, buffSkill)
 
 
+# 非属性技能算属性 特殊处理
+# 法宝SP技能 如1-4级为增加属性,第5级为伤害效果,第6-10级就要包含属性和伤害效果
+def CalcFabaoSPSkillAttr(curPlayer, curPlayerSkill, allAttrList):
+    if curPlayerSkill.GetFuncType() != ChConfig.Def_SkillFuncType_FbSPSkill:
+        return
+    
+    value = GetMaxHPAttrValue(curPlayerSkill)
+    if value == 0:
+        return
+    
+    PlayerControl.CalcAttrDict_Type(ShareDefine.Def_Effect_MaxHP, value, allAttrList)
+    return
+
+
 # 计算属性类技能的属性,同buff层不算战力
 def CalcPassiveAttr_Effect(curPlayer, allAttrList):
     skillManager = curPlayer.GetSkillManager()
@@ -2656,6 +2676,7 @@
         if curPlayerSkill == None:
             continue
         
+        CalcFabaoSPSkillAttr(curPlayer, curPlayerSkill, allAttrList)
         if not SkillCommon.isPassiveAttr(curPlayerSkill):
             continue
         
@@ -3388,6 +3409,9 @@
 def GetUpLVCostItemNum(curSkill):
     return curSkill.GetExAttr5()
 
+# 技能特殊增加属性配置,目前只支持生命,潜力技能专用
+def GetMaxHPAttrValue(curSkill):
+    return curSkill.GetMP()
 
 ##获得当前技能升级消耗的真气值
 # @param curSkill 当前技能技能

--
Gitblit v1.8.0