server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'james_bc' into hjb

Browse Source
This commit is contained in:
hujiabin 2022-12-21 16:28:59 +08:00
commit 2aa0690b33
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/controller/BattleController.class.php
View File

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