diff --git a/game-server/app/servers/battle/handler/guildHandler.ts b/game-server/app/servers/battle/handler/guildHandler.ts index 319ceb825..a8e5e6871 100644 --- a/game-server/app/servers/battle/handler/guildHandler.ts +++ b/game-server/app/servers/battle/handler/guildHandler.ts @@ -1,5 +1,5 @@ import { Application, BackendSession, pinus, ChannelService } from 'pinus'; -import { resResult, getRandEelm, getRefTime, shouldRefresh } from '../../../pubUtils/util'; +import { resResult, getRandEelm, getRefTime, shouldRefresh, sortArrRandom } from '../../../pubUtils/util'; import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, CHAT_SERVER, GUILD_SELECT, USER_GUILD_SELECT } from '../../../consts'; import { UserGuildModel } from '../../../db/UserGuild'; import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, settleGuildWeekly } from '../../../services/guildService'; @@ -199,7 +199,7 @@ export class GuildHandler { return resResult(STATUS.GUILD_MANAGER_REACH_MAX); } - const userGuild = await UserGuildModel.updateInfo(memberRoleId, { auth }, {}, 'auth'); // 设置权限 + const userGuild = await UserGuildModel.updateInfo(memberRoleId, { auth, job: auth == GUILD_AUTH.LEADER? GUILD_JOB.JIANGJUN: hisUserGuild.job }, {}, 'auth'); // 设置权限 if(!userGuild) { return resResult(STATUS.GUILD_MEMBER_NOT_FOUND); } @@ -208,7 +208,7 @@ export class GuildHandler { let updateObject = {}; if(auth == GUILD_AUTH.LEADER) { // 转让团长 updateObject['leader'] = role._id; - await UserGuildModel.updateInfo(roleId, { auth: GUILD_AUTH.MEMBER }, {}); // 自己降权限 + await UserGuildModel.updateInfo(roleId, { auth: GUILD_AUTH.MEMBER, job: GUILD_JOB.SHIBING }, {}); // 自己降权限 await redisUserInfoUpdate(REDIS_KEY.GUILD_INFO, code, [{field: 'leader', value: new GuildLeader(role) } ]); } @@ -417,6 +417,7 @@ export class GuildHandler { allList = allList.filter(cur => !invitedMembers.includes(cur.roleId)) let list = getRandEelm(allList, 10); if(!list.length) list = allList; + list = sortArrRandom(list); let result = []; for(let cur of list) { @@ -702,8 +703,8 @@ export class GuildHandler { const topUser = topUserGuild.role; // 交换 - await UserGuildModel.updateInfo(leaderRoleId, { auth: GUILD_AUTH.MEMBER }, {}, 'auth'); // 团长撤 - await UserGuildModel.updateInfo(topUserGuild.roleId, { auth: GUILD_AUTH.LEADER }, {}, 'auth'); // 最高功勋人升 + await UserGuildModel.updateInfo(leaderRoleId, { auth: GUILD_AUTH.MEMBER, job: GUILD_JOB.SHIBING }, {}, 'auth'); // 团长撤 + await UserGuildModel.updateInfo(topUserGuild.roleId, { auth: GUILD_AUTH.LEADER, job: GUILD_JOB.JIANGJUN }, {}, 'auth'); // 最高功勋人升 let managerCntInc = topUserGuild.auth == GUILD_AUTH.MANAGER ? -1 : 0; // 管理人数 const guild = await GuildModel.updateInfo(code, { leader: topUser._id }, { managerCnt: managerCntInc }, 'managerCnt name'); // 如果有转让团长设置leader diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts index 26f223608..db13631cc 100644 --- a/game-server/app/servers/role/handler/friendHandler.ts +++ b/game-server/app/servers/role/handler/friendHandler.ts @@ -1,5 +1,5 @@ import { Application, BackendSession, ChannelService } from "pinus"; -import { resResult, getRandEelm, getResStr, shouldRefresh, getRefTime } from "../../../pubUtils/util"; +import { resResult, getRandEelm, getResStr, shouldRefresh, getRefTime, sortArrRandom } from "../../../pubUtils/util"; import { STATUS, ROLE_SELECT, FRIEND_DROP_TYPE, FRIEND_RELATION_TYPE, POPULATE_TYPE, BLOCK_OPEATE, CONSUME_TYPE, ITID, HERO_SELECT, EQUIP_SELECT, REDIS_KEY } from "../../../consts"; import { RoleModel, RoleType } from "../../../db/Role"; import { getBeforeHourSeconds } from "../../../pubUtils/timeUtil"; @@ -86,6 +86,8 @@ export class FriendHandler { list1 = getRandEelm(myServerList, FRIEND.FRIEND_RECONMMEND_NUM - list2.length); } } + list1 = sortArrRandom(list1); + list2 = sortArrRandom(list2); let list = list1.concat(list2); diff --git a/shared/db/FriendApply.ts b/shared/db/FriendApply.ts index 3de443929..f28ad1498 100644 --- a/shared/db/FriendApply.ts +++ b/shared/db/FriendApply.ts @@ -44,7 +44,7 @@ export default class FriendApply extends BaseModel { // 获取自己发出的申请列表 public static async getSentApplyList(roleId: string, time: Date) { - const list: FriendApplyType[] = await FriendApplyModel.find({ frdRoleId: roleId, createdAt: { $gt: time } }, { _id: 0 }) + const list: FriendApplyType[] = await FriendApplyModel.find({ frdRoleId: roleId, updatedAt: { $gt: time } }, { _id: 0 }) .lean({ getters: true }); return list; } diff --git a/shared/db/Role.ts b/shared/db/Role.ts index 706142992..c3781f123 100644 --- a/shared/db/Role.ts +++ b/shared/db/Role.ts @@ -447,7 +447,7 @@ export default class Role extends BaseModel { */ public static async getInviteList(time: number, serverId: number) { const result = await RoleModel.find({ loginTime: { $gt: time }, hasGuild: false, serverId }) - .select('roleId roleName ce headHid sHid lv title job quitTime') + .select({roleId: 1, roleName: 1,ce: 1,headHid: 1,sHid: 1,lv: 1,title: 1,job: 1,quitTime: 1, _id: 0}) .sort({quitTime: -1, lv: -1, ce: -1}) .limit(100).lean({getters: true}); return result; diff --git a/shared/pubUtils/dictionary/DicGuildActiveDayReward.ts b/shared/pubUtils/dictionary/DicGuildActiveDayReward.ts index 4dcf5e25d..7df9ce2af 100644 --- a/shared/pubUtils/dictionary/DicGuildActiveDayReward.ts +++ b/shared/pubUtils/dictionary/DicGuildActiveDayReward.ts @@ -20,7 +20,7 @@ let arr = JSON.parse(str); export const dicGuildActiveDayReward = new Map(); arr.forEach(o => { - o.reward = parseGoodStr(o.reward) + o.reward = parseGoodStr(o.Reward) dicGuildActiveDayReward.set(o.id, o); }); arr = undefined; \ No newline at end of file diff --git a/shared/pubUtils/util.ts b/shared/pubUtils/util.ts index 8ca8d8c6d..a2869b568 100644 --- a/shared/pubUtils/util.ts +++ b/shared/pubUtils/util.ts @@ -293,6 +293,15 @@ export function getRandEelm(source: Array = [], cnt = 1): Array { return source.filter((_item, idx) => idxs.has(idx)); } +/** + * 不改变原数组长度,将内部元素打乱 + * @param source + */ +export function sortArrRandom(source = []) { + let arr = deepCopy(source); + return arr.sort(() => { return Math.random()-0.5; }); +} + /** * 在给定数值的浮动范围中随机一个值 * @param base 基础数值