129 【战斗】战斗系统-服务端（优化战斗武将跟NPC独立处理；去除程序无技能普攻，增加反击普攻；新增回合主动普攻技能功能类型23；）

hxp

3 天以前 35c596a6ed34680d9af09788274051c1c212d4eb

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py

@@ -35,12 +35,13 @@
import ItemControler

import SkillCommon

import SkillShell

import BaseAttack

import AttackCommon



import random

import time

import json



FighterNPCID = 100 # 战斗NPCID，仅后端用，除怪物外，所有玩家武将均使用该NPCID

PosNumMax = 10 # 最大站位编号

ActionNumStart = -1 # 起始行动位置编号，一般是从1开始，如果有加主公、红颜等则扣除相应位置值，如从0或-1开始



@@ -374,6 +375,8 @@
                    tfObj = ChPyNetSendPack.tagSCTurnFightObj()

                    tfObj.ObjID = curNPC.GetID()

                    tfObj.NPCID = curNPC.GetNPCID()

                    tfObj.HeroID = curNPC.GetDictByKey(ChConfig.Def_Obj_Dict_HeroID)

                    tfObj.SkinID = curNPC.GetDictByKey(ChConfig.Def_Obj_Dict_SkinID)

                    tfObj.HP = curNPC.GetHP()

                    tfObj.HPEx = curNPC.GetHPEx()

                    tfObj.MaxHP = curNPC.GetMaxHP()

@@ -571,12 +574,15 @@
        heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID)

        if not heroIpyData:

            continue

        
        npcID = heroIpyData.GetSkinNPCIDList()[0]

        skinIDList = heroIpyData.GetSkinIDList()

        skinIndex = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroSkin)

        if skinIndex < 0 or skinIndex >= len(skinIDList):

            continue

        skinID = skinIDList[skinIndex]

        heroDict[str(posNum)] = {

                                 "ID":heroID,

                                 "HeroID":heroID,

                                 "SkinID":skinID,

                                 "Data":heroItem.GetUserData(),

                                 "NPCID":npcID

                                 }

        

        heroCount += 1

@@ -656,27 +662,33 @@
    tick = GameWorld.GetGameWorld().GetTick()

    

    initXP = IpyGameDataPY.GetFuncCfg("AngerXP", 1)

    baseAtkSkillIDList = IpyGameDataPY.GetFuncEvalCfg("ParryCfg", 3)

    tfMgr = GetTurnFightMgr()

    space = 3

    for posNumKey, heroInfo in heroDict.items():

        posNum = int(posNumKey)

        

        heroID, skinID = 0, 0

        baseAtkSkillID = 0 # 基础普攻ID

        skillIDList = []

        if lineupPlayerID:

            heroID = heroInfo.get("ID", 0)

            npcID = heroInfo.get("NPCID", 0)

            heroID = heroInfo.get("HeroID", 0)

            skinID = heroInfo.get("SkinID", 0)

            npcID = FighterNPCID

            heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID)

            if not heroIpyData:

                continue

            normalSkillID = heroIpyData.GetNormalSkillID()

            angerSkillID = heroIpyData.GetAngerSkillID()

            skillIDList += [normalSkillID, angerSkillID]

            atkDistType = heroIpyData.GetAtkDistType()

        else:

            npcID = heroInfo.get("NPCID", 0)

            npcDataEx = NPCCommon.GetNPCDataEx(npcID)

            if not npcDataEx:

                continue

            skillIDList += npcDataEx.GetSkillIDList()

            atkDistType = npcDataEx.GetAtkDistType()

            

        if not npcID:

            continue

