Merge branch 'master' of http://git.kingsome.cn/node/card_info_svr

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()]
     }
   }

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)
   }