diff --git a/game-server/app/servers/guild/handler/gvgHandler.ts b/game-server/app/servers/guild/handler/gvgHandler.ts index abdc60da6..56636ba7f 100644 --- a/game-server/app/servers/guild/handler/gvgHandler.ts +++ b/game-server/app/servers/guild/handler/gvgHandler.ts @@ -256,11 +256,11 @@ export class GVGHandler { if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST); const leaguePrepare = await GVGLeaguePrepareModel.findByLeague(configId, myLeague.leagueCode); - if(!leaguePrepare || leaguePrepare.lv < lv) return resResult(STATUS.GVG_LV_NOT_ENOUGH); + if(!leaguePrepare || leaguePrepare.lv < lv + 1) return resResult(STATUS.GVG_LV_NOT_ENOUGH); let myUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId); let { receivedLv } = myUserData||{}; - if(lv != 1 && receivedLv != lv + 1) return resResult(STATUS.GVG_LV_REWARD_NOT_REACH); + if(lv != 1 && receivedLv + 1 != lv) return resResult(STATUS.GVG_LV_REWARD_NOT_REACH); if(receivedLv >= lv) return resResult(STATUS.GVG_LV_REWARD_HAS_RECEIVED); const leagueGoods = await addGVGReward(roleId, roleName, myLeague.leagueCode, sid, [], dicGVGLeagueLv.reward, ITEM_CHANGE_REASON.GVG_RECEIVE_LV); diff --git a/shared/db/GVGUserData.ts b/shared/db/GVGUserData.ts index c29a3984b..7b4a65bb1 100644 --- a/shared/db/GVGUserData.ts +++ b/shared/db/GVGUserData.ts @@ -120,7 +120,7 @@ export default class GVGUserData extends BaseModel { } public static async receiveLv(configId: number, leagueCode: string, roleId: string, lv: number) { - const result: GVGUserDataType = await GVGUserDataModel.findOneAndUpdate({ configId, leagueCode, roleId }, { $set: { lv }}, { new: true }).lean(); + const result: GVGUserDataType = await GVGUserDataModel.findOneAndUpdate({ configId, leagueCode, roleId }, { $set: { receivedLv: lv }}, { new: true }).lean(); return result; }