diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index 1a9214b49..f8664ee02 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -225,31 +225,14 @@ export class GachaHandler { const { gachaId, activityId = 0, pickHero } = msg; const roleId: string = session.get('roleId'); const serverId: number = session.get('serverId'); - if (gachaId != GACHA_TYPE.ASSIGN && gachaId != GACHA_TYPE.ACTIVITY) - return resResult(STATUS.WRONG_PARMS); let dicHero = gameData.hero.get(pickHero); if (!dicHero) return resResult(STATUS.DIC_DATA_NOT_FOUND); - let heroes: number[] = []; - if (gachaId == GACHA_TYPE.ACTIVITY) { - let activityData = await getActivityById(activityId); - if (!activityData) return resResult(STATUS.ACTIVITY_MISSING); - - let createTime = await getRoleCreateTime(roleId); - let serverTime = await getServerCreateTime(serverId); - let gachaData = new GachaData(activityData, createTime, serverTime); - heroes = gachaData.heroes; - if (!heroes.includes(pickHero)) { - return resResult(STATUS.GACHA_CAN_NOT_PICK) - } - } - let userGacha = await UserGachaModel.updateInfo(roleId, gachaId, activityId, { pickHero }) return resResult(STATUS.SUCCESS, { gachaId, activityId, - heroes, pickHero: userGacha.pickHero });