diff --git a/shared/db/ActivityLuckyRec.ts b/shared/db/ActivityLuckyRec.ts index 805202599..417541dd0 100644 --- a/shared/db/ActivityLuckyRec.ts +++ b/shared/db/ActivityLuckyRec.ts @@ -10,6 +10,9 @@ export class TurntableRecord { @prop({ required: true }) count: number; + + @prop({ required: true }) + id: number; } export class FloorRecord { @@ -42,8 +45,8 @@ export default class Activity_Lucky_Rec extends BaseModel { @prop({ required: true }) count: number; // 抽卡次数 - @prop({ required: true }) - greatRewardCount: number; // 中头奖次数 + // @prop({ required: true }) + // greatRewardCount: number; // 中头奖次数 @prop({ required: true }) todayCount: number; // 本日抽卡 diff --git a/shared/domain/activityField/luckyField.ts b/shared/domain/activityField/luckyField.ts index 090f71136..9df5ed4a6 100644 --- a/shared/domain/activityField/luckyField.ts +++ b/shared/domain/activityField/luckyField.ts @@ -104,9 +104,9 @@ export class LuckyData extends ActivityBase { private getGidMap() { let gidMap = new Map(); - for (let { gid } of this.records) { - let num = (gidMap.get(gid) || 0) + 1; - gidMap.set(gid, num); + for (let { id } of this.records) { + let num = (gidMap.get(id) || 0) + 1; + gidMap.set(id, num); } return gidMap; } @@ -115,8 +115,8 @@ export class LuckyData extends ActivityBase { let gidMap = this.getGidMap(); let pool: LuckyPool[] = []; for (let obj of this.pool) { - let { gid, numLimit } = obj; - if (numLimit == -1 || numLimit > (gidMap.get(gid) || 0)) pool.push(obj); + let { id, numLimit } = obj; + if (numLimit == -1 || numLimit > (gidMap.get(id) || 0)) pool.push(obj); } return pool; } @@ -192,7 +192,7 @@ export class LuckyData extends ActivityBase { } this.count++; this.todayCount++; - let record = { roleName, gid: randResult.gid, count: randResult.count }; + let record = { roleName, gid: randResult.gid, count: randResult.count, id: randResult.id }; records.push([record.roleName, record.gid, record.count]); this.records.push(record); result.push(randResult.id); @@ -228,7 +228,7 @@ export class LuckyData extends ActivityBase { let gidMap = this.getGidMap(); for (let obj of this.pool) { - obj.getCnt = (gidMap.get(obj.gid) || 0); + obj.getCnt = (gidMap.get(obj.id) || 0); } this.floorRecord = floorRecord;