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-08-04 16:40:20 +08:00
parent 8cbf0090c5
commit 4d3c0fe302
18 changed files with 270 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
game-server/app/servers/guild/handler/guildHandler.ts
View File

@@ -2,7 +2,7 @@ import { Application, BackendSession, ChannelService, HandlerService, } from 'pi
import { resResult, getRandEelm, 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, GUILD_SELECT, USER_GUILD_SELECT, TASK_TYPE, DEBUG_MAGIC_WORD } from '../../../consts';
import { UserGuildModel, UserGuildType } from '../../../db/UserGuild';
import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, refreshUserGuild } from '../../../services/guildService';
import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, refreshUserGuild, setUserGuildSession } from '../../../services/guildService';
import { GuildModel, GuildType } from '../../../db/Guild';
import { RoleModel, RoleType } from '../../../db/Role';
import { ARMY } from '../../../pubUtils/dicParam';
@@ -79,8 +79,7 @@ export class GuildHandler {
let rank = await r.getMyRank({ guildCode: guild.code });
// 加入channel
session.set('guildCode', guild.code);
session.push('guildCode', () => { });
setUserGuildSession(session, userGuild);
addRoleToGuildChannel(roleId, sid, guild.code);
// 添加动态
@@ -157,6 +156,7 @@ export class GuildHandler {
async setAuth(msg: guildInter & { roleId: string, auth: number }, session: BackendSession) {
const roleId = session.get('roleId');
const sid = session.get('sid');
const roleName = session.get('roleName');
const serverId = session.get('serverId');
const { roleId: memberRoleId, auth, myUserGuild, hisUserGuild } = msg;
@@ -193,12 +193,14 @@ export class GuildHandler {
if (!userGuild) {
return resResult(STATUS.GUILD_MEMBER_NOT_FOUND);
}
await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid,[{ roleId: memberRoleId, userGuild }]);
const role = await RoleModel.findByRoleId(memberRoleId);
let updateObject = {};
if (auth == GUILD_AUTH.LEADER) { // 转让团长
updateObject['leader'] = role._id;
await UserGuildModel.updateInfo(roleId, { auth: GUILD_AUTH.MEMBER, job: GUILD_JOB.SHIBING }, {}); // 自己降权限
let myUserGuild = await UserGuildModel.updateInfo(roleId, { auth: GUILD_AUTH.MEMBER, job: GUILD_JOB.SHIBING }, {}); // 自己降权限
setUserGuildSession(session, myUserGuild);
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{ field: 'leader', value: new GuildLeader(role) }]);
}
@@ -467,14 +469,15 @@ export class GuildHandler {
}
// 获取军团成员
async getGuildMember(msg: guildInter & { code: string, sort: string }, session: BackendSession) {
async getGuildMember(msg: { code: string, sort: string }, session: BackendSession) {
const roleId = session.get('roleId');
const guildAuth: number = session.get('guildAuth');
// const serverId = session.get('serverId');
const { code, sort, myUserGuild } = msg;
const { code, sort } = msg;
let select = ['role', 'job'];
const checkDetailResult = await checkAuth(GUILD_OPERATE.GET_MEMBER_LIST_DETAIL, roleId, code, myUserGuild);
const checkDetailResult = await checkAuth(GUILD_OPERATE.GET_MEMBER_LIST_DETAIL, code, guildAuth);
if (checkDetailResult) {
select.push('auth', 'activeWeekly activeUpdateTime');
}
@@ -511,6 +514,7 @@ export class GuildHandler {
async dismiss(msg: guildInter & { code: string }, session: BackendSession) {
const serverId = session.get('serverId');
const sid = session.get('sid');
const { code } = msg;
const guild = await GuildModel.dismiss(code, serverId);
@@ -521,6 +525,8 @@ export class GuildHandler {
await RoleModel.dissmissGuild(members);
await UserGuildApplyModel.deleteApplyByGuild(code);
await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid, members.map(roleId => { return { roleId, userGuild: null } })); // 更新session
// 删除channel
let chatSid = await getGuildChannelSid(code);
@@ -562,8 +568,7 @@ export class GuildHandler {
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid, code, roleId, guild, sid);
session.set('guildCode', '');
session.push('guild', () => { });
setUserGuildSession(session, null);
return resResult(STATUS.SUCCESS, { hasGuild: role.hasGuild });
}
@@ -597,6 +602,8 @@ export class GuildHandler {
// 添加动态
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.QUIT_GUILD, [role.roleName]);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid,[{ roleId: memberRoleId, userGuild }]);
await sendMailByContent(MAIL_TYPE.GUILD_BE_KICK, memberRoleId, { sendName: roleName, params: [guild.name] });
return resResult(STATUS.SUCCESS, { memberCnt: guild.memberCnt });
@@ -642,8 +649,12 @@ export class GuildHandler {
const topUser = <RoleType>topUserGuild.role;
// 交换
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 oldLeaderUserGuild = await UserGuildModel.updateInfo(leaderRoleId, { auth: GUILD_AUTH.MEMBER, job: GUILD_JOB.SHIBING }, {}, 'auth'); // 团长撤
await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid,[{ roleId: leaderRoleId, oldLeaderUserGuild }]); // 更新session
let newLeaderUserGuild = await UserGuildModel.updateInfo(topUserGuild.roleId, { auth: GUILD_AUTH.LEADER, job: GUILD_JOB.JIANGJUN }, {}, 'auth'); // 最高功勋人升
await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid,[{ roleId: topUserGuild.roleId, newLeaderUserGuild }]); // 更新session
let managerCntInc = topUserGuild.auth == GUILD_AUTH.MANAGER ? -1 : 0; // 管理人数
const guild = await GuildModel.updateInfo(code, { leader: topUser._id }, { managerCnt: managerCntInc }, 'managerCnt name'); // 如果有转让团长设置leader
@@ -924,8 +935,7 @@ export class GuildHandler {
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid, oldCode, roleId, guild, sid);
session.set('guildCode', '');
session.push('guild', () => { });
setUserGuildSession(session, userGuild);
}
const joinResult = await joinGuild(code, guild.name, lv, roleId, serverId, session);