diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index 61b8c3e4e..f57c48997 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -33,9 +33,10 @@ export class GachaHandler { async getGachaList(msg: {}, session: BackendSession) { const { } = msg; const roleId: string = session.get('roleId'); + let role = await RoleModel.findByRoleId(roleId, 'gachaHasGuide'); const list = await getGachaList(roleId); - return resResult(STATUS.SUCCESS, { list }); + return resResult(STATUS.SUCCESS, { hasInit: !!role.gachaHasGuide, list }); } /** @@ -442,7 +443,7 @@ export class GachaHandler { return resResult(STATUS.GACHA_GUIDE_HAS_DONE); } let userGacha = await UserGachaModel.findByRole(roleId, GACHA_ID.NORMAL); - let { guideResultList = [], candidates = [] } = userGacha; + let { guideResultList = [], candidates = [], } = userGacha; let simpleResult: { contentId: number, hid: number }[] = [] if(id == 0) { @@ -469,7 +470,7 @@ export class GachaHandler { let { heroes, resultHeroes } = await createHeroes(roleId, roleName, sid, serverId, heroInfo); await addItems(roleId, roleName, sid, items); // 更新数据 - await RoleModel.updateRoleInfo(roleId, { gachaHasGuide: true }); + role = await RoleModel.updateRoleInfo(roleId, { gachaHasGuide: true }); await UserGachaRecModel.createRec(roleId, gachaId, 0, count, resultList); // 任务 @@ -482,6 +483,7 @@ export class GachaHandler { await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GACHA_QUALITY_COUNT, count, { heroes: activityData }) return resResult(STATUS.SUCCESS, { + hasInit: !!role.gachaHasGuide, gachaId, heroes: resultHeroes, addHeros: heroes,