From ff48a24b8da42998da61b4ff4000e758d8d1b041 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 27 一月 2021 11:18:52 +0800
Subject: [PATCH] 8710 【开发】【主干】【BT2】根据世界等级配置奖励(成长必买改为通知对应不同世界等级的物品信息);

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.py |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.py
index fde6f13..cfce1bf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.py
@@ -30,23 +30,28 @@
 def UseSkill(attacker, defender, curSkill, tagRoundPosX, tagRoundPosY, isEnhanceSkill, tick):
     if not defender:
         return
-    
     if not GameWorld.CanHappen(curSkill.GetHappenRate(), ChConfig.Def_MaxRateValue):
         #清除失败也触发CD
         return BaseAttack.DoSkillEx_AttackSucess(attacker, defender, curSkill, tick, isEnhanceSkill)
     
     delSuccess = False
-    
     # 优先清理指定技能
     mark = curSkill.GetEffect(0).GetEffectValue(1)
     theSkillID = mark if mark > 10 else 0
     cleanCnt = mark if 0< mark <= 10 else 1
     if theSkillID:
         if not curSkill.GetEffect(0).GetEffectValue(2):
-            findBuff = SkillCommon.FindBuffByID(defender, theSkillID)
+            findBuff, buffManager, buffType, buffSkill = SkillCommon.FindBuffByID(defender, theSkillID)
         else:
-            findBuff = SkillCommon.FindBuffByOwner(defender, theSkillID, attacker.GetID(), attacker.GetGameObjType())
+            findBuff, buffManager, buffType, buffSkill = SkillCommon.FindBuffByOwnerEx(defender, theSkillID, attacker.GetID(), attacker.GetGameObjType())
         if findBuff:
+            ownerID, ownerType = findBuff.GetOwnerID(), findBuff.GetOwnerType()
+            
+            #删除Buff
+            BuffSkill.DoBuffDisApperEx(defender, findBuff, tick)
+            skillID = buffSkill.GetSkillID()
+            buffManager.DeleteBuffByTypeID(buffSkill.GetSkillTypeID())
+            SkillShell.ClearBuffEffectBySkillID(defender, skillID, ownerID, ownerType)
             delSuccess = True
     else:
         # 某类技能中的一个

--
Gitblit v1.8.0