129 【战斗】战斗系统-服务端（完善技能目标选择逻辑；支持软控魅惑、混乱、嘲讽，及反击复仇目标，buff状态细分目标，属性细分目标等优先级处理；修复...

hxp

4 天以前 070a0dfddf2d5f85ac348a8d37a606bdbcd0ea0a

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py

@@ -36,7 +36,7 @@
        GameWorld.DebugAnswer(curPlayer, "发起战斗: TurnFight mapID [lineID 玩家ID]")

        GameWorld.DebugAnswer(curPlayer, "设置属性: TurnFight a 属性ID 值 [阵营 位置] ")

        GameWorld.DebugAnswer(curPlayer, "击杀目标: TurnFight k 阵营 [位置 ...] ")

        GameWorld.DebugAnswer(curPlayer, "添加buff: TurnFight b 阵营  位置 buff技能ID")

        GameWorld.DebugAnswer(curPlayer, "添加buff: TurnFight b 阵营  位置 buff归属阵营 位置 技能ID [ID ...]")

        GameWorld.DebugAnswer(curPlayer, "输出明细: TurnFight p [阵营 位置] ")

        GameWorld.DebugAnswer(curPlayer, "阵营： 1-左边；2-右边")

        GameWorld.DebugAnswer(curPlayer, "位置： 1~6号位")

@@ -67,18 +67,21 @@
    clientData.TagID = tagPlayerID

    index = curPlayer.GetIndex()

    tick = GameWorld.GetGameWorld().GetTick()

    TurnAttack.OnTurnFight(index, clientData, tick)

    if not TurnAttack.OnTurnFight(index, clientData, tick):

        GameWorld.DebugAnswer(curPlayer, "请求失败，详见服务器日志！")

    return



def __doSetAttr(curPlayer, msgList):

    ## 设置属性

    attrID = msgList[1] if len(msgList) > 1 else 1

    attrValue = msgList[2] if len(msgList) > 2 else 1

    faction = msgList[3] if len(msgList) > 3 else 1

    posNum = msgList[4] if len(msgList) > 4 else 1

    attrValue = msgList[2] if len(msgList) > 2 else 1    
    faction = msgList[3] if len(msgList) > 3 else 0

    pNum = msgList[4] if len(msgList) > 4 else 0

    

    if faction not in FactionList:

        GameWorld.DebugAnswer(curPlayer, "阵营： 1-左边；2-右边")

    factionList = [faction] if faction else FactionList

    
    if attrID not in ChConfig.AttrIDList:

        GameWorld.DebugAnswer(curPlayer, "不存在该属性ID:%s" % (attrID))

        return

    

    mainFightMgr = TurnAttack.GetMainFightMgr(curPlayer)

@@ -86,34 +89,35 @@
    if not turnFight.isInFight():

        GameWorld.DebugAnswer(curPlayer, "主线非战斗中")

        return

    batFaction = turnFight.getBatFaction(faction)

    batLineup = batFaction.getBatlineup(1)

    objID = batLineup.posObjIDDict.get(posNum)

    batObj = None

    
    GameWorld.DebugAnswer(curPlayer, "----- 设置属性 -----")

    
    batObjMgr = BattleObj.GetBatObjMgr()

    if objID:

        batObj = batObjMgr.getBatObj(objID)

    if not batObj:

        GameWorld.DebugAnswer(curPlayer, "不存在该战斗对象:阵营:%s,位置:%s" % (faction, posNum))

        return

    if not batObj.IsAlive():

        GameWorld.DebugAnswer(curPlayer, "该对象已被击杀:阵营:%s,位置:%s" % (faction, posNum))

        return

    
    if attrID not in ChConfig.AttrIDList:

        GameWorld.DebugAnswer(curPlayer, "不存在该属性ID:%s" % (attrID))

        return

    
    objName = TurnAttack.GetObjName(batObj)

    GameWorld.DebugAnswer(curPlayer, "%s" % (objName))

    batObj.GMSetBatAttr(attrID, attrValue)

    if attrID == ChConfig.AttrID_HP:

        GameWorld.DebugAnswer(curPlayer, "设置生命:%s/%s" % (batObj.GetHP(), batObj.GetMaxHP()))

    elif attrID == ChConfig.AttrID_XP:

        GameWorld.DebugAnswer(curPlayer, "设置怒气:%s" % (batObj.GetXP()))

    else:

        GameWorld.DebugAnswer(curPlayer, "设置属性ID:%s,V=%s" % (attrID, attrValue))

        
    for faction in factionList:

        if faction not in FactionList:

            GameWorld.DebugAnswer(curPlayer, "阵营： 1-左边；2-右边")

            continue

        batFaction = turnFight.getBatFaction(faction)

        batLineup = batFaction.getBatlineup(1)

        posNumList = [pNum] if pNum else batLineup.posObjIDDict.keys()

        for posNum in posNumList:

            objID = batLineup.posObjIDDict.get(posNum)

            batObj = batObjMgr.getBatObj(objID)

            if not batObj:

                GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (faction, posNum))

                continue

            if not batObj.IsAlive():

                GameWorld.DebugAnswer(curPlayer, "对象已阵亡:阵营:%s,位置:%s" % (faction, posNum))

                continue

            objName = TurnAttack.GetObjName(batObj)

            GameWorld.DebugAnswer(curPlayer, "%s" % (objName))

            batObj.GMSetBatAttr(attrID, attrValue)

            if attrID == ChConfig.AttrID_HP:

                GameWorld.DebugAnswer(curPlayer, "设置生命:%s/%s" % (batObj.GetHP(), batObj.GetMaxHP()))

            elif attrID == ChConfig.AttrID_XP:

                GameWorld.DebugAnswer(curPlayer, "设置怒气:%s" % (batObj.GetXP()))

            else:

                GameWorld.DebugAnswer(curPlayer, "设置属性ID:%s,V=%s" % (attrID, attrValue))

    return



