From e5d9e13d80e43fb89e00cc9e0ffafcb25e36e435 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 27 三月 2019 16:55:12 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置(页游领地争夺战)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |   19 +++----------------
 1 files changed, 3 insertions(+), 16 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 7581367..ba1c674 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -27,12 +27,10 @@
 import FBLogic
 import ItemCommon
 import OperControlManager
-import GameLogic_ManorWar
 import PetControl
 import ReadChConfig
 import DataRecordPack
-import ChItem
-import PlayerActivity
+#import ChItem
 import ShareDefine
 import PlayerGreatMaster
 import PlayerHorse
@@ -46,7 +44,7 @@
 import SkillShell
 import FBCommon
 import IpyGameDataPY
-import EquipZhuXian
+#import EquipZhuXian
 #---------------------------------------------------------------------
 GameWorld.ImportAll("Script\\Skill\\" , "GameSkills")
 GameWorld.ImportAll("Script\\Skill\\" , "GameBuffs")
@@ -2252,14 +2250,6 @@
             #GameWorld.Log("删除场景Buff %d"%skillID)
             processResult = True
             continue
-        else:
-            # 非领地战期间, 该区域有领地旗buff, 删除区域buff
-            if skillID == ChConfig.Def_SkillID_ManorFlagArea and not GameLogic_ManorWar.CanManorWarAtk():
-                mapBuffManager.DeleteBuffByIndex(index)
-                ClearBuffEffectBySkillID(curPlayer, skillID, ownerID, ownerType)
-                processResult = True
-                #GameWorld.DebugLog("非领地战期间, 该区域有领地旗buff, 删除区域buff")
-                continue
         
         index += 1
         
@@ -2285,10 +2275,7 @@
                 continue
             if findBuff.GetSkill().GetSkillLV() > curSkill.GetSkillLV():
                 continue
-        
-        if skillTypeID == ChConfig.Def_SkillID_ManorFlagArea and not GameLogic_ManorWar.CanManorWarAtk():
-            #GameWorld.DebugLog("    i=%s,effectID=%s,skillID=%s, 该位置有buff, 非领地战期间, 不添加" % (i, effectID, skillTypeID))
-            continue
+            
         #添加场景buff
         isOK = BuffSkill.AddBuffNoRefreshState(curPlayer, IPY_GameWorld.bfMapBuff, curSkill, tick)
         processResult = processResult or isOK

--
Gitblit v1.8.0