From 82f9f363212f93894019f022f7993f83f53964cc Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 7 Jul 2023 19:51:45 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E6=B4=BB=E5=8A=A8):=20?= =?UTF-8?q?=E5=AE=B4=E8=AF=B7=E7=99=BE=E5=AE=B6=E8=A7=A3=E9=94=81=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/activity/handler/entertainHandler.ts | 2 +- shared/db/ActivityEntertainRec.ts | 3 +++ shared/domain/activityField/entertainField.ts | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/game-server/app/servers/activity/handler/entertainHandler.ts b/game-server/app/servers/activity/handler/entertainHandler.ts index 2a1434853..6d5e67785 100644 --- a/game-server/app/servers/activity/handler/entertainHandler.ts +++ b/game-server/app/servers/activity/handler/entertainHandler.ts @@ -64,7 +64,7 @@ export class EntertainHandler { if(!randResult) return resResult(STATUS.ACTIVITY_ENTERTAIN_NO_NUM); let rewards = stringToRewardParam(randResult.reward); - let playerRecord = await ActivityEntertainRecModel.record(serverId, activityId, playerData.roundIndex, roleId, { todayIndex: playerData.todayIndex, id: randResult.id, hid: randResult.hid, time: new Date(), reward: randResult.reward }) + let playerRecord = await ActivityEntertainRecModel.record(serverId, activityId, playerData.roundIndex, roleId, { todayIndex: playerData.todayIndex, id: randResult.id, hid: randResult.hid, index: randResult.index, time: new Date(), reward: randResult.reward }) let { goods } = await addReward(roleId, roleName, sid, serverId, rewards, ITEM_CHANGE_REASON.ACT_ENTERTAIN); randResult.incNum(); playerData.updateBuyCnt(playerRecord); diff --git a/shared/db/ActivityEntertainRec.ts b/shared/db/ActivityEntertainRec.ts index 0be2bcbc1..5cf7e2bfb 100644 --- a/shared/db/ActivityEntertainRec.ts +++ b/shared/db/ActivityEntertainRec.ts @@ -14,6 +14,9 @@ class EntertainRecord { @prop({ required: true }) hid: number; // 冗余，武将id + @prop({ required: true }) + index: number; // 冗余，武将id + @prop({ required: true }) reward: string; // 冗余，奖励 diff --git a/shared/domain/activityField/entertainField.ts b/shared/domain/activityField/entertainField.ts index e79054a4d..e25b5785f 100644 --- a/shared/domain/activityField/entertainField.ts +++ b/shared/domain/activityField/entertainField.ts @@ -120,7 +120,7 @@ export class EntertainData extends ActivityBase { this.todayPlayCnt = 0; this.playCnt = 0; let recByDay = new Map(); - for (let { id, hid, todayIndex } of (playerData.record || [])) { + for (let { id, index, todayIndex } of (playerData.record || [])) { if (todayIndex == this.todayIndex) { this.todayPlayCnt++; this.playCnt++; @@ -136,8 +136,8 @@ export class EntertainData extends ActivityBase { let hero = this.findHeroById(id); hero.incNum(); - if(this.invitedHids.indexOf(hid) == -1) { - this.invitedHids.push(hid); + if(this.invitedHids.indexOf(index) == -1) { + this.invitedHids.push(index); this.invitedHeroNum++; } }