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-03-31 17:52:34 +08:00
parent e487d07bfd
commit 8c8adacfdc
21 changed files with 1631 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
game-server/app/servers/battle/handler/guildHandler.ts
View File

@@ -77,7 +77,8 @@ export class GuildHandler {
let rank = await getMyRank(REDIS_KEY.GUILD_ACTIVE_RANK, serverId, guild.code);
// 加入channel
session.set('guildCode', guild.code);
session.push('guildCode', () => {});
addRoleToGuildChannel(roleId, sid, guild.code);
// 添加动态
@@ -273,6 +274,8 @@ export class GuildHandler {
// 打开公会页面，加入channel
if(userGuild.guildCode) {
addRoleToGuildChannel(roleId, sid, guild.code);
session.set('guildCode', guild.code);
session.push('guildCode', () => {});
}
// 获取排行榜
@@ -315,7 +318,7 @@ export class GuildHandler {
let hasGuild = false;
if(isAuto) { // 自动加入
const joinResult = await joinGuild(code, guild.name, lv, roleId, serverId);
const joinResult = await joinGuild(code, guild.name, lv, roleId, serverId, session);
if(joinResult.status == -1) {
return joinResult.resResult;
}
@@ -377,7 +380,7 @@ export class GuildHandler {
if(isReceived) { // 同意申请，加入
for(let { roleId } of applyList) {
const joinResult = await joinGuild(code, guild.name, guild.lv, roleId, serverId);
const joinResult = await joinGuild(code, guild.name, guild.lv, roleId, serverId, session);
if(joinResult.status == -1) continue;
let chatSid = await getGuildChannelSid(code);
// 更新人数增加
@@ -513,7 +516,7 @@ export class GuildHandler {
const { guildCode } = invite;
const guild = await GuildModel.findByCode(guildCode, serverId);
const joinResult = await joinGuild(guildCode, guild.name, guild.lv, roleId, serverId);
const joinResult = await joinGuild(guildCode, guild.name, guild.lv, roleId, serverId, session);
if(joinResult.status == -1) {
return joinResult.resResult;
}
@@ -634,6 +637,9 @@ export class GuildHandler {
let chatSid = await getGuildChannelSid(code);
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', () => {});
return resResult(STATUS.SUCCESS, { hasGuild: role.hasGuild });
}