From 21ed09c4bdffc841f702b4fd613117d357d7e38e Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 5 Mar 2021 18:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=B1=80=E8=AF=B7=E6=B1=82=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=97=B6,=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=94=A8=E6=88=B7=E7=9A=8410=E5=9C=BA?=
 =?UTF-8?q?=E8=83=9C=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/AccountController.ts |  1 +
 src/models/User.ts                   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/controllers/AccountController.ts b/src/controllers/AccountController.ts
index 4dbff66..a518c20 100644
--- a/src/controllers/AccountController.ts
+++ b/src/controllers/AccountController.ts
@@ -62,6 +62,7 @@ export default class AccountController extends BaseController {
       nickname: account.nickname || DEFAULT_NICKNAME,
       avatar: account.avatar,
       score: account.season_score,
+      rate: account.getTenWinRate(),
       heros: [...account.heros.keys()]
     }
   }
diff --git a/src/models/User.ts b/src/models/User.ts
index 97e7460..06c30b0 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -130,10 +130,9 @@ class UserClass extends FindOrCreate {
   }
 
   /**
-   * 获取匹配分
-   * @return {number}
+   * 计算十场胜率
    */
-  public getMatchScore() {
+  public getTenWinRate() {
     //twp=ten_wp*ten_wn-ten_lp*ten_ln-ten_ap*ten_an
     const fc = global.$cfg.get(BaseConst.FORMULA)
     let smallTime = timeBeforeDay(30)
@@ -153,7 +152,15 @@ class UserClass extends FindOrCreate {
         lost++
       }
     }
-    let twp = win * fc.get(70016).number / 100 - lost * fc.get(70017).number / 100 - (10 - total) * fc.get(70018).number / 100
+    return win * fc.get(70016).number / 100 - lost * fc.get(70017).number / 100 - (10 - total) * fc.get(70018).number / 100
+  }
+  /**
+   * 获取匹配分
+   * @return {number}
+   */
+  public getMatchScore() {
+    const fc = global.$cfg.get(BaseConst.FORMULA)
+    let twp = this.getTenWinRate()
     // mp=bm_mp+cp*(bm_twp+twp)
     return fc.get(70021).number + this.season_score * (fc.get(70020).number / 100 + twp)
   }