1
This commit is contained in:
parent
8fdf13c014
commit
4d64af598d
@ -203,16 +203,37 @@ class MatchController extends BaseAuthedController {
|
|||||||
}
|
}
|
||||||
error_log(json_encode($matchOkDb));
|
error_log(json_encode($matchOkDb));
|
||||||
$matchInfo['state'] = 1;
|
$matchInfo['state'] = 1;
|
||||||
|
$teamList = array();
|
||||||
{
|
{
|
||||||
$teamDb = $this->readTeamDb($r, $teamUuid);
|
$teamDb = $this->readTeamDb($r, $teamUuid);
|
||||||
array_push($matchInfo['team_list'], $teamDb);
|
array_push($matchInfo['team_list'], $teamDb);
|
||||||
|
$teamInfo = array(
|
||||||
|
'team_uuid' => $teamDb['team_uuid'],
|
||||||
|
'members' => array()
|
||||||
|
);
|
||||||
|
foreach ($teamDb['member_list'] as $val) {
|
||||||
|
array_push($teamInfo['members'], array(
|
||||||
|
'account_id' => $val['account_id']
|
||||||
|
));
|
||||||
|
}
|
||||||
|
array_push($teamList, $teamInfo);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
$teamDb = $this->readTeamDb($r, $matchOkDb['target_team']);
|
$teamDb = $this->readTeamDb($r, $matchOkDb['target_team']);
|
||||||
if (!empty($teamDb) && $teamDb['team_uuid'] != $teamUuid) {
|
if (!empty($teamDb) && $teamDb['team_uuid'] != $teamUuid) {
|
||||||
array_push($matchInfo['team_list'], $teamDb);
|
array_push($matchInfo['team_list'], $teamDb);
|
||||||
|
foreach ($teamDb['member_list'] as $val) {
|
||||||
|
array_push($teamInfo['members'], array(
|
||||||
|
'account_id' => $val['account_id']
|
||||||
|
));
|
||||||
|
}
|
||||||
|
array_push($teamList, $teamInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$matchInfo['join_msg'] = array(
|
||||||
|
'team_uuid' => $teamUuid,
|
||||||
|
'payload' => $teamList
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user