@@ -701,19 +713,28 @@
        curSummon.SetVisible(True)

        curSummon.SetDict(ChConfig.Def_Obj_Dict_TurnFightPosInfo, num * 100 + posNum)

        curSummon.SetDict(ChConfig.Def_Obj_Dict_LineupPlayerID, lineupPlayerID)

        curSummon.SetDict(ChConfig.Def_Obj_Dict_HeroID, heroID)

        curSummon.SetDict(ChConfig.Def_Obj_Dict_SkinID, skinID)

        GameObj.SetFaction(curSummon, faction)

        GameObj.SetXP(curSummon, initXP, False)

        

        if atkDistType == ChConfig.AtkDistType_Short:

            baseAtkSkillID = baseAtkSkillIDList[0] if len(baseAtkSkillIDList) > 0 else 0

        elif atkDistType == ChConfig.AtkDistType_Long:

            baseAtkSkillID = baseAtkSkillIDList[1] if len(baseAtkSkillIDList) > 1 else 0

            
        skillManager = curSummon.GetSkillManager()

        #有指定的技能，重新学习

        if skillIDList:

            skillManager.ResetSkill()

            for skillID in skillIDList:

                skillManager.LVUPSkillByID(skillID)

                
        if baseAtkSkillID:

            skillManager.LVUPSkillByID(baseAtkSkillID)

            
        rebornX = posX - space + (faction - 1) * space * 3 + ((posNum - 1) / 3 * space * 2 * (-1 if faction == 1 else 1))

        rebornY = posY + (posNum - 1) % 3 * space

        #GameWorld.DebugLog("Reborn ID:%s, faction:%s,posNum=%s, (%s,%s), %s" % (curSummon.GetID(), faction, posNum, rebornX, rebornY, skillIDList))

        GameWorld.DebugLog("SummonNPC ID:%s,faction:%s,num=%s,posNum=%s,baseAtkSkillID=%s,%s" % (curSummon.GetID(), faction, num, posNum, baseAtkSkillID, skillIDList))

        curSummon.Reborn(rebornX, rebornY, False)

        NPCCommon.NPCControl(curSummon).DoNPCRebornCommLogic(tick)

        

@@ -1200,8 +1221,10 @@
    objName = gameObj.GetName()

    faction = GameObj.GetFaction(gameObj)

    posInfo = gameObj.GetDictByKey(ChConfig.Def_Obj_Dict_TurnFightPosInfo)

    npcID = gameObj.GetNPCID()

    return "%s%s %s[%s-%s]" % ("A" if faction == Def_FactionA else "B", posInfo, objName, gameObj.GetID(), npcID)

    heroID = gameObj.GetDictByKey(ChConfig.Def_Obj_Dict_HeroID)

    if not heroID:

        heroID = gameObj.GetNPCID()

    return "%s%s %s[%s-%s]" % ("A" if faction == Def_FactionA else "B", posInfo, objName, gameObj.GetID(), heroID)



def EntryLogic(turnFight):

    ## 执行进场逻辑

@@ -1325,7 +1348,7 @@
    ## 攻击方增加的XP值根据主动普攻技能获得

    if not curSkill:

        return 0

    if not SkillCommon.isNormalAtkSkill(curSkill):

    if not SkillCommon.isTurnNormalAtkSkill(curSkill):

        return 0

    return IpyGameDataPY.GetFuncCfg("AngerXP", 3)



@@ -1363,7 +1386,16 @@
    if turnBattleType == ChConfig.TurnBattleType_AtkBack:

        if not tagObj:

            return

        atkOK = BaseAttack.Attack(curNPC, tagObj, None, tick) # 反击为单体普攻

        skillManager = curNPC.GetSkillManager()

        for index in range(0, skillManager.GetSkillCount()):

            skill = skillManager.GetSkillByIndex(index)

            #已经到尾部了

            if not skill or skill.GetSkillTypeID() == 0:

                break

            if skill.GetFuncType() == ChConfig.Def_SkillFuncType_NormalAttack:

                useSkill = skill

                break

        atkOK = SkillShell.DoLogic_UseSkill(curNPC, tagObj, useSkill, tick)

    elif turnBattleType == ChConfig.TurnBattleType_Combo:

        if not tagObj:

            return

