红点:抽卡推送修改

This commit is contained in:
luying
2021-06-15 15:42:21 +08:00
parent 15ffdf5e47
commit f908bdccee
5 changed files with 34 additions and 25 deletions

View File

@@ -4,7 +4,7 @@ import { STATUS, GACHA_ID, HERO_QUALITY_TYPE, TASK_TYPE, REFRESH_TIME, TIME_OUTP
import { gameData } from "../../../pubUtils/data";
import { GachaListReturn, GachaResult, GachaData } from "../../../domain/activityField/gachaField";
import { UserGachaModel } from "../../../db/UserGacha";
import { refreshGacha, getFloorResult, getResultFromContentId, getGachaList } from "../../../services/gachaService";
import { refreshGacha, getFloorResult, getResultFromContentId, getGachaList, getVisitedHeroList, getAllHeroByQuality } from "../../../services/gachaService";
import { RoleModel } from "../../../db/Role";
import { HeroModel } from "../../../db/Hero";
import { RewardInter } from "../../../pubUtils/interface";
@@ -14,7 +14,6 @@ import { UserGachaRecModel } from "../../../db/UserGachaRec";
import { ActivityModel } from "../../../db/Activity";
import { checkActivityTask, checkTask } from "../../../services/taskService";
import { RECRUIT } from "../../../pubUtils/dicParam";
import { getAllHeroByQuality } from "../../../services/gachaService";
import { transPiece } from "../../../pubUtils/itemUtils";
import { CreateHeroParam } from "../../../domain/roleField/hero";
@@ -291,10 +290,7 @@ export class GachaHandler {
async getVisitedHero(msg: {}, session: BackendSession) {
const roleId: string = session.get('roleId');
let { visitedHero, refVisitedTime } = await UserGachaModel.findByRole(roleId, GACHA_ID.NORMAL, 0);
if (shouldRefresh(refVisitedTime, new Date())) {
visitedHero = [];
}
let visitedHero = await getVisitedHeroList(roleId);
return resResult(STATUS.SUCCESS, {
hids: visitedHero

View File

@@ -19,7 +19,7 @@ import { getAllAssistCnt } from './comBattleService';
import { getDungeonData } from './dungeonService';
import { PvpSeasonResultModel } from '../db/PvpSeasonResult';
import { nowSeconds, getZeroPoint } from '../pubUtils/timeUtil';
import { getGachaList } from './gachaService';
import { getGachaList, getVisitedHeroList } from './gachaService';
import { getSchoolList } from './roleService';
import { addRoleToGuildChannel } from './chatChannelService';
import { getMyGuildInfo, getGuildWithRefActive, getUserGuildWithRefActive, getWishPool } from './guildService';
@@ -98,7 +98,9 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
case 'pvp': // pvp
return await getPvpEntryData(roleId);
case 'gacha':
return await getGachaList(roleId);
const gachalist = await getGachaList(roleId);
const visitList = await getVisitedHeroList(roleId);
return { gachalist, visitList }
case 'school':
return await getSchoolList(roleId);
case 'guild':

View File

@@ -69,6 +69,17 @@ export async function refreshGacha(dicGacha: DicGacha, userGacha: UserGachaType)
return userGacha
}
export async function getVisitedHeroList(roleId: string) {
let { visitedHero, refVisitedTime } = await UserGachaModel.findByRole(roleId, GACHA_ID.NORMAL, 0);
if (shouldRefresh(refVisitedTime, new Date())) {
visitedHero = [];
}
return visitedHero;
}
/**
* @description 获得保底结果
* @param gachaId 招募表id