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

聊天：头像显示

Browse Source
This commit is contained in:
luying
2021-09-29 09:50:04 +08:00
parent 1a856677c7
commit 6f13e2a8c8
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/consts/constModules/selectConst.ts
+5 -5
View File
@@ -3,18 +3,18 @@ export enum ROLE_SELECT {
// 初始登录数据 // 初始登录数据
ENTRY = 'serverId userInfo.uid userInfo.tel userInfo.serverType ce topLineup topLineupCe teraphs roleId roleName tili lv exp gold coin vLv title hasGuild eventStatus heads head frames frame spines spine guildCode frdCnt showLineup updatedAt heroNum heroNumUpdatedAt loginTime hasInit rankReceived', ENTRY = 'serverId userInfo.uid userInfo.tel userInfo.serverType ce topLineup topLineupCe teraphs roleId roleName tili lv exp gold coin vLv title hasGuild eventStatus heads head frames frame spines spine guildCode frdCnt showLineup updatedAt heroNum heroNumUpdatedAt loginTime hasInit rankReceived',
// 玩家列表显示基础数据 // 玩家列表显示基础数据
SHOW_SIMPLE = 'roleId roleName ce head frame spine lv title job quitTime loginTime vLv guildName serverId userInfo.serverType', SHOW_SIMPLE = 'roleId roleName ce head frame spine heads frames spines lv title job quitTime loginTime vLv guildName serverId userInfo.serverType',
// 显示申请需要的信息 // 显示申请需要的信息
SHOW_FRIEND_APPLY_LIST = 'roleId roleName ce head frame spine lv title job quitTime vLv guildName friendCnt recFrdApplyCnt serverId userInfo.serverType', SHOW_FRIEND_APPLY_LIST = 'roleId roleName ce head frame spine heads frames spines lv title job quitTime vLv guildName friendCnt recFrdApplyCnt serverId userInfo.serverType',
HANDLE_APPLY = 'roleId friendCnt lv', HANDLE_APPLY = 'roleId friendCnt lv',
ATTR = 'attr', ATTR = 'attr',
GET_LV = 'lv', GET_LV = 'lv',
GET_ROLE_ID = 'roleId roleName lv head frame spine ce title friendCnt serverId userInfo.serverType', GET_ROLE_ID = 'roleId roleName lv head frame spine heads frames spines ce title friendCnt serverId userInfo.serverType',
GET_MY_SERVER = 'lv serverId userInfo.serverType', GET_MY_SERVER = 'lv serverId userInfo.serverType',
COM_BATTLE = 'lv head frame spine topLineupCe', COM_BATTLE = 'lv head frame spine heads frames spines topLineupCe',
GET_HEADS = 'heads head frames frame spines spine', GET_HEADS = 'heads head frames frame spines spine',
// 排行榜基础数据 // 排行榜基础数据
RANK = 'roleId roleName lv vLv head frame spine title guildName ce isReducedCe topLineup towerLv towerUpTime topLineupCe heroNum updatedAt heroNumUpdatedAt dungeonWarId dungeonUpdatedAt dungeonHeroes mainWarId mainUpdatedAt mainEliteWarId mainEliteUpdatedAt showLineup hasGuild', RANK = 'roleId roleName lv vLv head frame spine heads frames spines title guildName ce isReducedCe topLineup towerLv towerUpTime topLineupCe heroNum updatedAt heroNumUpdatedAt dungeonWarId dungeonUpdatedAt dungeonHeroes mainWarId mainUpdatedAt mainEliteWarId mainEliteUpdatedAt showLineup hasGuild',
}; };
export enum HERO_SELECT { export enum HERO_SELECT {
shared/db/PvpDefense.ts
+8 -8
View File
@@ -107,7 +107,7 @@ export default class PvpDefense extends BaseModel {
public static async findByScale(roleId: string, min: number, max: number) { public static async findByScale(roleId: string, min: number, max: number) {
const result: PvpDefenseType[] = await PvpDefenseModel.find({ roleId: { $ne: roleId }, defCe: { $lte: max, $gte: min } }) const result: PvpDefenseType[] = await PvpDefenseModel.find({ roleId: { $ne: roleId }, defCe: { $lte: max, $gte: min } })
.populate('role', 'head frame spine topLineupCe roleId roleName lv globalCeAttr') .populate('role', 'head frame spine heads frames spines topLineupCe roleId roleName lv globalCeAttr')
.populate('heroes.hero') .populate('heroes.hero')
.sort({ updatedAt: -1 }).limit(100).lean({ getters: true, virtuals: true }); .sort({ updatedAt: -1 }).limit(100).lean({ getters: true, virtuals: true });
return result; return result;
@@ -125,7 +125,7 @@ export default class PvpDefense extends BaseModel {
const doc = new PvpDefenseModel(); const doc = new PvpDefenseModel();
const update = Object.assign(doc.toJSON(), params); const update = Object.assign(doc.toJSON(), params);
const defense: PvpDefenseType = await PvpDefenseModel.findOneAndUpdate({ roleId: params.roleId }, update, { upsert: true, new: true }) const defense: PvpDefenseType = await PvpDefenseModel.findOneAndUpdate({ roleId: params.roleId }, update, { upsert: true, new: true })
.populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine rankLv pLv title lv defCe heroes') .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv pLv title lv defCe heroes')
.lean(); .lean();
return defense; return defense;
@@ -163,15 +163,15 @@ export default class PvpDefense extends BaseModel {
const result: PvpDefenseType = await PvpDefenseModel.findOne({ roleId }) const result: PvpDefenseType = await PvpDefenseModel.findOne({ roleId })
.populate('role', 'head frame spine topLineupCe roleId roleName lv globalCeAttr') .populate('role', 'head frame spine topLineupCe roleId roleName lv globalCeAttr')
.populate('heroes.hero') .populate('heroes.hero')
.populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine rankLv title lv pLv defCe heroes').lean({ getters: true, virtuals: true }); .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv title lv pLv defCe heroes').lean({ getters: true, virtuals: true });
return result; return result;
} }
public static async findByTeamLv(seasonNum: number, min: number, max: number) { public static async findByTeamLv(seasonNum: number, min: number, max: number) {
const result: PvpDefenseType[] = await PvpDefenseModel.find({ seasonNum, pLv: { $gte: min, $lte: max } }) const result: PvpDefenseType[] = await PvpDefenseModel.find({ seasonNum, pLv: { $gte: min, $lte: max } })
.populate('role', 'head frame spine topLineupCe roleId roleName lv globalCeAttr') .populate('role', 'head frame spine heads frames spines topLineupCe roleId roleName lv globalCeAttr')
.populate('heroes.hero') .populate('heroes.hero')
.populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine rankLv pLv title lv defCe heroes') .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv pLv title lv defCe heroes')
.lean({ getters: true, virtuals: true }); .lean({ getters: true, virtuals: true });
return result; return result;
} }
@@ -179,8 +179,8 @@ export default class PvpDefense extends BaseModel {
public static async updateInfoAndInclude(roleId: string, update: pvpUpdateInter) { public static async updateInfoAndInclude(roleId: string, update: pvpUpdateInter) {
delete update._id; delete update._id;
let result: PvpDefenseType = await PvpDefenseModel.findOneAndUpdate({roleId}, {$set:update}, {new: true}) let result: PvpDefenseType = await PvpDefenseModel.findOneAndUpdate({roleId}, {$set:update}, {new: true})
.populate('role', 'head frame spine topLineupCe roleId roleName lv') .populate('role', 'head frame spine heads frames spines topLineupCe roleId roleName lv')
.populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine rankLv pLv title lv defCe heroes').lean({ getters: true, virtuals: true }); .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv pLv title lv defCe heroes').lean({ getters: true, virtuals: true });
return result; return result;
} }
public static async updateInfo(roleId: string, update: pvpUpdateInter, lean = true) { public static async updateInfo(roleId: string, update: pvpUpdateInter, lean = true) {
@@ -196,7 +196,7 @@ export default class PvpDefense extends BaseModel {
public static async getRank(seasonNum: number, page = 1, limit = 1000) { public static async getRank(seasonNum: number, page = 1, limit = 1000) {
let sortBy = { score: -1, updatedAt: 1 }; let sortBy = { score: -1, updatedAt: 1 };
const ranks: PvpDefenseType[] = await PvpDefenseModel.find({seasonNum}).select('roleId role score updatedAt') const ranks: PvpDefenseType[] = await PvpDefenseModel.find({seasonNum}).select('roleId role score updatedAt')
.populate('role', 'roleId roleName head frame spine title lv vLv') .populate('role', 'roleId roleName head frame spine heads frames spines title lv vLv')
.sort(sortBy).limit(limit).skip((page - 1) * limit).lean({ getters: true, virtuals: true }); .sort(sortBy).limit(limit).skip((page - 1) * limit).lean({ getters: true, virtuals: true });
return ranks; return ranks;
} }
shared/db/Role.ts
+1 -1
View File
@@ -321,7 +321,7 @@ export default class Role extends BaseModel {
guide: number[]; // 已领取奖励 guide: number[]; // 已领取奖励
public static async findAllByUid(uid: number, getters = false, virtuals = true) { public static async findAllByUid(uid: number, getters = false, virtuals = true) {
const role: RoleType[] = await RoleModel.find({ 'userInfo.uid': uid }).select('roleId roleName serverId head frame spine lv updatedAt').lean({ getters, virtuals }); const role: RoleType[] = await RoleModel.find({ 'userInfo.uid': uid }).select('roleId roleName serverId head frame spine heads frames spines lv updatedAt').lean({ getters, virtuals });
return role; return role;
} }
shared/db/UserGuild.ts
+2 -2
View File
@@ -114,7 +114,7 @@ export default class UserGuild extends BaseModel {
const userGuilds: UserGuildType[] = await UserGuildModel.find({ guildCode, status: USER_GUILD_STATUS.ON }) const userGuilds: UserGuildType[] = await UserGuildModel.find({ guildCode, status: USER_GUILD_STATUS.ON })
.select(select) .select(select)
.sort(sort) .sort(sort)
.populate('role', 'roleId roleName ce head frame spine lv title quitTime', 'Role') .populate('role', 'roleId roleName ce head frame spine heads frames spines lv title quitTime', 'Role')
.lean({ getters: true, virtuals: true }); .lean({ getters: true, virtuals: true });
return userGuilds; return userGuilds;
} }
@@ -123,7 +123,7 @@ export default class UserGuild extends BaseModel {
const userGuilds: UserGuildType[] = await UserGuildModel.find({ guildCode, status: USER_GUILD_STATUS.ON, auth: { $ne: GUILD_AUTH.LEADER } }) const userGuilds: UserGuildType[] = await UserGuildModel.find({ guildCode, status: USER_GUILD_STATUS.ON, auth: { $ne: GUILD_AUTH.LEADER } })
.sort({ activeWeekly: -1, activeUpdateTime: 1 }) .sort({ activeWeekly: -1, activeUpdateTime: 1 })
.select(select) .select(select)
.populate('role', 'roleId roleName ce head frame spine lv title quitTime', 'Role') .populate('role', 'roleId roleName ce head frame spine heads frames spines lv title quitTime', 'Role')
.lean({getters: true, virtuals: true }); .lean({getters: true, virtuals: true });
return userGuilds; return userGuilds;
} }
shared/db/UserGuildApply.ts
+1 -1
View File
@@ -79,7 +79,7 @@ export default class UserGuildApply extends BaseModel {
const list: UserGuildApplyType[] = await UserGuildApplyModel.find(condition) const list: UserGuildApplyType[] = await UserGuildApplyModel.find(condition)
.sort({ createdAt: -1 }) .sort({ createdAt: -1 })
.select('applyCode role') .select('applyCode role')
.populate('role', 'roleId roleName ce head frame spine lv title job quitTime', 'Role') .populate('role', 'roleId roleName ce head frame spine heads frames spines lv title job quitTime', 'Role')
.limit(GUILD_PER_PAGE).lean({ getters: true, virtuals: true }); .limit(GUILD_PER_PAGE).lean({ getters: true, virtuals: true });
return list return list
} }