diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index 2a23315cc..2edbc45f2 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -300,7 +300,7 @@ export class GuildHandler { if (ceLimit > role.ce) { return resResult(STATUS.GUILD_NOT_REACH_CONDI); } - // TODO 暂时关闭 + if(nowSeconds() - role.quitGuildTime < dicParam.ARMY.ARMY_JOIN_COOLDOWNTIME * 60) { return resResult(STATUS.GUILD_QUIT_TIME); } diff --git a/game-server/app/services/guildService.ts b/game-server/app/services/guildService.ts index 62e613b53..5d5c312c0 100644 --- a/game-server/app/services/guildService.ts +++ b/game-server/app/services/guildService.ts @@ -246,7 +246,7 @@ export async function refreshUserGuild(userGuild: UserGuildType, roleId: string) let donateName = donateNames[donateNames.length - i - 1]; await sendMailByContent(MAIL_TYPE.WISH_POOL_REWARD, roleId, { params: [donateName, goodInfo.name], - goods: [{ id: goodId, count: drawCnt }] + goods: [{ id: goodId, count: 1 }] }); } }); diff --git a/shared/consts/constModules/mailConst.ts b/shared/consts/constModules/mailConst.ts index a1e53a364..fba8e2f8d 100644 --- a/shared/consts/constModules/mailConst.ts +++ b/shared/consts/constModules/mailConst.ts @@ -50,6 +50,8 @@ export enum MAIL_TYPE { TREAT_ROLE_NAME = 21, // 改玩家名 TREAT_GUILD_INFO = 22, // 改军团名 TIME_LIMIT_RANK = 23, // 限时排行榜 + GUILD_DAILY_BOX = 24, // 军团每日活跃宝箱补领 + GUILD_FUND_BOX = 25, // 军团每日捐献宝箱补领 }; export const SEND_NAME = '系统'; diff --git a/shared/db/UserGuild.ts b/shared/db/UserGuild.ts index 8f2fb5d38..aa0cc6d8b 100644 --- a/shared/db/UserGuild.ts +++ b/shared/db/UserGuild.ts @@ -223,7 +223,7 @@ export default class UserGuild extends BaseModel { } public static async donateUpdate(roleId: string, dntRoleName: string, id: string, select?: string) { - const result: UserGuildType = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON, 'wishGoods.id': id }, { $inc: { 'wishGoods.$.receiveCnt': 1, 'wishGoods.$.drawCnt': 1}, $push:{'wishGoods.$.dntRoleNames': dntRoleName} }, { new: true }).select(select).lean(); + const result: UserGuildType = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON, 'wishGoods.id': id }, { $inc: { 'wishGoods.$.receiveCnt': 1, 'wishGoods.$.drawCnt': 1}, $push:{'wishGoods.$.donateNames': dntRoleName} }, { new: true }).select(select).lean(); return result; } } diff --git a/shared/resource/jsons/dic_email_content.json b/shared/resource/jsons/dic_email_content.json index a13c522e4..66722eb2d 100644 --- a/shared/resource/jsons/dic_email_content.json +++ b/shared/resource/jsons/dic_email_content.json @@ -38,8 +38,8 @@ "id": 5, "title": "&", "sendName": "&", - "content": "亲爱的小将军,您昨日的军团活跃奖励忘记领取了,现已通过邮件发放,请查收", - "time": 24 + "content": "亲爱的小将军,感谢您对军团的付出,上周的军团活跃奖励现已通过邮件发放,请查收", + "time": 720 }, { "id": 6, @@ -59,106 +59,106 @@ "id": 8, "title": "&", "sendName": "&", - "content": "小将军,您的军团已开启boss%d,请赶往支援", + "content": "您的军团已开启boss%d,请赶往支援", "time": 24 }, { "id": 9, "title": "&", "sendName": "&", - "content": "恭喜小将军,军团上下一心,已成功压制boss%d,您在此次压制中获得如下奖励:", - "time": 24 + "content": "军团上下一心,已成功压制boss%d,您在此次压制中获得如下奖励:", + "time": 720 }, { "id": 10, "title": "&", "sendName": "&", - "content": "小将军,您在上周军团练兵场中有奖励尚未领取,奖励如下:", - "time": 24 + "content": "您上周军团练兵场中有奖励尚未领取,奖励如下:", + "time": 720 }, { "id": 11, "title": "&", "sendName": "&", - "content": "小将军,%d赠送您一个%d,请查收:", - "time": 24 + "content": "小将军,%d赠送您%d,请查收:", + "time": 720 }, { "id": 12, "title": "&", "sendName": "&", "content": "亲爱的小将军,您在%d赛季结算奖励如下:", - "time": 24 + "time": 720 }, { "id": 13, "title": "&", "sendName": "&", "content": "恭喜小将军,您在%d赛季最终获得了第%d名,获得如下奖励:", - "time": 24 + "time": 720 }, { "id": 14, "title": "&", "sendName": "&", "content": "亲爱的小将军,您参与军团活动奖励已通过邮件发放,请查收:", - "time": 24 + "time": 720 }, { "id": 15, "title": "&", "sendName": "&", "content": "小将军很抱歉,您在拍卖行的出价已被超过,元宝退还给您,请查收:", - "time": 24 + "time": 720 }, { "id": 16, "title": "&", "sendName": "&", "content": "恭喜小将军,您已在拍卖行成功拍下以下物品,请查收:", - "time": 24 + "time": 720 }, { "id": 17, "title": "&", "sendName": "&", "content": "亲爱的小将军,您昨日的拍卖分红忘记领取了,现已通过邮件发放,请查收", - "time": 24 + "time": 720 }, { "id": 18, "title": "&", "sendName": "&", "content": "亲爱的小将军,您的背包中装备数量已满,请及时清理背包哦。溢出装备已通过邮件发放,请查收", - "time": 24 + "time": 2160 }, { "id": 19, "title": "&", "sendName": "&", "content": "亲爱的小将军,派遣任务已开始下一天的任务,前一天未完成的派遣任务已通过邮件发放,请查收", - "time": 24 + "time": 720 }, { "id": 20, "title": "&", "sendName": "&", "content": "亲爱的小将军,以下是您未领取的【月卡】每日奖励,请查收", - "time": 24 + "time": 2160 }, { "id": 21, "title": "&", "sendName": "&", "content": "您的名称不合规则,已修改为默认名,这是您的补偿", - "time": 24 + "time": 720 }, { "id": 22, "title": "&", "sendName": "&", "content": "您军团的名称不合规则,已修改为默认名", - "time": 24 + "time": 720 }, { "id": 23, @@ -166,5 +166,19 @@ "sendName": "&", "content": "您在限时排行%d中达到第%d名,可获得以下奖励", "time": 720 + }, + { + "id": 24, + "title": "&", + "sendName": "&", + "content": "您昨日的军团活跃宝箱奖励没有领取,现已发送至您的邮箱,请查收", + "time": 720 + }, + { + "id": 25, + "title": "&", + "sendName": "&", + "content": "您昨日的军团捐献所宝箱奖励没有领取,现已发送至您的邮箱,请查收", + "time": 720 } ] \ No newline at end of file