129 【战斗】战斗系统-服务端（优化战斗结算时机，修复某个阵营全部被击杀后在某些情况下不会马上结算的bug；）

hxp

2025-10-13 21633503720673ff5d9074a3126e9ed652178594

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

@@ -217,7 +217,7 @@
    #def setPVPTeam(self):

    #    return

    

    def nextTurnFight(self, msgDict={}, resetByNextTeam=False):

    def nextTurnFight(self, msgDict={}):

        ## 一般用于玩家发起的战斗，在需要保留玩家阵容属性及状态的情况下，重置回合进入下一场战斗

        self.turnNum = 1

        self.enterLogic = False

@@ -227,8 +227,7 @@
        self.timeline = 0

        self.startTime = time.time()

        self.costTime = 0

        if resetByNextTeam:

            ResetByNextTeam(self)

        ResetByNextTeam(self)

        return

    

    def haveNextLineup(self):

@@ -960,7 +959,7 @@
        turnFight.lineupIndex = index

        GameWorld.DebugLog("对战NPC阵容: index=%s, lineupID=%s" % (index, lineupID))

        if index > 0:

            turnFight.nextTurnFight(resetByNextTeam=True)

            turnFight.nextTurnFight()

        turnFight.setFactionLineup(ChConfig.Def_FactionB, {1:GetNPCLineupInfo(lineupID, strongerLV, difficulty)})

        turnFight.sortActionQueue()

        turnFight.startFight()

@@ -1039,7 +1038,7 @@
        __doSetFightPoint(curPlayer, reqValue)

        return

    

    GameWorld.DebugLog("主线战斗请求: reqType=%s" % reqType, curPlayer.GetPlayerID())

    GameWorld.DebugLog("------------------- 主线战斗请求: reqType=%s" % reqType, curPlayer.GetPlayerID())

    clientPack = ChPyNetSendPack.tagSCTurnFightReportSign()

    clientPack.Sign = 0

    NetPackCommon.SendFakePack(curPlayer, clientPack) # 标记开始

@@ -1178,7 +1177,7 @@
        if nextLineupID:

            GameWorld.DebugLog("---开始进入下一小队: lineupIndex=%s,nextLineupID=%s,%s" % (turnFight.lineupIndex, nextLineupID, turnFight.lineupIDList))

            

            turnFight.nextTurnFight(resetByNextTeam=True)

            turnFight.nextTurnFight()

            # 切换小队时，玩家阵容不需要处理，保留状态

            turnFight.setFactionLineup(ChConfig.Def_FactionB, {1:GetNPCLineupInfo(nextLineupID, turnFight.strongerLV, turnFight.difficulty)})

            turnFight.sortActionQueue()

@@ -1206,6 +1205,8 @@
    turnNum = turnFight.turnNum

    turnMax = turnFight.turnMax

    for turnNum in range(turnNum, turnMax + 1):

        if turnFight.winFaction:

            break

        turnTimeline = turnFight.getTurnNumStartTimelin(turnNum) # 本回合起始时间节点

        curTimeline = turnFight.getTimeline()

        

@@ -1230,13 +1231,13 @@
        # 红颜

        # 灵兽

        

        if turnFight.checkOverByKilled():

        if turnFight.winFaction:

            break

        

        # 武将

        doMax = PosNumMax * len(turnFight.actionSortList)

        doCnt = 0

        while doCnt < doMax and turnFight.actionIndex < len(turnFight.actionSortList):

        while doCnt < doMax and turnFight.actionIndex < len(turnFight.actionSortList) and not turnFight.winFaction:

            doCnt += 1

            faction, num = turnFight.actionSortList[turnFight.actionIndex]

            batFaction = turnFight.getBatFaction(faction)

@@ -1275,6 +1276,9 @@
            else:

                turnFight.actionIndex += 1

                

        if turnFight.winFaction:

            break

        
        # 回合结束

        curTimeline = turnFight.setTimeline(curTimeline + 1) # 每回合结束算一个时间节点

        for faction, num in turnFight.actionSortList:

@@ -1285,9 +1289,6 @@
                batObj = batObjMgr.getBatObj(objID)

                TurnFightPerTurnBigEnd(turnFight, batObj, turnNum)

                

        if turnFight.checkOverByKilled():

            break

        
    if not turnFight.winFaction:

        OnTurnAllOver(turnFight.guid)

        

@@ -1301,6 +1302,8 @@
    EntryLogic(turnFight)

    batObjMgr = BattleObj.GetBatObjMgr()

    for turnNum in range(1, turnMax + 1):

        if turnFight.winFaction:

            break

        turnFight.turnNum = turnNum

        GameWorld.DebugLog("【----- 回合制战斗轮次: %s -----】" % turnNum)

        curTimeline = turnFight.getTurnNumStartTimelin(turnNum) # 本回合起始时间节点

@@ -1322,13 +1325,13 @@
        # 红颜

        # 灵兽

            

        if turnFight.checkOverByKilled():

        if turnFight.winFaction:

            break

        

        # 武将

        doMax = PosNumMax * len(turnFight.actionSortList)

        doCnt = 0

        while doCnt < doMax and turnFight.actionIndex < len(turnFight.actionSortList):

        while doCnt < doMax and turnFight.actionIndex < len(turnFight.actionSortList) and not turnFight.winFaction:

            doCnt += 1

            faction, num = turnFight.actionSortList[turnFight.actionIndex]

            batFaction = turnFight.getBatFaction(faction)

@@ -1352,6 +1355,9 @@
            else:

                turnFight.actionIndex += 1

                

        if turnFight.winFaction:

            break

        
        # 回合结束

        curTimeline = turnFight.setTimeline(curTimeline + 1) # 每回合结束算一个时间节点

        for faction, num in turnFight.actionSortList:

@@ -1362,9 +1368,6 @@
                batObj = batObjMgr.getBatObj(objID)

                TurnFightPerTurnBigEnd(turnFight, batObj, turnNum)

                

        if turnFight.checkOverByKilled():

            break

        
    if not turnFight.winFaction:

        OnTurnAllOver(turnFight.guid)

    return

@@ -1649,7 +1652,7 @@
    

    # 暂时只算主线小怪

    if curPlayer and turnFight.mapID == ChConfig.Def_FBMapID_Main and gameObj.GetFaction() != ChConfig.Def_FactionA:

        PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_KillNPC, 1)    
        PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_KillNPC, 1)  
    return True



def OnTurnAllOver(guid):