pvp：修复保存最强防守阵容位置无效bug

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

@@ -316,10 +316,20 @@ export class PvpHandler {
         let { challengeCnt, challengeRefTime } = refresh(lastChallengeCnt, lastChallengeRefTime, seasonEndTime);
 
         if (!!isDefaultHero) {
-            let role = await RoleModel.findByRoleId(roleId);
-            let { resHeroes } = await defaultHeroes(role,  challengeCnt, challengeRefTime, true);
-            return resResult(STATUS.SUCCESS,  { heroes: resHeroes, challengeCnt, challengeRefTime, isDefaultHero} );
-        } else {
+            let { topLineup } = await RoleModel.findByRoleId(roleId);
+            let hids = topLineup.filter(cur => {
+                return !heroes.find(ccur => ccur.actorId == cur.hid);
+            }).map(cur => cur.hid);
+            for(let hero of heroes) {
+                if(hero.actorId) {
+                    let isInTop = topLineup.find(cur => cur.hid == hero.actorId);
+                    if(!isInTop) {
+                        hero.actorId = hids.shift();
+                    }
+                }
+            }
+        }
+
         for (let dataId = PVP_HERO_POS.START; dataId <= PVP_HERO_POS.END; dataId++) {
             let index = findIndex(heroes, {dataId});
             let defIndex = findIndex(defHeros, {dataId});
@@ -350,7 +360,7 @@ export class PvpHandler {
         }
         let { heroes: resHeroes } = await PvpDefenseModel.updateInfo(roleId, {defCe, heroes: defHeros, challengeCnt, challengeRefTime, isDefaultHero });
         return resResult(STATUS.SUCCESS, { heroes: resHeroes, challengeCnt, challengeRefTime, isDefaultHero });
-        }
+        
     }
 
     async getRank(msg: {}, session: BackendSession) {

shared/resource/jsons/dic_email_content.json

@@ -1,4 +1,9 @@
 [
+    {
+        "id": 0,
+        "content": "%d",
+        "time": 24
+    },
     {
         "id": 1,
         "content": "您对军团%d的申请被拒绝",