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)