diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index 3cfd68efe..470ed93be 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -791,14 +791,15 @@ export class GuildHandler { const roleId = session.get('roleId'); const roleName = session.get('roleName'); const serverId = session.get('serverId'); - const { code, info } = msg; + const { code, info, myUserGuild } = msg; const guild = await GuildModel.findByCode(code, serverId, 'members'); if (!guild) return resResult(STATUS.GUILD_NOT_FOUND); const { members } = guild; + const jobName = myUserGuild.auth == 1? '大将军': '管理'; //下发邮件 - await sendMailToGuildByContent(MAIL_TYPE.SEND_MAIL, code, { sendName: roleName, params: [info] }, guild); + await sendMailToGuildByContent(MAIL_TYPE.GUILD_MAIL, code, { sendName: `${jobName}:${roleName}`, params: [info] }, guild); return resResult(STATUS.SUCCESS, { isSuccess: true }); } diff --git a/game-server/app/services/mailService.ts b/game-server/app/services/mailService.ts index 6b73f5272..97bbe6b5d 100644 --- a/game-server/app/services/mailService.ts +++ b/game-server/app/services/mailService.ts @@ -120,7 +120,8 @@ class MailTemp { this.endTime = this.sendTime + dicMail?.time||0; this.content = this.getContent(dicMail.content, params.params); if(dicMail.title) this.title = dicMail.title; - if(dicMail.sendName) this.sendName = dicMail.sendName; + if(dicMail.sendName || params.sendName) this.sendName = params.sendName||dicMail.sendName; + this.hasGoods = params.goods?.length > 0; this.goods = params.goods||[]; } diff --git a/shared/consts/constModules/mailConst.ts b/shared/consts/constModules/mailConst.ts index c3aa57999..a9b453e04 100644 --- a/shared/consts/constModules/mailConst.ts +++ b/shared/consts/constModules/mailConst.ts @@ -58,6 +58,7 @@ export enum MAIL_TYPE { DAILY_COIN = 28, // 招财进宝宝箱 GUILD_DISSMISS = 29, // 军团解散 LADDER = 30, // 名将擂台 + GUILD_MAIL = 31, // 军团邮件 }; export const SEND_NAME = '系统';