From c8a01d8cd3006447fd4b15fd027462dd8d14fcd0 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Wed, 21 Dec 2022 16:28:39 +0800
Subject: [PATCH] 1

---
 webapp/controller/BattleController.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php
index bd4ba3ec..ec965086 100644
--- a/webapp/controller/BattleController.class.php
+++ b/webapp/controller/BattleController.class.php
@@ -7,6 +7,8 @@ require_once('models/Bag.php');
 require_once('models/DynData.php');
 require_once('models/BattleSettlement.php');
 require_once('models/BattleHistory.php');
+require_once('models/User.php');
+require_once('models/Parachute.php');
 require_once('services/BattleDataService.php');
 require_once('services/FormulaService.php');
 require_once('mt/RankSeason.php');
@@ -18,6 +20,8 @@ use models\Bag;
 use models\DynData;
 use models\BattleHistory;
 use models\BattleSettlement;
+use models\User;
+use models\Parachute;
 
 class BattleController extends BaseAuthedController {
 
@@ -186,6 +190,7 @@ class BattleController extends BaseAuthedController {
         );
         $currSeason = mt\RankSeason::getCurrentSeason();
         foreach ($members as $member) {
+            $userDb = User::find($member['account_id']);
             $info = array(
                 'account_id' => $member['account_id'],
                 'session_id' => $member['session_id'],
@@ -193,6 +198,7 @@ class BattleController extends BaseAuthedController {
                 'weapon_uuid1' => $member['weapon_uuid1'],
                 'weapon_uuid2' => $member['weapon_uuid2'],
                 'battle_uuid' => $member['battle_uuid'],
+                'parachute' => $userDb['parachute']?$userDb['parachute']:Parachute::$parachute,
                 'hero_dto' => '',
                 'weapon_dto1' => '',
                 'weapon_dto2' => '',