From 50c6ad4c2c27eafd9288eb566c530296eacc6be0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 25 Jan 2024 16:26:37 +0800
Subject: [PATCH 1/2] 1

---
 webapp/controller/BoxController.class.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/webapp/controller/BoxController.class.php b/webapp/controller/BoxController.class.php
index 0b5baa7d..fa4666a0 100644
--- a/webapp/controller/BoxController.class.php
+++ b/webapp/controller/BoxController.class.php
@@ -4,6 +4,7 @@ require_once('mt/Parameter.php');
 require_once('mt/Item.php');
 require_once('mt/Drop.php');
 require_once('mt/Hero.php');
+require_once('mt/ServerTaskTime.php');
 
 require_once('models/Bag.php');
 require_once('models/Hero.php');
@@ -36,23 +37,17 @@ class BoxController extends BaseAuthedController {
 
     public function requestReward()
     {
+        /*
         $this->_rspData(array(
             "item_list" => array(
-                'item_id' => V_ITEM_GOLD,
-                1000
+                array(
+                    'item_id' => V_ITEM_GOLD,
+                    'item_num' => 1000
+                )
             )
         ));
         $payload = '';
-        return;
-        /*
-        $userInfo = $this->_getOrmUserInfo();
-        if (!$userInfo) {
-            $this->_rspErr(1, 'Without this player1');
-            return;
-        }
-//        $ranked = getReqVal('pvp_personal_rank', 0);
-        $teamBattleDataService = new services\TameBattleDataService();
-        $teamBattleDataService->calStarNum();
+        return;*/
         $mode = getReqVal('room_mode', 0);
         $item = array();
         $currentMeta = \mt\ServerTaskTime::getCurrentTime();
@@ -88,8 +83,8 @@ class BoxController extends BaseAuthedController {
             Bag::addItem($item['item_id'],$item['item_num']);
         }
         $this->_rspData(array(
-            "items" => $item
-            ));*/
+            "item_list" => $item
+        ));
     }
 
 }

From e5e12220ec23fdab4cb4f650089412ee2cd78817 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 25 Jan 2024 16:46:48 +0800
Subject: [PATCH 2/2] 1

---
 webapp/controller/BoxController.class.php | 72 ++++++++++++-----------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/webapp/controller/BoxController.class.php b/webapp/controller/BoxController.class.php
index fa4666a0..35aff06a 100644
--- a/webapp/controller/BoxController.class.php
+++ b/webapp/controller/BoxController.class.php
@@ -15,6 +15,10 @@ require_once('services/AwardService.php');
 require_once('services/PropertyChgService.php');
 require_once('services/LogService.php');
 require_once('services/NameService.php');
+require_once('services/HashRateService.php');
+require_once('services/TameBattleDataService.php');
+require_once('services/AwardService.php');
+require_once('services/PropertyChgService.php');
 
 use phpcommon\SqlHelper;
 use models\Bag;
@@ -38,16 +42,16 @@ class BoxController extends BaseAuthedController {
     public function requestReward()
     {
         /*
-        $this->_rspData(array(
-            "item_list" => array(
-                array(
-                    'item_id' => V_ITEM_GOLD,
-                    'item_num' => 1000
-                )
-            )
-        ));
-        $payload = '';
-        return;*/
+          $this->_rspData(array(
+          "item_list" => array(
+          array(
+          'item_id' => V_ITEM_GOLD,
+          'item_num' => 1000
+          )
+          )
+          ));
+          $payload = '';
+          return;*/
         $mode = getReqVal('room_mode', 0);
         $item = array();
         $currentMeta = \mt\ServerTaskTime::getCurrentTime();
@@ -57,33 +61,35 @@ class BoxController extends BaseAuthedController {
             $hashRateService = new services\HashRateService();
             $hashRateService->init();
             $status = $hashRateService->getServerASKBoxMode();
-                switch ($status){
-                    case \mt\ServerTask::MOBA_DROP_STATE :{
-                        if ($mode == \services\TameBattleDataService::ROOM_MODE_PVP){
-                            array_push($item,array(
-                                "item_id" => 300001,
-                                "item_num" => 1,
-                            ));
+            switch ($status){
+            case \mt\ServerTask::MOBA_DROP_STATE :{
+                if ($mode == \services\TameBattleDataService::ROOM_MODE_PVP){
+                    array_push($item,array(
+                        "item_id" => 300001,
+                        "item_num" => 1,
+                    ));
 
-                        }
-                    }
-                        break;
-                    case \mt\ServerTask::PVP_DROP_STATE : {
-                        if ($mode == \services\TameBattleDataService::ROOM_MODE_MOBA){
-                            array_push($item,array(
-                                "item_id" => 300001,
-                                "item_num" => 1,
-                            ));
-                        }
-                    }
-                        break;
                 }
+            }
+            break;
+            case \mt\ServerTask::PVP_DROP_STATE : {
+                if ($mode == \services\TameBattleDataService::ROOM_MODE_MOBA){
+                    array_push($item,array(
+                        "item_id" => 300001,
+                        "item_num" => 1,
+                    ));
+                }
+            }
+            break;
+            }
         }
-        if ($item){
-            Bag::addItem($item['item_id'],$item['item_num']);
-        }
+        $awardService = new services\AwardService();
+        $propertyChgService = new services\PropertyChgService();
+        myself()->_addItems($item, $awardService, $propertyChgService);
         $this->_rspData(array(
-            "item_list" => $item
+            "item_list" => $item,
+            'award' => $awardService->toDto(),
+            'property_chg' => $propertyChgService->toDto(),
         ));
     }