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

✨ feat(排行榜): pvp排行榜添加区服名

Browse Source
This commit is contained in:
luying
2022-11-02 14:53:34 +08:00
parent 28495373fc
commit 76f35af7f8
7 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
shared/domain/rank.ts
View File

@@ -12,6 +12,9 @@ export class RankParam {
@prop({ required: true })
roleName: string = "";
@prop({ required: true })
serverId: number = 0;
@prop({ required: true })
lv: number = 0;
@@ -55,7 +58,8 @@ export class RankParam {
} else {
this.updatedAt = getSeconds(role.updatedAt);
}
}
}
if(role.serverId) this.serverId = role.serverId;
}
}
@@ -81,7 +85,10 @@ export class GuildLeader {
@prop({ required: true })
spine: number;
constructor(leader: { roleId: string, roleName: string, title: number, lv: number, head: number, frame: number, spine: number}) {
@prop({ required: true })
serverId: number;
constructor(leader: { roleId: string, roleName: string, title: number, lv: number, head: number, frame: number, spine: number, serverId: number}) {
this.roleId = leader.roleId;
this.roleName = leader.roleName;
this.title = leader.title;
@@ -89,6 +96,7 @@ export class GuildLeader {
this.head = leader.head;
this.frame = leader.frame;
this.spine = leader.spine;
this.serverId = leader.serverId;
}
}
@@ -230,7 +238,7 @@ export class RoleAndGuildRankInfo {
}
setUserInfo(role: RoleRankInfo) {
this.userInfo = pick(role, ['roleId', 'roleName', 'head', 'frame', 'spine', 'lv', 'title', 'guildName', 'ce', 'topLineupCe']);
this.userInfo = pick(role, ['roleId', 'roleName', 'head', 'frame', 'spine', 'lv', 'title', 'guildName', 'ce', 'topLineupCe', 'serverId']);
this.lineup = role.lineup;
this.hasUser = true;
}
@@ -251,8 +259,8 @@ export class RoleAndGuildRankInfo {
return false;
}
setByField(roleId: string, roleName: string, head: number, frame: number, spine: number, lv: number, title: number, guildName: string, ce: number, topLineupCe: number) {
this.userInfo = { roleId, roleName, head, frame, spine, lv, title, guildName, ce, topLineupCe }
setByField(roleId: string, roleName: string, head: number, frame: number, spine: number, lv: number, title: number, guildName: string, ce: number, topLineupCe: number, serverId: number) {
this.userInfo = { roleId, roleName, head, frame, spine, lv, title, guildName, ce, topLineupCe, serverId }
}
}
@@ -400,12 +408,12 @@ export class GeneralRankParam {
let rank = rankInfo? (type == RANK_TYPE.LADDER? rankInfo.num: rankInfo.rank): 0;
if(rank == 1) {
if(rankInfo instanceof RoleRankInfo) {
this.userInfo = pick(rankInfo, ['roleId', 'roleName', 'head', 'frame', 'spine', 'guildName', 'ce', 'title', 'lv', 'topLineupCe']);
this.userInfo = pick(rankInfo, ['roleId', 'roleName', 'head', 'frame', 'spine', 'guildName', 'ce', 'title', 'lv', 'topLineupCe', 'serverId']);
this.hasUser = true;
}
if(rankInfo instanceof GuildRankInfo) {
let leaderInfo = pick(rankInfo.leader, ['roleId', 'roleName', 'head', 'frame', 'spine', 'ce', 'title', 'lv']);
let leaderInfo = pick(rankInfo.leader, ['roleId', 'roleName', 'head', 'frame', 'spine', 'ce', 'title', 'lv', 'serverId']);
this.userInfo = {
...leaderInfo, guildName: rankInfo.name, ce: rankInfo.guildCe, topLineupCe: rankInfo.guildCe
}