diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index af89cba69..8a07882fd 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -127,7 +127,7 @@ export class GachaHandler { } } } - let userGacha = await UserGachaModel.findByRole(roleId, gachaId); + let userGacha = await UserGachaModel.findByRole(roleId, gachaId, 0); let { hope: userHope = []} = await refreshGacha(gameData.gacha.get(gachaId), userGacha); for (let { id, hid } of hope) { let curHope = userHope.find(cur => cur.id == id); diff --git a/game-server/app/services/activity/newHeroService.ts b/game-server/app/services/activity/newHeroService.ts index cee7d7f8d..a1019b0e5 100644 --- a/game-server/app/services/activity/newHeroService.ts +++ b/game-server/app/services/activity/newHeroService.ts @@ -24,7 +24,7 @@ import { refreshGacha } from './gachaService'; let createTime = await getRoleCreateTime(roleId); let serverTime = await getServerCreateTime(serverId); let playerData = new NewHeroGachaData(activityData, createTime, serverTime); - let userGacha: UserGachaType = await UserGachaModel.findByRole(roleId, playerData.gachaId); + let userGacha: UserGachaType = await UserGachaModel.findByRole(roleId, playerData.gachaId, activityId); let dicGacha = gameData.gacha.get(playerData.gachaId); userGacha = await refreshGacha(dicGacha, userGacha); playerData.setPlayerRecords(userGacha, dicGacha); diff --git a/shared/db/UserGacha.ts b/shared/db/UserGacha.ts index 205f7d26f..d8d05ec2b 100644 --- a/shared/db/UserGacha.ts +++ b/shared/db/UserGacha.ts @@ -107,7 +107,7 @@ export default class UserGacha extends BaseModel { return rec; } - public static async findByRole(roleId: string, gachaId: number, activityId: number = 0) { + public static async findByRole(roleId: string, gachaId: number, activityId: number) { const doc = new UserGachaModel(); const update = Object.assign(doc.toJSON(), { roleId, gachaId, activityId }); delete update._id;