hxp
2019-11-21 3fa43daecc099f2701baec224a791ca09766cdf4
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -1379,6 +1379,9 @@
    
    #技能攻击
    skillID = curSkill.GetSkillID()
    changeSkillID = PassiveBuffEffMng.GetPassiveSkillValueByTriggerTypeEx(attacker, None, curSkill, ChConfig.TriggerType_ChangeSkillEff)
    if changeSkillID:
        skillID = changeSkillID
    battleType = AttackCommon.GetBattleType(attacker, curSkill)
    #无目标类技能
    if not defender:
@@ -1480,7 +1483,8 @@
        if curPlayerSkill:
            SkillCommon.SetSkillRemainTime(curPlayerSkill, PlayerControl.GetReduceSkillCDPer(curPlayer), tick, curPlayer)
        
        if curSkill.GetFuncType() in [ChConfig.Def_SkillFuncType_GiftSkill, ChConfig.Def_SkillFuncType_FbSPSkill]:
        if curSkill.GetFuncType() in [ChConfig.Def_SkillFuncType_GiftSkill, ChConfig.Def_SkillFuncType_FbSPSkill,
                                      ChConfig.Def_SkillFuncType_PassiveSkillWithSP]:
            UseSkillOver(curPlayer, target, curSkill, tick)
        else:
            OnHurtTypeTriggerPassiveSkill(curPlayer, target, curSkill, tick)
@@ -1668,8 +1672,8 @@
        # 攻击减层级 优先处理,因为同个技能触发buff后,会再处理层级,导致立即减层级
        PassiveBuffEffMng.OnPassiveBuffTrigger(attacker, defender, curSkill, ChConfig.TriggerType_Buff_AttackSubLayer, tick)
    
    # 普攻和对敌技能
    if not curSkill or curSkill.GetSkillType() in ChConfig.Def_CanAttackSkill_List:
    # 普攻和对敌技能, 此处暂且特殊处理Def_SkillFuncType_PassiveSkillWithSP,待优化
    if not curSkill or curSkill.GetSkillType() in ChConfig.Def_CanAttackSkill_List or curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_PassiveSkillWithSP:
        PassiveBuffEffMng.OnPassiveSkillTrigger(attacker, defender, curSkill, ChConfig.TriggerType_AttackOver, tick)
        PassiveBuffEffMng.OnPassiveBuffTrigger(attacker, defender, curSkill, ChConfig.TriggerType_AttackOver, tick)
@@ -2757,6 +2761,7 @@
    # ChangeAction(paAttack);
    # m_LastBattleTick = GetGameWorldManager()->GetTick();
    #===========================================================================
    sendPack = ChNetSendPack.tagUseSkillPos()
    sendPack.Clear()
    sendPack.ObjID = attacker.GetID()