🐞 fix(gvg): 备战期等级奖励随人

This commit is contained in:
luying
2023-03-17 12:04:16 +08:00
parent 6c72d20b1c
commit 710f10d516
5 changed files with 48 additions and 14 deletions

View File

@@ -27,6 +27,7 @@ import { GVGVestigeRankModel } from "../../../db/GVGVestigeRank";
import { addTechActivateMessage, addTechUnlockMessage } from "../../../services/gvg/gvgRecService";
import { GuildModel } from "../../../db/Guild";
import { GVGCityModel } from "../../../db/GVGCity";
import { GVGRoleDataModel } from "../../../db/GVGRoleData";
export default function (app: Application) {
new HandlerService(app, {});
@@ -65,9 +66,10 @@ export class GVGHandler {
data.setLeagueParpare(leaguePrepare);
let userData = await GVGUserDataModel.findByRole(configId, league.leagueCode, roleId);
let roleData = await GVGRoleDataModel.findByRole(configId, roleId);
let items = await GVGUserItemModel.findByRole(configId, league.leagueCode, roleId);
let tasks = await GVGUserTaskModel.findByRole(configId, league.leagueCode, roleId);
data.setPlayerInfo(userData, getMyAuth(league, roleId), await checkCanPrepare(roleId), checkCanChooseJob(userData?.job, leaguePrepare), items, tasks);
data.setPlayerInfo(userData, roleData, getMyAuth(league, roleId), await checkCanPrepare(roleId), checkCanChooseJob(userData?.job, leaguePrepare), items, tasks);
let dailyReward = await getDailyLoginReward(roleId, roleName, sid, league.leagueCode, userData?.job);
if(dailyReward) data.setFistLogin(dailyReward.reward);
@@ -282,13 +284,13 @@ export class GVGHandler {
if(!leaguePrepare || leaguePrepare.lv < lv + 1) return resResult(STATUS.GVG_LV_NOT_ENOUGH);
let myUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId);
let myUserData = await GVGRoleDataModel.findByRole(configId, roleId);
let { receivedLv } = myUserData||{};
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);
myUserData = await GVGUserDataModel.receiveLv(configId, myLeague.leagueCode, roleId, lv);
myUserData = await GVGRoleDataModel.receiveLv(configId, roleId, lv);
return resResult(STATUS.SUCCESS, {
receivedLv: myUserData.receivedLv,