-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #825 from project-primera/develop
Release 0.17.0
- Loading branch information
Showing
12 changed files
with
216 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
OngekiScoreLog/resources/views/layouts/components/user/song_status_overdamage.blade.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
<div class="box"> | ||
<p>登録されている全ユーザーのオーバーダメージのうち、一番高いものと比較することが出来ます。<br> | ||
OD埋めなどにご活用ください。</p> | ||
<p>プレイしている楽曲内で、一番ODが高い難易度のみ表示されます。全難易度のODが0の曲は表示されません。なお削除楽曲等も表示されます。ご了承下さい。</p> | ||
</div> | ||
|
||
<article class="box"> | ||
<p> | ||
<b>表示倍率の変更</b><br> | ||
<button class="button table_scale_change">25%</button> | ||
<button class="button table_scale_change">50%</button> | ||
<button class="button table_scale_change">75%</button> | ||
<button class="button table_scale_change">100%</button> | ||
</p> | ||
<div id="sort_table" class="table_wrap scalable"> | ||
<table class="table"> | ||
<thead> | ||
<tr> | ||
<th class="sort" data-sort="sort_title">Title</th> | ||
<th class="sort" data-sort="sort_difficulty"><abbr title="Difficulty">Dif</abbr></th> | ||
<th class="sort" data-sort="sort_od"><abbr title="Over Damage">OD</abbr></th> | ||
<th class="sort" data-sort="sort_key1"><abbr title="Top Ranker Score">Top</abbr></th> | ||
<th class="sort" data-sort="sort_key2">diff</th> | ||
<th class="sort" data-sort="sort_key3">達成度</th> | ||
<th class="sort desc" data-sort="sort_update">Update</th> | ||
</tr> | ||
</thead> | ||
<tfoot> | ||
<tr> | ||
<th class="sort" data-sort="sort_title">Title</th> | ||
<th class="sort" data-sort="sort_difficulty"><abbr title="Difficulty">Dif</abbr></th> | ||
<th class="sort" data-sort="sort_od"><abbr title="Over Damage">OD</abbr></th> | ||
<th class="sort" data-sort="sort_key1"><abbr title="Top Ranker Score">Top</abbr></th> | ||
<th class="sort" data-sort="sort_key2">diff</th> | ||
<th class="sort" data-sort="sort_key3">達成度</th> | ||
<th class="sort desc" data-sort="sort_update">Update</th> | ||
</tr> | ||
</tfoot> | ||
<tbody class="list"> | ||
@foreach ($score as $s) | ||
<tr> | ||
<td class="sort_title"><span class="sort-key">{{$s->title}}</span><a href="{{url("/user/" . $id . "/music/" . $s->song_id . "/" . strtolower($s->difficulty_str))}}">{{$s->title}}</a></td> | ||
<td class="sort_difficulty"><span class="sort-key">{{$s->difficulty}}</span>{{substr($s->difficulty_str, 0, 3)}}</td> | ||
<td class="sort_od">{{$s->over_damage_high_score . "%"}}</td> | ||
<td class="sort_key1">{{$topRankerScore[$s->song_id . "_" . $s->difficulty] . "%"}}</td> | ||
<td class="sort_key2">{{$s->over_damage_high_score - $topRankerScore[$s->song_id . "_" . $s->difficulty]}}%</td> | ||
<td class="sort_key3">{{($topRankerScore[$s->song_id . "_" . $s->difficulty] != 0) ? ($s->over_damage_high_score / $topRankerScore[$s->song_id . "_" . $s->difficulty]) * 100 : 100}}%</td> | ||
<td class="sort_update">{{date('Y-m-d', strtotime($s->updated_at))}}</td> | ||
</tr> | ||
@endforeach | ||
</tbody> | ||
</table> | ||
</div> | ||
|
||
</article> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
@extends('layouts.app') | ||
|
||
@section('title', $status[0]->name) | ||
@section('hero_subtitle', $status[0]->trophy) | ||
@section('hero_title', $status[0]->name) | ||
@section('additional_footer') | ||
<script type="text/javascript" src="{{ mix('/js/sortTable.js') }}"></script> | ||
<script type="text/javascript" src="{{ mix('/js/tableScalable.js') }}"></script> | ||
@endsection | ||
@section('sidemark_mypage_overdamage', "is-active") | ||
|
||
@section('submenu') | ||
<li><a href="/user/{{$id}}">簡易</a></li> | ||
<li><a href="/user/{{$id}}/details">詳細</a></li> | ||
<li><a href="/user/{{$id}}/technical">Technical</a></li> | ||
<li><a href="/user/{{$id}}/battle">Battle</a></li> | ||
<li class="is-active"><a href="/user/{{$id}}/overdamage">OverDamage</a></li> | ||
<li><a href="/user/{{$id}}/trophy">称号</a></li> | ||
<li><a href="/user/{{$id}}/rating">Rating</a></li> | ||
<li><a href="/user/{{$id}}/progress">更新差分</a></li> | ||
@endsection | ||
|
||
@section('content') | ||
@component('layouts/components/user/user_status') | ||
@slot('badge') | ||
{!!$status[0]->badge!!} | ||
@endslot | ||
@slot('name') | ||
{{$status[0]->name}} | ||
@endslot | ||
@slot('trophy') | ||
{{$status[0]->trophy}} | ||
@endslot | ||
@slot('level') | ||
{{$status[0]->level}} | ||
@endslot | ||
@slot('battle_point') | ||
{{$status[0]->battle_point}} | ||
@endslot | ||
@slot('rating') | ||
{{$status[0]->rating}} | ||
@endslot | ||
@slot('rating_max') | ||
{{$status[0]->rating_max}} | ||
@endslot | ||
@slot('money') | ||
{{$status[0]->money}} | ||
@endslot | ||
@slot('money_max') | ||
{{$status[0]->total_money}} | ||
@endslot | ||
@slot('total_play') | ||
{{$status[0]->total_play}} | ||
@endslot | ||
@slot('friend_code') | ||
{{$status[0]->friend_code}} | ||
@endslot | ||
@slot('comment') | ||
{!! nl2br(e($status[0]->comment)) !!} | ||
@endslot | ||
@endcomponent | ||
|
||
{{-- @component('layouts/components/user/song_filter') | ||
@endcomponent --}} | ||
|
||
@component('layouts/components/user/song_status_overdamage', ['score' => $scoreDatas, 'topRankerScore' => $topRankerScore, 'id' => $id]) | ||
@endcomponent | ||
|
||
@endsection |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters