pvp：保存防守阵容错误

game-server/app/servers/battle/handler/guildHandler.ts

@@ -951,7 +951,7 @@ export class GuildHandler {
         const serverId = session.get('serverId');
         const { code, active, id } = msg;
 
-        const result = await addActive(roleId, serverId, id);
+        const result = await addActive(roleId, serverId, id, null, active);
         if(result.status == 0) return result.resResult;
         const { guild, userGuild } = result;
 

game-server/app/servers/battle/handler/pvpHandler.ts

@@ -338,9 +338,9 @@ export class PvpHandler {
                     let isInTop = topLineup.find(cur => cur.hid == hero.actorId);
                     if(!isInTop) {
                         hero.actorId = hids.shift();
-                        dataIds.push(hero.dataId);
-                        orders.push(hero.order);
                     }
+                    dataIds.push(hero.dataId);
+                    orders.push(hero.order);
                 }
             }
             for(let hid of hids) {