Merge pull request #899 from project-primera/develop

slime-hatena · web-flow · commit 03ddfb697c0c · 2025-03-30T02:59:46.000+09:00
Release: 0.20.2
diff --git a/OngekiScoreLog/app/Http/Controllers/ViewUserController.php b/OngekiScoreLog/app/Http/Controllers/ViewUserController.php
@@ -166,12 +166,14 @@ public function getUserPage(Request $request, $id, $mode = null){
         foreach ($score as $key => $value) {
             // レート値を表示していいユーザーなら取得 だめなら隠す
             if(\App\UserInformation::IsPremiumPlan($user->id)){
-                $score[$key]->ratingValue = sprintf("%.3f", OngekiUtility::RateValueFromTitle($score[$key]->title, $score[$key]->difficulty, $score[$key]->technical_high_score, $score[$key]->lamp, $score[$key]->genre, $score[$key]->artist));
+                $score[$key]->ratingValue = sprintf("%.3f", OngekiUtility::RateValueFromTitle($score[$key]->title, $score[$key]->difficulty, $score[$key]->technical_high_score, $score[$key]->lampForRating, $score[$key]->genre, $score[$key]->artist));
                 $score[$key]->ratingValueRaw = $score[$key]->ratingValue;
                 if (OngekiUtility::IsEstimatedRateValueFromTitle($score[$key]->title, $score[$key]->difficulty, $score[$key]->genre, $score[$key]->artist)) {
                     $score[$key]->ratingValue = "<i><span class='estimated-rating'>" . $score[$key]->ratingValue . "</span></i>";
-                }else if($score[$key]->technical_high_score >= 1007500){
+                }elseif($score[$key]->technical_high_score == 1010000){
                     $score[$key]->ratingValue = "<i><span class='max-rating'>" . $score[$key]->ratingValue . "</span></i>";
+                }elseif($score[$key]->technical_high_score >= 1007500){
+                    $score[$key]->ratingValue = "<i><span class='upper-rating'>" . $score[$key]->ratingValue . "</span></i>";
                 }
             }else{
                 $score[$key]->ratingValue = "|||||||||";
diff --git a/OngekiScoreLog/app/Http/Controllers/ViewUserRatingController.php b/OngekiScoreLog/app/Http/Controllers/ViewUserRatingController.php
@@ -25,33 +25,33 @@ private function editMusic($scores, int $totalMusicCount){
         for ($index = 0; $index < count($scores); $index++) {
             if (isset($scores[$index])) {
                     // ランプ情報追加
-                $scores[$index]->lamp = "";
+                $scores[$index]->lampForRating = "";
                 if ($scores[$index]->technical_high_score == 1010000){
                     if ($scores[$index]->full_bell == 1) {
-                        $scores[$index]->lamp = "FB/AB+";
+                        $scores[$index]->lampForRating = "FB/AB+";
                     } else {
-                        $scores[$index]->lamp = "AB+";
+                        $scores[$index]->lampForRating = "AB+";
                     }
                 } elseif ($scores[$index]->all_break == 1) {
                     if ($scores[$index]->full_bell == 1) {
-                        $scores[$index]->lamp = "FB/AB";
+                        $scores[$index]->lampForRating = "FB/AB";
                     } else {
-                        $scores[$index]->lamp = "AB";
+                        $scores[$index]->lampForRating = "AB";
                     }
                 } elseif ($scores[$index]->full_combo == 1) {
                     if ($scores[$index]->full_bell == 1) {
-                        $scores[$index]->lamp = "FB/FC";
+                        $scores[$index]->lampForRating = "FB/FC";
                     } else {
-                        $scores[$index]->lamp = "FC";
+                        $scores[$index]->lampForRating = "FC";
                     }
                 } else {
                     if ($scores[$index]->full_bell == 1) {
-                        $scores[$index]->lamp = "FB";
+                        $scores[$index]->lampForRating = "FB";
                     }
                 }
 
                 // 単極レート値の取得
-                $scores[$index]->ratingValue = sprintf("%.2f", OngekiUtility::RateValueFromTitle($scores[$index]->title, $scores[$index]->difficulty, $scores[$index]->technical_high_score, $scores[$index]->lamp, $scores[$index]->genre, $scores[$index]->artist));
+                $scores[$index]->ratingValue = sprintf("%.3f", OngekiUtility::RateValueFromTitle($scores[$index]->title, $scores[$index]->difficulty, $scores[$index]->technical_high_score, $scores[$index]->lampForRating, $scores[$index]->genre, $scores[$index]->artist));
                 $scores[$index]->rawRatingValue = $scores[$index]->ratingValue;
 
                 // レート値上昇推定スコア計算
@@ -79,8 +79,10 @@ private function editMusic($scores, int $totalMusicCount){
                 if (OngekiUtility::IsEstimatedRateValueFromTitle($scores[$index]->title, $scores[$index]->difficulty, $scores[$index]->genre, $scores[$index]->artist)) {
                     $scores[$index]->extraLevelStr = "<i><span class='estimated-rating'>" . $scores[$index]->extraLevelStr . "?</span></i>";
                     $scores[$index]->ratingValue = "<i><span class='estimated-rating'>" . $scores[$index]->ratingValue . "</span></i>";
-                }else if($scores[$index]->technical_high_score >= 1007500){
+                }elseif($scores[$index]->technical_high_score == 1010000){
                     $scores[$index]->ratingValue = "<i><span class='max-rating'>" . $scores[$index]->ratingValue . "</span></i>";
+                }elseif($scores[$index]->technical_high_score >= 1007500){
+                    $scores[$index]->ratingValue = "<i><span class='upper-rating'>" . $scores[$index]->ratingValue . "</span></i>";
                 }
 
                 $scores[$index]->difficulty_str = $this->difficultyToStr[$scores[$index]->difficulty];
@@ -150,6 +152,7 @@ public function getIndex($id){
         $notExistMusic->ratingValue = "-";
         $notExistMusic->rawRatingValue = 0;
         $notExistMusic->lamp = "";
+        $notExistMusic->lampForRating = "";
         $notExistMusic->targetMusicRateMusic = "";
         $notExistMusic->targetMusicRateBorder = "";
         $notExistMusic->targetMusicRateUser = "";
@@ -249,6 +252,16 @@ public function getIndex($id){
                         if(is_null($statistics->platinumRatingMin) || $statistics->platinumRatingMin > $platinumMusic[$i]['rawRatingValue']){
                             $statistics->platinumRatingMin = $platinumMusic[$i]['rawRatingValue'];
                         }
+
+                        // レート値が理論値 / 推定値なら文字装飾
+                        if (OngekiUtility::IsEstimatedRateValueFromTitle($platinumMusic[$i]['title'], $platinumMusic[$i]['difficulty'], $platinumMusic[$i]['platinum_score'], $platinumMusic[$i]['star'], $platinumMusic[$i]['genre'], $platinumMusic[$i]['artist'])) {
+                            $platinumMusic[$i]['level_str'] = "<i><span class='estimated-rating'>" . $platinumMusic[$i]['level_str'] . "?</span></i>";
+                            $platinumMusic[$i]['ratingValue'] = "<i><span class='estimated-rating'>" . $platinumMusic[$i]['ratingValue'] . "</span></i>";
+                        } elseif ($platinumMusic[$i]['star'] >= 5){
+                            $platinumMusic[$i]['ratingValue'] = "<i><span class='max-rating'>" . $platinumMusic[$i]['ratingValue'] . "</span></i>";
+                        } elseif($platinumMusic[$i]['star'] >= 4){
+                            $platinumMusic[$i]['ratingValue'] = "<i><span class='upper-rating'>" . $platinumMusic[$i]['ratingValue'] . "</span></i>";
+                        }
                     } catch (\OutOfBoundsException $e) {
                         $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "N/A";
                         Slack::Notice("プラチナスコア枠に未知の楽曲が含まれているユーザーがいます。". $e->getMessage() . "\n" . get_class($e) . "\n" . url()->full(), "ip: " . \Request::ip() . "\nUser agent: " . $ua . "\nReferer: " . (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : "N/A") . "\n\n", ["File" => $e->getFile(), "Line" => $e->getLine(), "IP Address" => \Request::ip(), "User page id" => $user->id], "warning");
diff --git a/OngekiScoreLog/app/ScoreData.php b/OngekiScoreLog/app/ScoreData.php
@@ -69,28 +69,28 @@ function addMusicData(){
             }
 
             // レート計算用 ランプ処理
-            $this->value[$key]->lamp = "";
+            $this->value[$key]->lampForRating = "";
             if ($this->value[$key]->technical_high_score == 1010000){
                 if ($this->value[$key]->full_bell == 1) {
-                    $this->value[$key]->lamp = "FB/AB+";
+                    $this->value[$key]->lampForRating = "FB/AB+";
                 } else {
-                    $this->value[$key]->lamp = "AB+";
+                    $this->value[$key]->lampForRating = "AB+";
                 }
             } elseif ($this->value[$key]->all_break == 1) {
                 if ($this->value[$key]->full_bell == 1) {
-                    $this->value[$key]->lamp = "FB/AB";
+                    $this->value[$key]->lampForRating = "FB/AB";
                 } else {
-                    $this->value[$key]->lamp = "AB";
+                    $this->value[$key]->lampForRating = "AB";
                 }
             } elseif ($this->value[$key]->full_combo == 1) {
                 if ($this->value[$key]->full_bell == 1) {
-                    $this->value[$key]->lamp = "FB/FC";
+                    $this->value[$key]->lampForRating = "FB/FC";
                 } else {
-                    $this->value[$key]->lamp = "FC";
+                    $this->value[$key]->lampForRating = "FC";
                 }
             } else {
                 if ($this->value[$key]->full_bell == 1) {
-                    $this->value[$key]->lamp = "FB";
+                    $this->value[$key]->lampForRating = "FB";
                 }
             }
         }
diff --git a/OngekiScoreLog/app/Services/OngekiUtility.php b/OngekiScoreLog/app/Services/OngekiUtility.php
@@ -92,7 +92,7 @@ public function ExtraLevelFromTitle(string $title, $difficulty, $genre, $artist)
     }
 
     public function RateValueFromTitle(string $title, $difficulty,
-        int $technicalScore, string $lamp, $genre, $artist
+        int $technicalScore, string $lampForRating, $genre, $artist
     ) {
         if(is_int($difficulty)){
             $keys = [
@@ -124,7 +124,7 @@ public function RateValueFromTitle(string $title, $difficulty,
 
         $result = $this->calcRatingValue($this::$MusicList[$title][$difficulty], $technicalScore);
         $result += $this->calcRankRatingValue($technicalScore);
-        $result += $this->calcLampRatingValue($lamp);
+        $result += $this->calcLampRatingValue($lampForRating);
         return $result;
     }
 
@@ -163,21 +163,21 @@ private function calcRankRatingValue(int $technicalScore)
         return 0;
     }
 
-    private function calcLampRatingValue(string $lamp)
+    private function calcLampRatingValue(string $lampForRating)
     {
-        if ($lamp == "FB/AB+") {
+        if ($lampForRating == "FB/AB+") {
             return 0.4;
-        } elseif ($lamp == "AB+") {
+        } elseif ($lampForRating == "AB+") {
             return 0.35;
-        } elseif ($lamp == "FB/AB") {
+        } elseif ($lampForRating == "FB/AB") {
             return 0.35;
-        } elseif ($lamp == "AB") {
+        } elseif ($lampForRating == "AB") {
             return 0.3;
-        } elseif ($lamp == "FB/FC") {
+        } elseif ($lampForRating == "FB/FC") {
             return 0.15;
-        } elseif ($lamp == "FC") {
+        } elseif ($lampForRating == "FC") {
             return 0.1;
-        } elseif ($lamp == "FB") {
+        } elseif ($lampForRating == "FB") {
             return 0.05;
         }
         return 0;
@@ -223,8 +223,10 @@ public function RateValueFromTitleForPlatinum(string $title, $difficulty, int $p
 
     private function calcPlatinumRatingValue(float $extraLevel, int $platinumScore, int $starCount)
     {
-        // 本当に何もわからない
-        return 0;
+        if($starCount > 5){
+            $starCount = 5;
+        }
+        return $extraLevel * $extraLevel * $starCount / 1000;
     }
 
     /**
diff --git a/OngekiScoreLog/resources/assets/js/bookmarklets/getScore.ts b/OngekiScoreLog/resources/assets/js/bookmarklets/getScore.ts
@@ -223,8 +223,13 @@ import * as qs from 'qs';
                 artist = artist.substring(0, artist.indexOf('\n'));
                 console.log(artist);
             }
+
             let platinumScore = +$($(element).find(".platinum_high_score_text_block")).text().replace(/,/g, "").split("/")[0];
             let star = +($($(element).find(".platinum_high_score_star_block").find(".f_b")).text());
+            let isAb = ($(element).find("[src*='music_icon_fc.png']").length > 0 || $(element).find("[src*='music_icon_ab.png']").length > 0
+                || $(element).find("[src*='music_icon_fc.png']").length > 0 || $(element).find("[src*='music_icon_abplus.png']").length > 0);
+            let isFc = (isAb || $(element).find("[src*='music_icon_fc.png']").length > 0 || $(element).find("[src*='music_icon_fc.png']").length > 0);
+
             let song = new SongInfo(
                 name,
                 difficulty,
@@ -234,8 +239,8 @@ import * as qs from 'qs';
                 +$($(element).find(".score_value")[1]).text().replace(/,/g, ""),
                 +$($(element).find(".score_value")[2]).text().replace(/,/g, ""),
                 $(element).find("[src*='music_icon_fb.png']").length > 0,
-                $(element).find("[src*='music_icon_fc.png']").length > 0 || $(element).find("[src*='music_icon_ab.png']").length > 0,
-                $(element).find("[src*='music_icon_ab.png']").length > 0,
+                isFc,
+                isAb,
                 artist,
                 platinumScore,
                 star,
diff --git a/OngekiScoreLog/resources/assets/sass/style.scss b/OngekiScoreLog/resources/assets/sass/style.scss
@@ -171,6 +171,10 @@ div.column{
     color: #a00;
 }
 
+.upper-rating{
+    font-weight: bold;
+}
+
 .lamp{
     $fb: #c1b400;
     $fc: #2b922d;
diff --git a/OngekiScoreLog/resources/views/layouts/components/user_rating/rating_best_table.blade.php b/OngekiScoreLog/resources/views/layouts/components/user_rating/rating_best_table.blade.php
@@ -35,7 +35,7 @@
                     <td>{{substr($array[$i]->difficulty_str, 0, 3)}}</td>
                     <td>{!!$array[$i]->extraLevelStr!!}</td>
                     <td>{{number_format($array[$i]->technical_high_score)}}</td>
-                    <td>{{ $array[$i]->lamp }}</td>
+                    <td>{{ $array[$i]->lampForRating }}</td>
                     <td>{!!$array[$i]->ratingValue!!}</td>
                 </tr>
             @endfor
@@ -90,7 +90,7 @@
                             <td>{{substr($array[$i]->difficulty_str, 0, 3)}}</td>
                             <td>{!!$array[$i]->extraLevelStr!!}</td>
                             <td>{{number_format($array[$i]->technical_high_score)}}</td>
-                            <td>{{$array[$i]->lamp}}</td>
+                            <td>{{$array[$i]->lampForRating}}</td>
                             <td>{!!$array[$i]->ratingValue!!}</td>
                             <td>{{sprintf("%.3f", $array[$i]->minDifferenceRate)}}</td>
                             <td>{{$array[$i]->minDifferenceScore}}</td>
diff --git a/OngekiScoreLog/resources/views/user_rating.blade.php b/OngekiScoreLog/resources/views/user_rating.blade.php
@@ -26,7 +26,6 @@
 @section('content')
     <article id="rating_statistics" class="box">
         <h3 class="title is-3">レーティング対象曲の統計</h3>
-        <p style="font-size: 1.2em;">レーティング計算式は調査中のため、<b>この画面の情報はすべて間違っています！！</b></p>
         <p>
             ■統計&nbsp;/&nbsp;<a data-scroll href="#rating_new">▼新曲枠</a>&nbsp;/&nbsp;<a data-scroll href="#rating_old">▼ベスト枠</a>&nbsp;/&nbsp;<a data-scroll href="#rating_platinum">▼プラチナスコア枠</a>
         </p>

Original file line number	Diff line number	Diff line change
`@@ -69,28 +69,28 @@ function addMusicData(){`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// レート計算用ランプ処理`
`72`		`- $this->value[$key]->lamp = "";`
	`72`	`+ $this->value[$key]->lampForRating = "";`
`73`	`73`	`if ($this->value[$key]->technical_high_score == 1010000){`
`74`	`74`	`if ($this->value[$key]->full_bell == 1) {`
`75`		`- $this->value[$key]->lamp = "FB/AB+";`
	`75`	`+ $this->value[$key]->lampForRating = "FB/AB+";`
`76`	`76`	`} else {`
`77`		`- $this->value[$key]->lamp = "AB+";`
	`77`	`+ $this->value[$key]->lampForRating = "AB+";`
`78`	`78`	`}`
`79`	`79`	`} elseif ($this->value[$key]->all_break == 1) {`
`80`	`80`	`if ($this->value[$key]->full_bell == 1) {`
`81`		`- $this->value[$key]->lamp = "FB/AB";`
	`81`	`+ $this->value[$key]->lampForRating = "FB/AB";`
`82`	`82`	`} else {`
`83`		`- $this->value[$key]->lamp = "AB";`
	`83`	`+ $this->value[$key]->lampForRating = "AB";`
`84`	`84`	`}`
`85`	`85`	`} elseif ($this->value[$key]->full_combo == 1) {`
`86`	`86`	`if ($this->value[$key]->full_bell == 1) {`
`87`		`- $this->value[$key]->lamp = "FB/FC";`
	`87`	`+ $this->value[$key]->lampForRating = "FB/FC";`
`88`	`88`	`} else {`
`89`		`- $this->value[$key]->lamp = "FC";`
	`89`	`+ $this->value[$key]->lampForRating = "FC";`
`90`	`90`	`}`
`91`	`91`	`} else {`
`92`	`92`	`if ($this->value[$key]->full_bell == 1) {`
`93`		`- $this->value[$key]->lamp = "FB";`
	`93`	`+ $this->value[$key]->lampForRating = "FB";`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`