From 36f734556bbcb8701b4b91fed016b71a5025ca38 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 19 Jun 2023 16:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E5=AE=9D=E7=AE=B1):=20?=
 =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E5=AE=9D=E7=AE=B1=E5=91=BD=E4=B8=AD=E4=BD=8E?=
 =?UTF-8?q?=E7=BA=A7=E4=BF=9D=E5=BA=95=E4=BC=9A=E5=86=B2=E6=8E=89=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E4=BF=9D=E5=BA=95=E7=9A=84=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/activity/giftPackageService.ts   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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++;
     }