抽卡:修复新人卡池特殊处理问题
This commit is contained in:
@@ -58,7 +58,7 @@ export function getGuideGachaId() {
|
||||
|
||||
export function getNormalGachaId() {
|
||||
let ids = gameData.gachaByType.get(GACHA_TYPE.NORMAL);
|
||||
return ids[0];
|
||||
return ids.find(gachaId => gameData.gacha.get(gachaId)?.showInMainPage == 1);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -88,8 +88,8 @@ export async function refreshGacha(dicGacha: DicGacha, userGacha: UserGachaType)
|
||||
|
||||
|
||||
export async function getVisitedHeroList(roleId: string) {
|
||||
|
||||
let { visitedHero, refVisitedTime } = await UserGachaModel.findByRole(roleId, GACHA_TYPE.NORMAL, 0);
|
||||
let gachaId = getNormalGachaId();
|
||||
let { visitedHero, refVisitedTime } = await UserGachaModel.findByRole(roleId, gachaId, 0);
|
||||
if (shouldRefresh(refVisitedTime, new Date())) {
|
||||
visitedHero = [];
|
||||
}
|
||||
@@ -537,9 +537,9 @@ export function getDicGachaByGachaCnt(dicGacha: DicGacha, historyCount: number)
|
||||
}
|
||||
let gachaIds = gameData.gachaByType.get(dicGacha.gachaType);
|
||||
for(let gachaId of gachaIds) {
|
||||
let dicGacha = gameData.gacha.get(gachaId);
|
||||
if(isGachaCntIn(historyCount, dicGacha.gachaCnt.min, dicGacha.gachaCnt.max)) {
|
||||
return dicGacha;
|
||||
let newDicGacha = gameData.gacha.get(gachaId);
|
||||
if(isGachaCntIn(historyCount, newDicGacha.gachaCnt.min, newDicGacha.gachaCnt.max)) {
|
||||
return {...newDicGacha, id: dicGacha.id};
|
||||
}
|
||||
}
|
||||
return null
|
||||
|
||||
Reference in New Issue
Block a user