@@ -1373,12 +1405,15 @@
        xpMax = IpyGameDataPY.GetFuncCfg("AngerXP", 2) 

        skillManager = curNPC.GetSkillManager()

        useSkillList = []

        GameWorld.DebugLog('skillCount=%s' % skillManager.GetSkillCount(), npcID)

        #GameWorld.DebugLog('skillCount=%s' % skillManager.GetSkillCount(), npcID)

        for index in range(0, skillManager.GetSkillCount()):

            useSkill = skillManager.GetSkillByIndex(index)

            #已经到尾部了

            if not useSkill or useSkill.GetSkillTypeID() == 0:

                break

            if useSkill.GetFuncType() in [ChConfig.Def_SkillFuncType_NormalAttack]:

                #基础普攻不能主动释放，目前仅用于反击

                continue

            #被动技能无法使用

            if SkillCommon.isPassiveSkill(useSkill):

                continue

@@ -1406,12 +1441,6 @@
                AddTurnFightXP(curNPC, __GetAddXP_Attack(curNPC, useSkill), "skillID:%s" % skillID)

                break

            

        if not atkOK:

            tagObj = GetEnemyObj(curNPC)

            if tagObj:

                GameWorld.DebugLog('    无技能可攻击，直接使用普攻! tagID=%s(%s)' % (tagObj.GetID(), GetObjName(tagObj)), npcID)

                atkOK = BaseAttack.Attack(curNPC, tagObj, None, tick)

                
    curNPC.SetDict(ChConfig.Def_Obj_Dict_TurnBattleType, 0) # 无论攻击成功与否都重置战斗类型

    

    tagID = 0

@@ -1454,6 +1483,11 @@
    if posNum <= 0:

        GameWorld.DebugLog("            被非主战单位攻击时无法触发反击: atkID=%s,posNum=%s" % (atkObj.GetID(), posNum))

        return False

    atkDistType = AttackCommon.GetAtkDistType(defObj)

    if atkDistType == ChConfig.AtkDistType_Long:

        if not IpyGameDataPY.GetFuncCfg("ParryCfg", 2):

            GameWorld.DebugLog("            远程单位不可反击: defID=%s" % (defObj.GetID()))

            return False

    defAtkBackRate = GameObj.GetAtkBackRate(defObj) # 防方反击率

    atkBackNum = defObj.GetDictByKey(ChConfig.Def_Obj_Dict_TurnAtkBackNum) # 已反击次数

    if atkBackNum > 10:

@@ -1707,12 +1741,13 @@
            for posNum, curNPC in batLineup.npcPosDict.items():

                objID = curNPC.GetID()

                npcID = curNPC.GetNPCID()

                heroID = curNPC.GetDictByKey(ChConfig.Def_Obj_Dict_HeroID)

                atkHurt = hurtStatDict.get(objID, 0)

                defHurt = defStatDict.get(objID, 0)

                cureHP = cureStatDict.get(objID, 0)

                GameWorld.DebugLog("    Pos:%s ID=%s-%s,,HP=%s/%s, 输出=%s,承伤=%s,治疗=%s" 
                                   % (posNum, objID, npcID, GameObj.GetHP(curNPC), GameObj.GetMaxHP(curNPC), atkHurt, defHurt, cureHP))

                lineupStatInfo[str(posNum)] = {"ObjID":objID, "NPCID":npcID, "AtkHurt":atkHurt, "DefHurt":defHurt, "CureHP":cureHP}

                GameWorld.DebugLog("    Pos:%s ID=%s-%s-%s,,HP=%s/%s, 输出=%s,承伤=%s,治疗=%s" 
                                   % (posNum, objID, npcID, heroID, GameObj.GetHP(curNPC), GameObj.GetMaxHP(curNPC), atkHurt, defHurt, cureHP))

                lineupStatInfo[str(posNum)] = {"ObjID":objID, "HeroID":heroID, "NPCID":npcID, "AtkHurt":atkHurt, "DefHurt":defHurt, "CureHP":cureHP}

                

    awardItemList = []

    playerID = turnFight.playerID