xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
game-server/app/servers/guild/handler/gvgHandler.ts
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,

4
game-server/app/services/gvg/gvgService.ts
View File

@@ -25,6 +25,7 @@ import { GVGVestigeSumRankModel } from "../../db/GVGVestigeSumRank";
import { GVGTeamModel } from "../../db/GVGTeam";
import { sendMessageToGuildWithSuc } from "../pushService";
import { GVGCityModel } from "../../db/GVGCity";
import { GVGRoleDataModel } from "../../db/GVGRoleData";
// 定时器相关
export async function createNewGVGConfig() {
@@ -303,9 +304,10 @@ export async function getMainData(roleId: string, leagueCode: string, configId:
data.setTechQueue(leaguePrepare?.techQueue||[]);
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), undefined, undefined, items, tasks);
data.setPlayerInfo(userData, roleData, getMyAuth(league, roleId), undefined, undefined, items, tasks);
data.setLeagueCe(await calLeagueCe(league));
data.setConstribute(await getContribute(userData));
}

35
shared/db/GVGRoleData.ts Normal file
View File

@@ -0,0 +1,35 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType, } from '@typegoose/typegoose';
// 玩家跨联军保留数据
@index({ leagueCode: 1, roleId: 1, configId: 1 })
export default class GVGRoleData extends BaseModel {
@prop({ required: true })
roleId: string; // 玩家
@prop({ required: true })
configId: number; // 赛季信息
@prop({ required: true, default: 0 })
receivedLv: number; // 领取到的等级奖励
public static async findByRole(configId: number, roleId: string) {
const result: GVGRoleDataType = await GVGRoleDataModel.findOneAndUpdate({ configId, roleId }, {}, { new: true, upsert: true}).lean();
return result;
}
public static async receiveLv(configId: number, roleId: string, lv: number) {
const result: GVGRoleDataType = await GVGRoleDataModel.findOneAndUpdate({ configId, roleId }, { $set: { receivedLv: lv }}, { new: true }).lean();
return result;
}
}
export const GVGRoleDataModel = getModelForClass(GVGRoleData);
export interface GVGRoleDataType extends Pick<DocumentType<GVGRoleData>, keyof GVGRoleData> {
id: number;
};
export type GVGRoleDataUpdate = Partial<GVGRoleDataType>; // 将所有字段变成可选项

8
shared/db/GVGUserData.ts
View File

@@ -50,9 +50,6 @@ export default class GVGUserData extends BaseModel {
@prop({ required: true, default: 0, type: ActiveRec, _id: false })
activeRec: ActiveRec[]; // 活跃度记录
@prop({ required: true, default: 0 })
receivedLv: number; // 领取到的等级奖励
@prop({ required: true, default: 0 })
receiveCurrencyTime: number; // 领取内政令&征战令时间
@@ -133,11 +130,6 @@ export default class GVGUserData extends BaseModel {
return result;
}
public static async receiveLv(configId: number, leagueCode: string, roleId: string, lv: number) {
const result: GVGUserDataType = await GVGUserDataModel.findOneAndUpdate({ configId, leagueCode, roleId }, { $set: { receivedLv: lv }}, { new: true }).lean();
return result;
}
// 更换城池
public static async changeCity(configId: number, leagueCode: string, roleId: string, cityId: number) {
const result: GVGUserDataType = await GVGUserDataModel.findOneAndUpdate({ configId, leagueCode, roleId }, { $set: { cityId }}, { new: true }).lean();

7
shared/domain/gvgField/returnData.ts
View File

@@ -14,6 +14,7 @@ import { RoleRankInfo } from "../rank";
import { GVGCityType } from "../../db/GVGCity";
import { GVGTeamMem } from "../battleField/gvgBattle";
import { GVGTeamType } from "../../db/GVGTeam";
import GVGRoleData, { GVGRoleDataType } from "../../db/GVGRoleData";
class LeagueLeaderInfo {
name: string; // 盟主名
@@ -124,16 +125,18 @@ export class GVGMainData {
this.fighterCnt = leaguePrepare.fighterCnt;
}
setPlayerInfo(userData: GVGUserDataType, auth: number, canPrepare: boolean, canChooseJob: boolean, items: GVGItem[], tasks: GVGTask[]) {
setPlayerInfo(userData: GVGUserDataType, roleData: GVGRoleDataType, auth: number, canPrepare: boolean, canChooseJob: boolean, items: GVGItem[], tasks: GVGTask[]) {
this.myInfo.auth = auth;
this.myInfo.canPrepare = canPrepare;
this.myInfo.canChooseJob = canChooseJob;
this.myInfo.items = items;
if(userData) {
this.myInfo.job = userData?.job||0;
this.myInfo.receivedLv = userData?.receivedLv||0;
this.myInfo.reviveCnt = userData?.reviveCnt||0;
}
if(roleData) {
this.myInfo.receivedLv = roleData?.receivedLv||0;
}
this.myInfo.tasks = tasks;
}