Merge pull request #153 from OpzekerIT/dev

Dev
This commit is contained in:
Lanta 2023-11-28 11:19:26 +01:00 committed by GitHub
commit c41147b879
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions

View file

@ -101,24 +101,24 @@ $lastMatches = array_slice($allMatches, 0, 8);
if (isset($clan) && !empty($clan)) { if (isset($clan) && !empty($clan)) {
echo "<table class='sortable'>"; echo "<table class='sortable'>";
echo "<tr><th>Attribute</th><th>Value</th><th>Rank(FPP SQUAD)</th><th>Points</th></tr>"; echo "<tr><th>Attribute</th><th>Value</th><th>Rank(FPP SQUAD)</th><th>Points</th></tr>";
foreach ($clanmembers['clanMembers'] as $value) {
foreach ($playerRanks as $rank) { foreach ($playerRanks as $rank) {
if ($rank['name'] == $value) { $playername = $rank['name'];
if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) {
$tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier'];
$subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier'];
$image = "./images/ranks/" . $tier . "-" . $subTier . ".png"; $image = "./images/ranks/" . $tier . "-" . $subTier . ".png";
$rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']); $rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']);
echo "<tr><td><a href='latestmatches.php?selected_player=" . htmlspecialchars($value) . "'>name</a></td><td><a href='latestmatches.php?selected_player=" . htmlspecialchars($value) . "'>" . htmlspecialchars($value) . "</a></td><td><img src='" . $image . "' class='table-image'></td><td>" . $rankPoint . "</td></tr>"; echo "<tr><td><a href='latestmatches.php?selected_player=" . htmlspecialchars($playername) . "'>name</a></td><td><a href='latestmatches.php?selected_player=" . htmlspecialchars($playername) . "'>" . htmlspecialchars($playername) . "</a></td><td><img src='" . $image . "' class='table-image'></td><td>" . $rankPoint . "</td></tr>";
} else { } else {
echo "<tr><td><a href='latestmatches.php?selected_player=" . htmlspecialchars($value) . "'>name</a></td><td><a href='latestmatches.php?selected_player=" . htmlspecialchars($value) . "'>" . htmlspecialchars($value) . "</a></td><td><img src='./images/ranks/Unranked.png' class='table-image'></td><td></td></tr>"; echo "<tr><td><a href='latestmatches.php?selected_player=" . htmlspecialchars($playername) . "'>name</a></td><td><a href='latestmatches.php?selected_player=" . htmlspecialchars($playername) . "'>" . htmlspecialchars($playername) . "</a></td><td><img src='./images/ranks/Unranked.png' class='table-image'></td><td></td></tr>";
} }
}
} }
}
foreach ($clan as $key => $value) { foreach ($clan as $key => $value) {
if ($key == 'updated') { if ($key == 'updated') {
continue; continue;

View file

@ -46,6 +46,8 @@ foreach ($player in $player_data) {
} }
else { else {
$stats = Invoke-RestMethod -Uri "https://api.pubg.com/shards/steam/matches/$match" -Method GET -Headers $headers $stats = Invoke-RestMethod -Uri "https://api.pubg.com/shards/steam/matches/$match" -Method GET -Headers $headers
$sortedStats = $stats.included | Where-Object { $_.attributes.stats } | Sort-Object { $_.attributes.stats.winplace }
$stats.included = $sortedStats
$stats | ConvertTo-Json -Depth 100 | Out-File "$scriptroot/../data/matches/$match.json" $stats | ConvertTo-Json -Depth 100 | Out-File "$scriptroot/../data/matches/$match.json"
} }

View file

@ -196,7 +196,7 @@ while($playerinfo.data.Count -gt $i) {
$i++ $i++
} }
$seasonstats | convertto-json -Depth 100| Out-File "$scriptroot/../data/player_season_data.json" $seasonstats | Sort-Object -Property {$_.stat.data.attributes.rankedGameModeStats.'squad-fpp'.currentRankPoint} -Descending | convertto-json -Depth 100| Out-File "$scriptroot/../data/player_season_data.json"
remove-lock remove-lock
Stop-Transcript Stop-Transcript