From 93aade8be9d034292f5a7948ae3e54b7df9922f1 Mon Sep 17 00:00:00 2001 From: dingchaolin Date: Tue, 28 Feb 2023 18:13:27 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(guild):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=BF=9B=E5=86=9B=E5=9B=A2=E6=97=A0=E9=99=90?= =?UTF-8?q?=E5=88=B6=E9=A2=86=E5=8F=96=E8=AF=95=E7=82=BC=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/UserGuild.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shared/db/UserGuild.ts b/shared/db/UserGuild.ts index c1a6fcbdd..b98d6bf06 100644 --- a/shared/db/UserGuild.ts +++ b/shared/db/UserGuild.ts @@ -145,13 +145,14 @@ export default class UserGuild extends BaseModel { public static async createUserGuild(guildCode: string, role: RoleType, isLeader: boolean) { const lastGuild = await UserGuildModel.findMyLastGuild(role.roleId, '+refTimeDaily'); - let { receiveBoxs = [], donateCnt = 0, receivedActive = [], encourageCnt = 0, bossChallengeCnt = 0, receivedWishPool = [], wishGoods = [], wishDntCnt = 0, refTimeDaily, refBossTime, trainCount, buyTrainCount, trainTime } = lastGuild||{}; + let { receiveBoxs = [], donateCnt = 0, receivedActive = [], encourageCnt = 0, bossChallengeCnt = 0, receivedWishPool = [], wishGoods = [], wishDntCnt = 0, refTimeDaily, refBossTime, trainCount, buyTrainCount, trainTime, trainRewards = [] } = lastGuild||{}; const doc = new UserGuildModel(); let job = isLeader? GUILD_JOB.DAJIANGJUN: GUILD_JOB.SHIBING; let auth = isLeader? GUILD_AUTH.LEADER: GUILD_AUTH.MEMBER; - const update = Object.assign(doc.toJSON(), { guildCode, roleId: role.roleId, role: role._id, job, auth, receiveBoxs, donateCnt, receivedActive, encourageCnt, bossChallengeCnt, receivedWishPool, wishGoods, wishDntCnt, refTimeDaily, refBossTime, trainCount, buyTrainCount, trainTime }); + const update = Object.assign(doc.toJSON(), { guildCode, roleId: role.roleId, role: role._id, job, auth, receiveBoxs, donateCnt, receivedActive, encourageCnt, bossChallengeCnt, receivedWishPool, wishGoods, wishDntCnt, refTimeDaily, refBossTime, trainCount, buyTrainCount, trainTime, trainRewards }); + // trainRewards: 试炼奖励, 无论在任何情况下都不能被清空（次数可以重置，奖励领过就不能再领了，无论在哪个军团） // 【退出军团】 和 【再加入军团】在同一天 if (isToday(role.quitGuildTime)) { // 同一个军团: 所有数据保留; 不同军团: 许愿池数据清空,当天不允许许愿,其他数据保留