From be803d23e5514bac4cf1f775e73eaf0070aa0521 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 9 Oct 2024 13:48:32 +0800
Subject: [PATCH] 1

---
 webapp/services/BattleBoxService.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/webapp/services/BattleBoxService.php b/webapp/services/BattleBoxService.php
index 0dc2d889..8211c80f 100644
--- a/webapp/services/BattleBoxService.php
+++ b/webapp/services/BattleBoxService.php
@@ -73,17 +73,19 @@ class BattleBoxService {
             } else {
                 if ($yesterDayDropTotal >= $yesterDayAllocNum) {
                     //掉完了
-                    error_log(json_encode(array(
-                        'yesterDayDropLastTime' => $yesterDayDropLastTime,
-                        'yesterDayDropLastTime2' => myself()->_getDaySecondsOffset($yesterDayDropLastTime),
-                        'startTime' => $startTime,
-                    )));
                     $costTime = myself()->_getDaySecondsOffset($yesterDayDropLastTime) - $startTime;
                     if ($costTime <= 0) {
                         $completionDegree = 1;
                     } else {
                         $completionDegree = ($endTime - $startTime) / $costTime;
                     }
+                    error_log(json_encode(array(
+                        'yesterDayDropLastTime' => $yesterDayDropLastTime,
+                        'yesterDayDropLastTime2' => myself()->_getDaySecondsOffset($yesterDayDropLastTime),
+                        'startTime' => $startTime,
+                        'costTime' => $costTime,
+                        'completionDegree' => $completionDegree,
+                    )));
                 } else {
                     //没掉完
                     $completionDegree = $yesterDayDropTotal / $yesterDayAllocNum;
@@ -153,10 +155,10 @@ class BattleBoxService {
     public static function set($phase, $day)
     {
         $daySeconds = myself()->_getNowDaySeconds() + $day * 3600 * 24;
-        self::getDailyPhaseDropLastTime($phase, $daySeconds, getReqVal('drop_last_time',0 ));
-        self::setDailyPhaseDropTotalNum($phase, $daySeconds, getReqVal('drop_total',0 ));
-        self::setDailyPhaseAllocNum($phase, $daySeconds, getReqVal('alloc_num',0 ));
-        self::setDailyPhaseAlreadyAllocNum($phase, $daySeconds, getReqVal('already_alloced_num',0 ));
+        self::setDailyPhaseDropLastTime($phase, $daySeconds, getReqVal('drop_last_time', 0));
+        self::setDailyPhaseDropTotalNum($phase, $daySeconds, getReqVal('drop_total', 0));
+        self::setDailyPhaseAllocNum($phase, $daySeconds, getReqVal('alloc_num', 0));
+        self::setDailyPhaseAlreadyAllocNum($phase, $daySeconds, getReqVal('already_alloced_num', 0));
         self::dump($phase, $day);
     }