Merge pull request #907 from project-primera/fix/rating-calc

レーティング計算の不具合を修正

Author: slime-hatena

OngekiScoreLog/app/Http/Controllers/ViewUserRatingController.php

@@ -254,7 +254,7 @@ public function getIndex($id){
                         }
 
                         // レート値が理論値 / 推定値なら文字装飾
-                        if (OngekiUtility::IsEstimatedRateValueFromTitle($platinumMusic[$i]['title'], $platinumMusic[$i]['difficulty'], $platinumMusic[$i]['platinum_score'], $platinumMusic[$i]['star'], $platinumMusic[$i]['genre'], $platinumMusic[$i]['artist'])) {
+                        if (OngekiUtility::IsEstimatedRateValueFromTitle($platinumMusic[$i]['title'], $platinumMusic[$i]['difficulty'], $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){

OngekiScoreLog/app/Services/OngekiUtility.php

@@ -122,9 +122,12 @@ public function RateValueFromTitle(string $title, $difficulty,
             return 0;
         }
 
-        $result = $this->calcRatingValue($this::$MusicList[$title][$difficulty], $technicalScore);
-        $result += $this->calcRankRatingValue($technicalScore);
-        $result += $this->calcLampRatingValue($lampForRating);
+        $result = 0;
+        if($this::$MusicList[$title][$difficulty] != 0){
+            $result += $this->calcRatingValue($this::$MusicList[$title][$difficulty], $technicalScore);
+            $result += $this->calcRankRatingValue($technicalScore);
+            $result += $this->calcLampRatingValue($lampForRating);
+        }
         return $result;
     }
 
@@ -141,13 +144,15 @@ private function calcRatingValue(float $extraLevel, int $technicalScore)
         }elseif($technicalScore >= 1000000){ // SSS: 1.25 / 15点ごとに+0.001
             $result = $extra + 1250 + (floor(($technicalScore - 1000000) / 15));
         }elseif($technicalScore >= 990000){ // SS: 0.75 / 40点ごとに+0.001
-            $result = $extra + 750 + (floor(($technicalScore - 990000) / 400));
+            $result = $extra + 750 + (floor(($technicalScore - 990000) / 40));
         }elseif($technicalScore >= 970000){ // S: 0.00 / 26点ごとに+0.001
             $result = $extra + (floor(($technicalScore - 970000) / 26.666));
         }else{ // それ以下: -18点ごとに-0.001
-            // S未満の場合: 970000点以下では18点ごとに-0.001
             $result = $extra - (floor((970000 - $technicalScore) / 18));
         }
+        if($result < 0 ){
+            $result = 0;
+        }
         return $result / 1000;
     }
 

OngekiScoreLog/resources/views/user_rating.blade.php

@@ -139,7 +139,7 @@
                         <th>Title</th>
                         <th><abbr title="Difficulty">Dif</abbr></th>
                         <th>Lv</th>
-                        <th><abbr title="Technical Score">TS</abbr></th>
+                        <th><abbr title="Platinum Score">PS</abbr></th>
                         <th>☆</th>
                         <th>Rate</th>
                     </tr>
@@ -164,7 +164,7 @@
             </table>
         </div>
     </article>
-    <article id="rating_platinum" class="box">
+    <!-- <article id="rating_platinum" class="box">
     <h3 class="title is-3">レーティング計算式</h3>
     <h4>新曲枠 / ベスト枠</h4>
     <p>
@@ -174,5 +174,5 @@
     <p>
 
     </p>
-    </article>
+    </article> -->
 @endsection