diff --git a/webapp/services/BattleBoxService.php b/webapp/services/BattleBoxService.php index aa7da1ff..002f0d75 100644 --- a/webapp/services/BattleBoxService.php +++ b/webapp/services/BattleBoxService.php @@ -37,7 +37,7 @@ class BattleBoxService { $alreadyAllocNum = self::getDailyPhaseAlreadyAllocNum($currPhase, myself()->_getNowDaySeconds()); if ($allocableNum <= 0) { $yesterDayTime = myself()->_getNowDaySeconds() - 3600 * 24; - $yesterDayLastDropTime = self::getDailyPhaseDropLastTime($currPhase, $yesterDayTime); + $yesterDayDropLastTime = self::getDailyPhaseDropLastTime($currPhase, $yesterDayTime); $yesterDayDropTotal = self::getDailyPhaseDropTotalNum($currPhase, $yesterDayTime); $yesterDayAllocNum = self::getDailyPhaseAllocNum($currPhase, $yesterDayTime); if ($yesterDayAllocNum <= 0) { @@ -45,9 +45,15 @@ class BattleBoxService { } else { if ($yesterDayDropTotal >= $yesterDayAllocNum) { //掉完了 - $costTime = 0; + $costTime = myself()->_getDaySecondsOffset($yesterDayDropLastTime) - $startTime; + if ($costTime <= 0) { + $completionDegree = 1; + } else { + $completionDegree = ($endTime - $startTime) / $costTime; + } } else { //没掉完 + $completionDegree = $yesterDayDropTotal / $yesterDayAllocNum; } } if ($allocableNum) {