xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

抽卡

Browse Source
This commit is contained in:
luying
2022-05-20 11:02:47 +08:00
parent 3dd37ffc7b
commit 72739ee9cf
7 changed files with 326 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
game-server/app/servers/activity/handler/gachaHandler.ts
View File

@@ -67,11 +67,10 @@ export class GachaHandler {
if ((gachaId == GACHA_ID.ASSIGN || gachaId == GACHA_ID.TIMELIMIT) && !pickHero) return resResult(STATUS.GACHA_NOT_ASSIGN);
let userHeroes = await HeroModel.findByRole(roleId);
let gachaPull = new GachaPull(gachaId, lv, userHeroes);
gachaPull.setByUserGacha(dicGacha, userGacha);
let { items, heroInfo, resultList, activityData } = gachaPull.pull(count);
let { hope, floor } = gachaPull.getUserGachaParam(userGacha);
let gachaPull = new GachaPull(gachaId);
gachaPull.setByUserGacha(dicGacha, userGacha, false);
let { resultList, heroInfo, items } = gachaPull.pull(count, userHeroes);
let { hope, floor } = gachaPull.getUserGachaParam();
let costNum = count;
if (count == 1 && dicGacha.free.count > 0) { // 单抽的时候免费
@@ -370,9 +369,9 @@ export class GachaHandler {
}
let userHeroes = await HeroModel.findByRole(roleId);
let gachaPull = new GachaPull(gachaId, 0, userHeroes);
gachaPull.setByUserGacha({...dicGacha, floorReward: 0}, userGacha);
let { resultList } = gachaPull.pull(count);
let gachaPull = new GachaPull(gachaId);
gachaPull.setByUserGacha({...dicGacha, floorReward: 0}, userGacha, true);
let { resultList } = gachaPull.pull(count, userHeroes);
userGacha = await UserGachaModel.updateInfo(roleId, gachaId, 0, { guideResultList: resultList, guideCount: guideCount + 1 })
@@ -447,11 +446,9 @@ export class GachaHandler {
simpleResult = candidate.list;
}
let { lv } = await RoleModel.findByRoleId(roleId);
let userHeroes = await HeroModel.findByRole(roleId);
let gachaPull = new GachaPull(gachaId, lv, userHeroes);
let { items, heroInfo, resultList, activityData } = gachaPull.pullBySimpleResult(simpleResult);
let gachaPull = new GachaPull(gachaId);
let { items, heroInfo, resultList } = gachaPull.pullBySimpleResult(simpleResult, userHeroes);
userGacha = await UserGachaModel.updateInfo(roleId, gachaId, 0, { guideResultCount: count });

6
game-server/app/servers/activity/handler/newHeroGachaHandler.ts
View File

@@ -78,13 +78,11 @@ export class NewHeroGachaHandler {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
let { lv } = await RoleModel.findByRoleId(roleId);
let userHeroes = await HeroModel.findByRole(roleId);
let gachaPull = new GachaPull(GACHA_ID.TIMELIMIT, lv, userHeroes);
let gachaPull = new GachaPull(GACHA_ID.TIMELIMIT);
gachaPull.setByActivity(item);
let { items, heroInfo, resultList, activityData } = gachaPull.pull(count);
let { items, heroInfo, resultList } = gachaPull.pull(count, userHeroes);
let { hasGetFloor, floorCount } = gachaPull.getActivityParam();
// 消耗东西