def __doKillObj(curPlayer, msgList):

@@ -139,10 +143,10 @@
            continue

        batObj = batObjMgr.getBatObj(objID)

        if not batObj:

            GameWorld.DebugAnswer(curPlayer, "不存在该战斗对象:阵营:%s,位置:%s" % (faction, posNum))

            GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (faction, posNum))

            continue

        if not batObj.IsAlive():

            GameWorld.DebugAnswer(curPlayer, "该对象已被击杀:阵营:%s,位置:%s" % (faction, posNum))

            GameWorld.DebugAnswer(curPlayer, "对象已阵亡:阵营:%s,位置:%s" % (faction, posNum))

            continue

        GameWorld.DebugAnswer(curPlayer, "击杀: %s" % TurnAttack.GetObjName(batObj))

        TurnAttack.SetObjKilled(turnFight, batObj)

@@ -156,7 +160,9 @@
def __doAddBuff(curPlayer, msgList):

    faction = msgList[1] if len(msgList) > 1 else 2

    posNum = msgList[2] if len(msgList) > 2 else 1

    skillID = msgList[3] if len(msgList) > 3 else 0

    ownerFaction = msgList[3] if len(msgList) > 3 else faction

    ownerPosNum = msgList[4] if len(msgList) > 4 else posNum

    skillIDList = msgList[5:]

    if faction not in FactionList:

        GameWorld.DebugAnswer(curPlayer, "阵营： 1-左边；2-右边")

        return

@@ -172,17 +178,29 @@
    objID = batLineup.posObjIDDict.get(posNum)

    batObj = batObjMgr.getBatObj(objID)

    if not batObj:

        GameWorld.DebugAnswer(curPlayer, "不存在该战斗对象:阵营:%s,位置:%s" % (faction, posNum))

        GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (faction, posNum))

        return

    if not batObj.IsAlive():

        GameWorld.DebugAnswer(curPlayer, "该对象已被击杀:阵营:%s,位置:%s" % (faction, posNum))

        GameWorld.DebugAnswer(curPlayer, "对象已阵亡:阵营:%s,位置:%s" % (faction, posNum))

        return

    

    addBuff = TurnBuff.DoAddBuffBySkillID(turnFight, batObj, skillID)

    if addBuff:

        GameWorld.DebugAnswer(curPlayer, "添加buff成功! buffID=%s" % addBuff.GetBuffID())    
    else:

        GameWorld.DebugAnswer(curPlayer, "添加buff失败")

    ownerFaction = turnFight.getBatFaction(ownerFaction)

    ownerLineup = ownerFaction.getBatlineup(1)

    ownerID = ownerLineup.posObjIDDict.get(ownerPosNum)

    buffOwner = batObjMgr.getBatObj(ownerID)

    if not buffOwner:

        GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (ownerFaction, ownerPosNum))

        return

    if not buffOwner.IsAlive():

        GameWorld.DebugAnswer(curPlayer, "对象已阵亡:阵营:%s,位置:%s" % (ownerFaction, ownerPosNum))

        return

    
    for skillID in skillIDList:

        addBuff = TurnBuff.DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner)

        if addBuff:

            GameWorld.DebugAnswer(curPlayer, "添加buff成功!skillID=%s,buffID=%s" % (skillID, addBuff.GetBuffID()))    
        else:

            GameWorld.DebugAnswer(curPlayer, "添加buff失败!skillID=%s" % (skillID))

    return



def __printInfo(curPlayer, msgList):