Merge pull request #927 from WorldRobertProject/PlatinumScoreProgress

更新差分にプラチナスコアの情報を追加

Author: slime-hatena

OngekiScoreLog/app/Http/Controllers/ViewUserProgressController.php

@@ -58,13 +58,13 @@ function shapingKeys($array){
 
         $filter = "";
         if($request->filter === "bs"){
-            $filter = "Battle Scoreのみ表示中";
+            $filter = "Battle Scoreの更新を表示中";
         }
         if($request->filter === "ts"){
-            $filter = "Technical Scoreのみ表示中";
+            $filter = "レーティング関連（Technical Score, Platinum Score, クリアランプ）の更新を表示中";
         }
         if($request->filter === "od"){
-            $filter = "Over Damageのみ表示中";
+            $filter = "Over Damageの更新を表示中";
         }
 
         $version = (new ApplicationVersion())->getLatestVersion();
@@ -95,53 +95,63 @@ function shapingKeys($array){
                 'Basic' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
                 'Advanced' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
                 'Expert' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
                 'Master' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
                 'Lunatic' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
             ],
             'old' =>[
                 'Basic' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
                 'Advanced' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
                 'Expert' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
                 'Master' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
                 'Lunatic' => [
                     'battle_high_score' => 0,
                     'technical_high_score' => 0,
+                    'platinum_score' => 0,
                     'over_damage_high_score' => 0,
                 ],
             ]
@@ -192,6 +202,7 @@ function shapingKeys($array){
             foreach ($temp as $difficulty => $value) {
                 $score['new'][$difficultyToStr[$difficulty]]['battle_high_score'] += $value->battle_high_score;
                 $score['new'][$difficultyToStr[$difficulty]]['technical_high_score'] += $value->technical_high_score;
+                $score['new'][$difficultyToStr[$difficulty]]['platinum_score'] += $value->platinum_score;
                 $score['new'][$difficultyToStr[$difficulty]]['over_damage_high_score'] += $value->over_damage_high_score;
 
                 if(!array_key_exists($music, $old) || !array_key_exists($difficulty, $old[$music])){
@@ -201,6 +212,7 @@ function shapingKeys($array){
                         $progress[$music][$difficulty]["new"] = $value;
                         $progress[$music][$difficulty]["difference"]['battle_high_score'] = "+" . number_format($value->battle_high_score);
                         $progress[$music][$difficulty]["difference"]['technical_high_score'] = "+" . number_format($value->technical_high_score);
+                        $progress[$music][$difficulty]["difference"]['platinum_score'] = "+" . number_format($value->platinum_score);
                         $progress[$music][$difficulty]["difference"]['over_damage_high_score'] = "+" . ($value->over_damage_high_score) . "%";
                         $progress[$music][$difficulty]["difference"]['technical_high_score_rank'] = "N" . " → " . $value->technical_high_score_rank;
                         $progress[$music][$difficulty]["difference"]['is_update_technical_high_score_rank'] = "update";
@@ -218,11 +230,13 @@ function shapingKeys($array){
                 }else{
                     $score['old'][$difficultyToStr[$difficulty]]['battle_high_score'] += $old[$music][$difficulty]->battle_high_score;
                     $score['old'][$difficultyToStr[$difficulty]]['technical_high_score'] += $old[$music][$difficulty]->technical_high_score;
+                    $score['old'][$difficultyToStr[$difficulty]]['platinum_score'] += $old[$music][$difficulty]->platinum_score;
                     $score['old'][$difficultyToStr[$difficulty]]['over_damage_high_score'] +=  $old[$music][$difficulty]->over_damage_high_score;
 
                     if($old[$music][$difficulty]->over_damage_high_score < $value->over_damage_high_score
                     || $old[$music][$difficulty]->battle_high_score < $value->battle_high_score
                     || $old[$music][$difficulty]->technical_high_score < $value->technical_high_score
+                    || $old[$music][$difficulty]->platinum_score < $value->platinum_score
                     || $old[$music][$difficulty]->full_bell < $value->full_bell
                     || $old[$music][$difficulty]->full_combo < $value->full_combo
                     || $old[$music][$difficulty]->all_break < $value->all_break){
@@ -232,6 +246,7 @@ function shapingKeys($array){
                             $progress[$music][$difficulty]["new"] = $value;
                             $progress[$music][$difficulty]["difference"]['battle_high_score'] = "+" . number_format($value->battle_high_score);
                             $progress[$music][$difficulty]["difference"]['technical_high_score'] = "+" . number_format($value->technical_high_score);
+                            $progress[$music][$difficulty]["difference"]['platinum_score'] = "+" . number_format($value->platinum_score);
                             $progress[$music][$difficulty]["difference"]['over_damage_high_score'] = "+" . ($value->over_damage_high_score) . "%";
                             $progress[$music][$difficulty]["difference"]['technical_high_score_rank'] = "N" . " → " . $value->technical_high_score_rank;
                             $progress[$music][$difficulty]["difference"]['is_update_technical_high_score_rank'] = "update";
@@ -255,7 +270,11 @@ function shapingKeys($array){
                                 }
                             }
                             if($request->filter === "ts"){
-                                if($old[$music][$difficulty]->technical_high_score >= $value->technical_high_score){
+                                if($old[$music][$difficulty]->technical_high_score >= $value->technical_high_score
+                                && $old[$music][$difficulty]->platinum_score >= $value->platinum_score
+                                && $old[$music][$difficulty]->full_bell >= $value->full_bell
+                                && $old[$music][$difficulty]->full_combo >= $value->full_combo
+                                && $old[$music][$difficulty]->all_break >= $value->all_break){
                                     continue;
                                 }
                             }
@@ -267,6 +286,7 @@ function shapingKeys($array){
 
                             $progress[$music][$difficulty]["difference"]['battle_high_score'] = ($value->battle_high_score - $old[$music][$difficulty]->battle_high_score) != 0 ? "+" . number_format($value->battle_high_score - $old[$music][$difficulty]->battle_high_score) : "";
                             $progress[$music][$difficulty]["difference"]['technical_high_score'] = ($value->technical_high_score - $old[$music][$difficulty]->technical_high_score) != 0 ? "+" . number_format($value->technical_high_score - $old[$music][$difficulty]->technical_high_score) : "";
+                            $progress[$music][$difficulty]["difference"]['platinum_score'] = ($value->platinum_score - $old[$music][$difficulty]->platinum_score) != 0 ? "+" . number_format($value->platinum_score - $old[$music][$difficulty]->platinum_score) : "";
                             $progress[$music][$difficulty]["difference"]['over_damage_high_score'] = ($value->over_damage_high_score - $old[$music][$difficulty]->over_damage_high_score) != 0 ? "+" . ($value->over_damage_high_score - $old[$music][$difficulty]->over_damage_high_score) . "%" : "";
                             $progress[$music][$difficulty]["difference"]['technical_high_score_rank'] = $old[$music][$difficulty]->technical_high_score_rank . " → " . $value->technical_high_score_rank;
                             $progress[$music][$difficulty]["difference"]['is_update_technical_high_score_rank'] = ($old[$music][$difficulty]->technical_high_score_rank != $value->technical_high_score_rank) ? "update" : "";
@@ -288,41 +308,49 @@ function shapingKeys($array){
         }
         $score['new']['Total']['battle_high_score'] = $score['new']['Basic']['battle_high_score'] + $score['new']['Advanced']['battle_high_score'] + $score['new']['Expert']['battle_high_score'] + $score['new']['Master']['battle_high_score'] + $score['new']['Lunatic']['battle_high_score'];
         $score['new']['Total']['technical_high_score'] = $score['new']['Basic']['technical_high_score'] + $score['new']['Advanced']['technical_high_score'] + $score['new']['Expert']['technical_high_score'] + $score['new']['Master']['technical_high_score'] + $score['new']['Lunatic']['technical_high_score'];
+        $score['new']['Total']['platinum_score'] = $score['new']['Basic']['platinum_score'] + $score['new']['Advanced']['platinum_score'] + $score['new']['Expert']['platinum_score'] + $score['new']['Master']['platinum_score'] + $score['new']['Lunatic']['platinum_score'];
         $score['new']['Total']['over_damage_high_score'] = $score['new']['Basic']['over_damage_high_score'] + $score['new']['Advanced']['over_damage_high_score'] + $score['new']['Expert']['over_damage_high_score'] + $score['new']['Master']['over_damage_high_score'] + $score['new']['Lunatic']['over_damage_high_score'];
 
         $score['old']['Total']['battle_high_score'] = $score['old']['Basic']['battle_high_score'] + $score['old']['Advanced']['battle_high_score'] + $score['old']['Expert']['battle_high_score'] + $score['old']['Master']['battle_high_score'] + $score['old']['Lunatic']['battle_high_score'];
         $score['old']['Total']['technical_high_score'] = $score['old']['Basic']['technical_high_score'] + $score['old']['Advanced']['technical_high_score'] + $score['old']['Expert']['technical_high_score'] + $score['old']['Master']['technical_high_score'] + $score['old']['Lunatic']['technical_high_score'];
+        $score['old']['Total']['platinum_score'] = $score['old']['Basic']['platinum_score'] + $score['old']['Advanced']['platinum_score'] + $score['old']['Expert']['platinum_score'] + $score['old']['Master']['platinum_score'] + $score['old']['Lunatic']['platinum_score'];
         $score['old']['Total']['over_damage_high_score'] = $score['old']['Basic']['over_damage_high_score'] + $score['old']['Advanced']['over_damage_high_score'] + $score['old']['Expert']['over_damage_high_score'] + $score['old']['Master']['over_damage_high_score'] + $score['old']['Lunatic']['over_damage_high_score'];
 
         $score['difference'] = [
             'Total' => [
                 'battle_high_score' => $score['new']['Total']['battle_high_score'] - $score['old']['Total']['battle_high_score'],
                 'technical_high_score' => $score['new']['Total']['technical_high_score'] - $score['old']['Total']['technical_high_score'],
+                'platinum_score' => $score['new']['Total']['platinum_score'] - $score['old']['Total']['platinum_score'],
                 'over_damage_high_score' => $score['new']['Total']['over_damage_high_score'] - $score['old']['Total']['over_damage_high_score'],
             ],
             'Basic' => [
                 'battle_high_score' => $score['new']['Basic']['battle_high_score'] - $score['old']['Basic']['battle_high_score'],
                 'technical_high_score' => $score['new']['Basic']['technical_high_score'] - $score['old']['Basic']['technical_high_score'],
+                'platinum_score' => $score['new']['Basic']['platinum_score'] - $score['old']['Basic']['platinum_score'],
                 'over_damage_high_score' => $score['new']['Basic']['over_damage_high_score'] - $score['old']['Basic']['over_damage_high_score'],
             ],
             'Advanced' => [
                 'battle_high_score' => $score['new']['Advanced']['battle_high_score'] - $score['old']['Advanced']['battle_high_score'],
                 'technical_high_score' => $score['new']['Advanced']['technical_high_score'] - $score['old']['Advanced']['technical_high_score'],
+                'platinum_score' => $score['new']['Advanced']['platinum_score'] - $score['old']['Advanced']['platinum_score'],
                 'over_damage_high_score' => $score['new']['Advanced']['over_damage_high_score'] - $score['old']['Advanced']['over_damage_high_score'],
             ],
             'Expert' => [
                 'battle_high_score' => $score['new']['Expert']['battle_high_score'] - $score['old']['Expert']['battle_high_score'],
                 'technical_high_score' => $score['new']['Expert']['technical_high_score'] - $score['old']['Expert']['technical_high_score'],
+                'platinum_score' => $score['new']['Expert']['platinum_score'] - $score['old']['Expert']['platinum_score'],
                 'over_damage_high_score' => $score['new']['Expert']['over_damage_high_score'] - $score['old']['Expert']['over_damage_high_score'],
             ],
             'Master' => [
                 'battle_high_score' => $score['new']['Master']['battle_high_score'] - $score['old']['Master']['battle_high_score'],
                 'technical_high_score' => $score['new']['Master']['technical_high_score'] - $score['old']['Master']['technical_high_score'],
+                'platinum_score' => $score['new']['Master']['platinum_score'] - $score['old']['Master']['platinum_score'],
                 'over_damage_high_score' => $score['new']['Master']['over_damage_high_score'] - $score['old']['Master']['over_damage_high_score'],
             ],
             'Lunatic' => [
                 'battle_high_score' => $score['new']['Lunatic']['battle_high_score'] - $score['old']['Lunatic']['battle_high_score'],
                 'technical_high_score' => $score['new']['Lunatic']['technical_high_score'] - $score['old']['Lunatic']['technical_high_score'],
+                'platinum_score' => $score['new']['Lunatic']['platinum_score'] - $score['old']['Lunatic']['platinum_score'],
                 'over_damage_high_score' => $score['new']['Lunatic']['over_damage_high_score'] - $score['old']['Lunatic']['over_damage_high_score'],
             ]
         ];

OngekiScoreLog/resources/assets/sass/_user_progress.scss

@@ -95,7 +95,9 @@
                         color: #d22;
                     }
                     display: inline-block;
-                    padding-left: 2em;
+                    padding-left: 1em;
+                    width: 10em;
+                    text-align: center;
                 }
             }
         }