129 【战斗】战斗系统-服务端（关兴技能；增加击杀目标触发方式支持；）

hxp

5 天以前 af884d1dcc3f2854356bd258216f841ff4796333

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py

@@ -84,7 +84,7 @@
    oneActionUseCnt = turnFight.SetOneActionUseSkillCnt(objID, oneActionUseCnt + 1)

    

    bySkillID = bySkill.GetSkillID() if bySkill else 0

    GameWorld.DebugLog("使用技能: curID=%s,skillID=%s,tagCnt=%s,batType=%s,bySkillID=%s,HP:%s/%s,oneActionUseCnt=%s" 
    GameWorld.DebugLog("●使用技能: curID=%s,skillID=%s,tagCnt=%s,batType=%s,bySkillID=%s,HP:%s/%s,oneActionUseCnt=%s" 
                       % (objID, skillID, len(tagObjList), batType, bySkillID, curBatObj.GetHP(), curBatObj.GetMaxHP(), oneActionUseCnt))

    # 以下为技能可以使用的处理，之后的逻辑默认技能使用成功

    

@@ -93,7 +93,7 @@
    if isinstance(useSkill, IpyGameDataPY.IPY_Skill):

        usePoolSkill = True

        # 统一使用 BattleObj.PySkill

        useSkill = poolMgr.acquire(BattleObj.PySkill, useSkill)

        useSkill = poolMgr.acquire(BattleObj.PySkill, useSkill, objID)

        

    useSkill.ResetUseRec()

    useSkill.SetTagObjList(tagObjList)

@@ -775,6 +775,12 @@
            TurnPassive.OnTriggerPassiveEffect(turnFight, curObj, ChConfig.TriggerWay_AttackOverDirect, tagObj, connSkill=useSkill)

            TurnPassive.OnTriggerPassiveEffect(turnFight, tagObj, ChConfig.TriggerWay_BeAttackedDirect, curObj, connSkill=useSkill)

            

    if killObjList:

        tagObj = killObjList[0]

        TurnPassive.OnTriggerPassiveEffect(turnFight, curObj, ChConfig.TriggerWay_KillOneObj, tagObj, connSkill=useSkill)

    for tagObj in killObjList:

        TurnPassive.OnTriggerPassiveEffect(turnFight, curObj, ChConfig.TriggerWay_KillTagObj, tagObj, connSkill=useSkill)

        
    return



def __doCostZhanchui(turnFight, curBatObj, useSkill):

@@ -1403,7 +1409,7 @@
    tagObjList = [defObj]

    

    poolMgr = ObjPool.GetPoolMgr()

    useSkill = poolMgr.acquire(BattleObj.PySkill, skillIpyData)

    useSkill = poolMgr.acquire(BattleObj.PySkill, skillIpyData, atkID)

    useSkill.SetTagObjList(tagObjList)

    useSkill.ClearHurtObj()

    hurtObj = useSkill.AddHurtObj(defID)