diff --git a/game-server/app/servers/battle/handler/guildHandler.ts b/game-server/app/servers/battle/handler/guildHandler.ts
index df59083b1..c54977c36 100644
--- a/game-server/app/servers/battle/handler/guildHandler.ts
+++ b/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;
 
diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts
index 5a802b690..f2bea92cf 100644
--- a/game-server/app/servers/battle/handler/pvpHandler.ts
+++ b/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) {
diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts
index 0038d18ce..69775a678 100644
--- a/shared/consts/constModules/sysConst.ts
+++ b/shared/consts/constModules/sysConst.ts
@@ -28,7 +28,7 @@ export const COUNTER = {
     ROLE: { name: 'role', def: 1 }
 };
 
-export const DEFAULT_HEROES = [19, 53, 55, 54, 13];
+export const DEFAULT_HEROES = [44, 46, 56, 53, 19, 32, 40, 24, 28, 22, 18, 17, 34];
 export const DEFAULT_ITEMS = [
     { "id": 11004, "count": 99999999 },
     { "id": 11013, "count": 999999 },