ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
@@ -45,7 +45,7 @@
        effList = []
        
        # 优先取关联技能的
        if connSkillTypeID and connSkillTypeID not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_Buff]:
        if connSkillTypeID and connSkillTypeID not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_Buff, ChConfig.TriggerSrc_SkillSelf, ChConfig.TriggerSrc_BuffSelf]:
            # 技能
            key = (triggerWay, connSkillTypeID)
            if key in self._AffectSkillDict:
@@ -99,12 +99,18 @@
            return
        if triggerWay == ChConfig.TriggerWay_CurSkillEff:
            return
        if triggerSrc == ChConfig.TriggerSrc_Buff:
        if triggerSrc in [ChConfig.TriggerSrc_Buff, ChConfig.TriggerSrc_BuffSelf]:
            # buff有效的不加进来
            return
        
        skillID = curSkill.GetSkillID()
        effectID = effect.GetEffectID()
        if triggerWay == ChConfig.TriggerWay_CalcEffValue:
            triggerWay = "%s_%s" % (triggerWay, effectID)
        if triggerSrc == ChConfig.TriggerSrc_SkillSelf:
            triggerSrc = curSkill.GetSkillTypeID()
        
        key = (triggerWay, triggerSrc)
        if key not in self._AffectSkillDict:
@@ -143,12 +149,18 @@
            return
        if triggerWay == ChConfig.TriggerWay_CurSkillEff:
            return
        if triggerSrc == ChConfig.TriggerSrc_Skill:
        if triggerSrc in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf]:
            # 技能有效的不加进来
            return
        
        buffID = buff.GetBuffID()
        effectID = effect.GetEffectID()
        if triggerWay == ChConfig.TriggerWay_CalcEffValue:
            triggerWay = "%s_%s" % (triggerWay, effectID)
        if triggerSrc == ChConfig.TriggerSrc_BuffSelf:
            triggerSrc = skillData.GetSkillTypeID()
        
        key = (triggerWay, triggerSrc)
        if key not in self._AffectBuffDict:
@@ -720,8 +732,20 @@
        #    return False
        return True
    
    def IsInState(self, state):
    def CheckInState(self, checkInState):
        ## 是否处于某种状态下
        if isinstance(checkInState, int):
            checkInStateList = [checkInState]
        elif isinstance(checkInState, list) or isinstance(checkInState, tuple):
            checkInStateList = checkInState
        else:
            return False
        for state in checkInStateList:
            if self._buffMgr.IsInBuffState(state):
                return True
        return False
    def IsInState(self, state):
        ## 是否处于指定状态下
        return self._buffMgr.IsInBuffState(state)
    
    def IsInControlled(self):