From 894b0f54ac1ff6f2f27da6bcb73ac8e4f12b7b98 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 28 Oct 2024 15:16:27 +0800 Subject: [PATCH 1/2] 1 --- webapp/services/BattleBoxService.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/services/BattleBoxService.php b/webapp/services/BattleBoxService.php index 0803d769..1608ee0f 100644 --- a/webapp/services/BattleBoxService.php +++ b/webapp/services/BattleBoxService.php @@ -97,6 +97,7 @@ class BattleBoxService { $completionDegree = $yesterDayDropTotal / $yesterDayAllocNum; } $allocableNum = min($maxNumLimit, $yesterDayAllocNum * $completionDegree); + $allocableNum = max(300, $allocableNum); if ($allocableNum <= 0) { $allocableNum = $yesterDayAllocNum; } From 9bb60517b91bfa07c5d9658043b4f941691f5cfe Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 28 Oct 2024 15:23:18 +0800 Subject: [PATCH 2/2] 1 --- webapp/services/BattleBoxService.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapp/services/BattleBoxService.php b/webapp/services/BattleBoxService.php index 1608ee0f..67e6022a 100644 --- a/webapp/services/BattleBoxService.php +++ b/webapp/services/BattleBoxService.php @@ -68,12 +68,15 @@ class BattleBoxService { $yesterDayDropLastTime = self::getDailyPhaseDropLastTime($currPhase, $yesterDayTime); $yesterDayDropTotal = self::getDailyPhaseDropTotalNum($currPhase, $yesterDayTime); $yesterDayAllocNum = self::getDailyPhaseAllocNum($currPhase, $yesterDayTime); + $yesterDayAlreadyAllocNum = self::getDailyPhaseAlreadyAllocNum($currPhase, $yesterDayTime); error_log(json_encode(array( 'yesterDayDropLastTime' => $yesterDayDropLastTime, 'yesterDayDropTotal' => $yesterDayDropTotal, 'yesterDayAllocNum' => $yesterDayAllocNum, + 'yesterDayAlreadyAllocNum' => $yesterDayAlreadyAllocNum, 'maxNum' => $maxNum, ))); + $yesterDayDropTotal = max($yesterDayDropTotal, $yesterDayAlreadyAllocNum); if ($yesterDayAllocNum <= 0) { $allocableNum = $maxNum; } else {