diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index 7750e65c7..6d4584711 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -54,9 +54,6 @@ export class GachaHandler { const sid: string = session.get('sid'); const serverId: number = session.get('serverId'); - - let { lv } = await RoleModel.findByRoleId(roleId); - let dicGacha = gameData.gacha.get(gachaId); if (!dicGacha) return resResult(STATUS.DIC_DATA_NOT_FOUND); if (!dicGacha.count.includes(count)) return resResult(STATUS.WRONG_PARMS); diff --git a/game-server/app/services/activity/gachaService.ts b/game-server/app/services/activity/gachaService.ts index 013fe458f..dd9ff6e1f 100644 --- a/game-server/app/services/activity/gachaService.ts +++ b/game-server/app/services/activity/gachaService.ts @@ -152,7 +152,7 @@ class GachaResults { } public shouldPurpleFloor(floorCount: number) { - return this.count == floorCount && !this.hasPurple(); + return this.count % floorCount == 0 && !this.hasPurple(); } public hasPurple() { @@ -293,12 +293,9 @@ export class GachaPull { public setAssignFloor(dicFloorCount: number) { let floorType = GACHA_FLOOR_TYPE.ASSIGN; let { floorCount: historyCount, hasGetFloor } = this.player.getFloorCountByFloorType(floorType); - console.log('#### gachaResult', this.result.list) for(let gachaResult of this.result.list) { let isTarget = this.bigReward.id == gachaResult.contentId; - console.log('#### setAssignFloor', historyCount, dicFloorCount, isTarget) if(++historyCount >= dicFloorCount || isTarget) { - console.log('#### setAssignFloor', isTarget, hasGetFloor) if(hasGetFloor) { // 已经获得过一次保底了, 不给,换个给 gachaResult.setContentId(getGachaContentOfHeroQuality(HERO_QUALITY_TYPE.PURPLE)); } else { @@ -306,7 +303,6 @@ export class GachaPull { hasGetFloor = true; } } - console.log('#### setAssignFloor after', historyCount, dicFloorCount) if(historyCount >= dicFloorCount) { hasGetFloor = false; historyCount = 0;