From 9487c41783230b4c5d198f17cdb81138ca14bec9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 9 Oct 2024 10:29:44 +0800
Subject: [PATCH] 1

---
 webapp/controller/BattleController.class.php |  2 +-
 webapp/mt/MapMode.php                        |  4 ++--
 webapp/services/BattleBoxService.php         | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php
index c0103046..f5528504 100644
--- a/webapp/controller/BattleController.class.php
+++ b/webapp/controller/BattleController.class.php
@@ -1310,7 +1310,7 @@ class BattleController extends BaseAuthedController {
     }
 
     public function requestAllocBoxNumNew() {
-        $boxNum = services\BattleBoxService::allocBox();
+        $boxNum = services\BattleBoxService::allocBox('');
         myself()->_rspData(array(
             'box_num' => $boxNum
         ));
diff --git a/webapp/mt/MapMode.php b/webapp/mt/MapMode.php
index 23a369e5..71cbdfa5 100644
--- a/webapp/mt/MapMode.php
+++ b/webapp/mt/MapMode.php
@@ -129,14 +129,14 @@ class MapMode
             use (&$mapModeMeta, &$phase, &$startTime, &$endTime) {
                 if ($meta['mapMode'] == self::TREASURE_BOX_MODE) {
                     if (self::configedDailyTimeLimit1($meta)) {
-                        $mapNodeMeta = $meta;
+                        $mapModeMeta = $meta;
                         $phase = 1;
                         $startTime = $meta['daily_open_time'];
                         $endTime = $meta['daily_end_time'];
                         return false;
                     }
                     if (self::configedDailyTimeLimit2($meta)) {
-                        $mapNodeMeta = $meta;
+                        $mapModeMeta = $meta;
                         $phase = 2;
                         $startTime = $meta['daily_open_time_2'];
                         $endTime = $meta['daily_end_time_2'];
diff --git a/webapp/services/BattleBoxService.php b/webapp/services/BattleBoxService.php
index e3a5c037..f33b1deb 100644
--- a/webapp/services/BattleBoxService.php
+++ b/webapp/services/BattleBoxService.php
@@ -3,7 +3,9 @@
 namespace services;
 
 require_once('mt/Parameter.php');
+require_once('mt/MapMode.php');
 
+use mt;
 /*
 1、周期还害没结束，箱子就掉完了
 完成度=T max/T cost time(last time-start time)
@@ -27,13 +29,22 @@ class BattleBoxService {
             return 0;
         }
         $boxNum = 0;
-        $currPhase = self::getCurrentPhase();
+        $currPhase = 0;
         $startTime = 0;
         $endTime = 0;
         $minNum = 0;
         $maxNum = 0;
         $maxNumLimit = 0;
         $completionDegree = 0;
+        $mapModeMeta = null;
+        mt\MapMode::getCurrentBoxDropInfo($mapModeMeta, $currPhase, $startTime, $endTime);
+        error_log(json_encode(array(
+            'mapNodeMeta' => $mapModeMeta,
+            'currPhase' => $currPhase,
+            'startTime' => $startTime,
+            'endTime' => $endTime,
+        )));
+        return;
 
         $allocableNum = self::getDailyPhaseAllocNum($currPhase, myself()->_getNowDaySeconds());
         $alreadyAllocNum = self::getDailyPhaseAlreadyAllocNum($currPhase, myself()->_getNowDaySeconds());
@@ -89,11 +100,6 @@ class BattleBoxService {
         return $boxNum;
     }
 
-    public static function getCurrentPhase()
-    {
-        return 0;
-    }
-
     private static function getDailyPhaseDropLastTime($phase, $time)
     {
         $key = self::DAILY_PHASE_DROP_LAST_TIME_KEY . $phase . ':' . $time;