From fd0439936cde70e35f051652436b74769acd5715 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 4 Jul 2022 17:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=83=E5=85=B5=E5=9C=BA=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=AB=98=E9=98=B6=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/guildTrainService.ts    | 2 +-
 shared/pubUtils/dictionary/DicArmyTrainJuDian.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/game-server/app/services/guildTrainService.ts b/game-server/app/services/guildTrainService.ts
index d24175dbc..2fcc0717b 100644
--- a/game-server/app/services/guildTrainService.ts
+++ b/game-server/app/services/guildTrainService.ts
@@ -197,7 +197,7 @@ export async function resetTrain(code: string, serverId: number) {
     await sendMessageToGuildWithSuc(code, PUSH_ROUTE.GUILD_TRAIN_RESET, {});
 
     await GuildTrainModel.resetGuildTrain(code);//将开启的练兵场锁定
-    await unlockTrain(code, 1);//开启练兵场1级
+    await unlockTrain(code, guild.trainId);//开启练兵场1级
     await UserGuildModel.resetTrainUserGuild(code);//重置玩家的挑战次数和购买挑战次数
     return trainId
 }
diff --git a/shared/pubUtils/dictionary/DicArmyTrainJuDian.ts b/shared/pubUtils/dictionary/DicArmyTrainJuDian.ts
index 480354cae..de70a48ab 100644
--- a/shared/pubUtils/dictionary/DicArmyTrainJuDian.ts
+++ b/shared/pubUtils/dictionary/DicArmyTrainJuDian.ts
@@ -54,7 +54,7 @@ export function loadArmyTrainJuDian() {
             dicFirstGuildTrainIdOfLv.set(o.trainLv, o.id);
         } else {
             if(dicFirstGuildTrainIdOfLv.get(o.trainLv) > o.id) {
-                dicLastGuildTrainIdOfLv.set(o.trainLv, o.id);
+                dicFirstGuildTrainIdOfLv.set(o.trainLv, o.id);
             }
         }
     });