From 275ce6a6fb1b05ec90df2978bdd6cf5460f4fadf Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 15 Dec 2020 17:08:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=AD=E7=BB=83=E5=B0=8F=E9=98=B6?=
 =?UTF-8?q?=E8=A7=A3=E9=94=81=E7=AD=89=E7=BA=A7=E5=BA=94=E8=AF=A5=E4=BB=A5?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=85=B5=E7=A7=8D=E4=B8=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app.ts                                  | 8 ++++----
 game-server/app/servers/role/handler/heroHandler.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/game-server/app.ts b/game-server/app.ts
index 201432731..e52fd170e 100644
--- a/game-server/app.ts
+++ b/game-server/app.ts
@@ -21,13 +21,13 @@ const filePath = (_pinus as any).FILEPATH;
 filePath.MASTER = '/config/master';
 filePath.SERVER = '/config/servers';
 filePath.CRON = '/config/crons';
-if(process.env.NODE_ENV == 'local') {
+// if(process.env.NODE_ENV == 'local') {
     filePath.LOG = '/config/log4js.local';
 // } else if(process.env.NODE_ENV == 'prod'){
 //     filePath.LOG = '/config/log4js.prod';
-} else {
-    filePath.LOG = '/config/log4js.prod';
-}
+// } else {
+//     filePath.LOG = '/config/log4js.prod';
+// }
 filePath.SERVER_PROTOS = '/config/serverProtos';
 filePath.CLIENT_PROTOS = '/config/clientProtos';
 filePath.MASTER_HA = '/config/masterha';
diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts
index 4b12c104a..312d53406 100644
--- a/game-server/app/servers/role/handler/heroHandler.ts
+++ b/game-server/app/servers/role/handler/heroHandler.ts
@@ -273,7 +273,7 @@ export class HeroHandler {
         if (!hero) 
             return resResult(STATUS.HERO_NOT_FIND);
         let heroJob = gameData.job.get(hero.job);
-        let nextHeroJob = getJobByGradeAndClass(heroJob.job_class, heroJob.grade + 1);
+        let nextHeroJob = getJobByGradeAndClass(heroJob.job_class, heroJob.grade);
         if (nextHeroJob.unlockLevel > hero.lv) 
             return resResult(STATUS.NOT_REACH_UNLOCK_LEVEL);
         if (hero.jobStage >= 6)