diff --git a/game-server/app/services/activity/giftPackageService.ts b/game-server/app/services/activity/giftPackageService.ts index ac9542120..3f6588f03 100644 --- a/game-server/app/services/activity/giftPackageService.ts +++ b/game-server/app/services/activity/giftPackageService.ts @@ -233,14 +233,12 @@ async function randomSelectedData(dropHistory: {floors: Floor[], getSum: number, // 检查是否达到了保底次数,并且记录最大品质的 floorId let maxQaulityFloorId = 0; // 最大品质的 floorId let maxQaulity = 0; - if (!flag) { - for (let floor of floors) { - if (floor.count + 1 >= gameData.giftPackageFloor.get(floor.id).times) { - flag = true; - if (gameData.giftPackageFloor.get(floor.id).quality > maxQaulity) { - maxQaulityFloorId = floor.id; - maxQaulity = gameData.giftPackageFloor.get(floor.id).quality; - } + for (let floor of floors) { + if (floor.count + 1 >= gameData.giftPackageFloor.get(floor.id).times) { + flag = true; + if (gameData.giftPackageFloor.get(floor.id).quality > maxQaulity) { + maxQaulityFloorId = floor.id; + maxQaulity = gameData.giftPackageFloor.get(floor.id).quality; } } } @@ -251,18 +249,18 @@ async function randomSelectedData(dropHistory: {floors: Floor[], getSum: number, rewards.push({ type: randResult.contentType, id: randResult.content, count: randResult.count }); updateFloorCount(floors, quality, true); getSum++; - console.log('got floorId: ', randResult.floorId, quality); + console.log('got floorId a: ', randResult.floorId, quality); } else if (flag && maxQaulityFloorId > 0) { // 次数保底 let floorResult = getRandEelmWithWeight(floorPlans[maxQaulityFloorId])?.dic; if (!floorResult) continue; rewards.push({ type: floorResult.contentType, id: floorResult.content, count: floorResult.count }); updateFloorCount(floors, maxQaulity, true); getSum++; - console.log('got floorId: ', maxQaulityFloorId, maxQaulity); + console.log('got floorId b: ', maxQaulityFloorId, maxQaulity); } else { // 未达到保底次数 rewards.push({ type: randResult.contentType, id: randResult.content, count: randResult.count }); updateFloorCount(floors, 0, false); - console.log('got floorId: ', randResult.floorId, 0); + console.log('got floorId c: ', randResult.floorId, 0); } allSum++; }