From b1b9cf2cc147b1e7b64e5a8ac281f95f673e0f94 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 19 Sep 2022 21:35:46 +0800
Subject: [PATCH] 1

---
 webapp/services/BattleDataService.php |  8 ++++----
 webapp/services/FormulaService.php    | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 826fa1b0..da25bd42 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -578,10 +578,10 @@ class BattleDataService extends BaseService {
             $ranked = getReqVal('ranked', 0);
             $kills = getReqVal('kills', 0);
             $aliveTime = getReqVal('alive_time', 0);
-            $cond = (1 - ($ranked > 30 ? 1 : 0)) *
-                  ($kills > 1 ? 1 : 0) *
-                  ($aliveTime > 30 ? 1 : 0);
-            if ($cond) {
+            $cond = (1 - ($ranked >= 30 ? 1 : 0)) *
+                  ($kills >= 1 ? 1 : 0) *
+                  ($aliveTime >= 30 ? 1 : 0);
+            if (!$cond) {
                 return;
             }
         }
diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index 71e91332..f93648ab 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -37,9 +37,9 @@ class FormulaService extends BaseService {
                  (0.5 * $weaponTopX * $meta['weapon_topx']) +
                  (0.5 * $survivalTopX * $meta['survival_topx'])
              ) *
-             (1 - ($ranked > 30 ? 1 : 0)) *
-             ($kills > 1 ? 1 : 0) *
-             ($aliveTime > 30 ? 1 : 0);
+             (1 - ($ranked >= 30 ? 1 : 0)) *
+             ($kills >= 1 ? 1 : 0) *
+             ($aliveTime >= 30 ? 1 : 0);
         return round($ceg);
     }
 
@@ -77,9 +77,9 @@ class FormulaService extends BaseService {
                  (0.5 * $weaponTopX * $meta['weapon_topx']) +
                  (0.5 * $survivalTopX * $meta['survival_topx'])
              ) *
-             (1 - ($ranked > 30 ? 1 : 0)) *
-             ($kills > 1 ? 1 : 0) *
-             ($aliveTime > 30 ? 1 : 0);
+             (1 - ($ranked >= 30 ? 1 : 0)) *
+             ($kills >= 1 ? 1 : 0) *
+             ($aliveTime >= 30 ? 1 : 0);
         return round($ceg);
     }