hxp
2019-03-28 cdaa0f6d8e428e1c28ff36a1b1a986ec59e354b4
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")
@@ -1883,9 +1881,9 @@
        if not PlayerGreatMaster.GetGreatMasterFreeSkillPoint(curPlayer):
            return False
    #诛仙技能学习判断
    if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_ZhuXian:
        if not EquipZhuXian.CheckLearnZhuXianSkill(curPlayer, curSkillTypeID):
            return False
    #if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_ZhuXian:
    #    if not EquipZhuXian.CheckLearnZhuXianSkill(curPlayer, curSkillTypeID):
    #        return False
        
    #经验检测
    skillLvUpNeedExp = upSkill.GetLVUpCostExp()
@@ -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
@@ -2728,7 +2715,8 @@
        if curPlayerSkill.GetFuncType() not in [ChConfig.Def_SkillFuncType_FbSkill,
                                            ChConfig.Def_SkillFuncType_FbSPSkill,
                                            ChConfig.Def_SkillFuncType_GiftSkill,
                                            ChConfig.Def_SkillFuncType_GWSkill]:
                                            ChConfig.Def_SkillFuncType_GWSkill,
                                            ChConfig.Def_SkillFuncType_ZhuXian]:
            # 根据技能情况调整
            continue
        
@@ -3437,7 +3425,7 @@
    
    return curSkill.GetExAttr2()
# 只有在指定地图才能生效的buff效果
# 只有在指定地图才能生效的buff效果,或者指定地图可被动触发
def GetAttrMapID(curSkill):
    return curSkill.GetExAttr3()