🐞 fix(gvg): 云台贡献接口名错误修改
This commit is contained in:
@@ -17,7 +17,7 @@ class ActiveRec {
|
||||
}
|
||||
}
|
||||
|
||||
export class Distribute {
|
||||
export class Contribute {
|
||||
@prop({ required: true, default: 0 })
|
||||
food: number = 0; // 粮食
|
||||
@prop({ required: true, default: 0 })
|
||||
@@ -60,7 +60,7 @@ export default class GVGUserData extends BaseModel {
|
||||
box: number[];
|
||||
|
||||
@prop({ required: true, default: {}, _id: false })
|
||||
distribute: Distribute;
|
||||
contribute: Contribute;
|
||||
|
||||
@prop({ required: true, default: 0 })
|
||||
sendFightRewardTime: number; // 发送征战奖励的时间
|
||||
@@ -103,14 +103,14 @@ export default class GVGUserData extends BaseModel {
|
||||
const result: GVGUserDataType = await GVGUserDataModel.findOneAndUpdate({
|
||||
configId, leagueCode, roleId
|
||||
}, {
|
||||
$inc: { 'distribute.food': food, 'distribute.mineral': mineral, 'distribute.wood': wood }
|
||||
$inc: { 'contribute.food': food, 'contribute.mineral': mineral, 'contribute.wood': wood }
|
||||
}, { new: true, upsert: true }).lean();
|
||||
return result;
|
||||
}
|
||||
|
||||
public static async addVestigeScores(configId: number, memberScores: { leagueCode: string, roleId: string, score: number }[]) {
|
||||
await GVGUserDataModel.bulkWrite(memberScores.map(({ leagueCode, roleId, score }) => {
|
||||
return { updateOne: { filter: { configId, leagueCode, roleId }, update: { $inc: { 'distribute.score': score } } } }
|
||||
return { updateOne: { filter: { configId, leagueCode, roleId }, update: { $inc: { 'contribute.score': score } } } }
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
@@ -271,7 +271,7 @@ export class LeagueMemberListInfo {
|
||||
}
|
||||
}
|
||||
|
||||
export class LeagueMemberDistributeInfo extends LeagueMemberListInfo{
|
||||
export class LeagueMemberContributeInfo extends LeagueMemberListInfo{
|
||||
rank: number = 0;
|
||||
food: number = 0;
|
||||
mineral: number = 0;
|
||||
@@ -282,10 +282,10 @@ export class LeagueMemberDistributeInfo extends LeagueMemberListInfo{
|
||||
if(!data) return;
|
||||
this.active = data.active;
|
||||
this.job = data.job;
|
||||
this.food = data.distribute?.food||0;
|
||||
this.mineral = data.distribute?.mineral||0;
|
||||
this.wood = data.distribute?.wood||0;
|
||||
this.score = data.distribute?.score||0
|
||||
this.food = data.contribute?.food||0;
|
||||
this.mineral = data.contribute?.mineral||0;
|
||||
this.wood = data.contribute?.wood||0;
|
||||
this.score = data.contribute?.score||0
|
||||
}
|
||||
|
||||
setRank(rank: number) {
|
||||
@@ -293,19 +293,19 @@ export class LeagueMemberDistributeInfo extends LeagueMemberListInfo{
|
||||
}
|
||||
}
|
||||
|
||||
export class LeagueDistributeInfo {
|
||||
export class LeagueContributeInfo {
|
||||
job: number; // 1-内政 2-外政
|
||||
sumDistribute: number; // 总贡献(宝箱显示)
|
||||
sumContribute: number; // 总贡献(宝箱显示)
|
||||
receivedBox: number[]; // 已领取的宝箱id
|
||||
members: LeagueMemberDistributeInfo[];
|
||||
members: LeagueMemberContributeInfo[];
|
||||
|
||||
constructor(job: number, sumDistribute: number, receivedBox: number[]) {
|
||||
constructor(job: number, sumContribute: number, receivedBox: number[]) {
|
||||
this.job = job;
|
||||
this.sumDistribute = sumDistribute||0;
|
||||
this.sumContribute = sumContribute||0;
|
||||
this.receivedBox = receivedBox||[];
|
||||
}
|
||||
|
||||
setMembers(members: LeagueMemberDistributeInfo[]) {
|
||||
setMembers(members: LeagueMemberContributeInfo[]) {
|
||||
this.members = members;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user