From 980c3ea6d72dce2017e98f653672f1954f965ad0 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Tue, 25 Oct 2022 21:45:39 +0800
Subject: [PATCH] 1

---
 webapp/services/BattleDataService.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index e3f9c4b4..e2b20731 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -66,7 +66,6 @@ class BattleDataService extends BaseService {
     private $weapon1Dto = null;
     private $weapon2Dto = null;
     private $currSeasonMeta = null;
-    private $oldScore = null;
 
     private $reward = array(
         'hero' => array(
@@ -148,8 +147,8 @@ class BattleDataService extends BaseService {
             }
         }
 
-
-
+        //录入战斗记录
+        $this->saveBattleHistory();
 
         switch ($matchMode) {
         case self::MATCH_MODE_PVP:
@@ -185,12 +184,14 @@ class BattleDataService extends BaseService {
         }
         break;
         }
-        //录入战斗记录
-        $this->saveBattleHistory();
+
     }
 
     private function saveBattleHistory(){
         $user = myself()->_getOrmUserInfo();
+        $newRank = $user['rank'];
+        $newScore = FormulaService::calcBattleAfterRankScore($user,$_REQUEST); //赛后排位积分
+        mt\Rank::calcNewRankAndScore( $newRank, $newScore);
         $data = array(
             "battle_uniid" => getReqVal('battle_uuid', 0),
             "account_id" => myself()->_getAccountId(),
@@ -205,9 +206,9 @@ class BattleDataService extends BaseService {
             "weapon2" => getReqVal('weapon_uuid2', 0),
             "damage" => getReqVal('damage_out', 0),
             "battle_end_time" => myself()->_getNowTime(),
-            "current_level_class" => $user['rank'],
-            "current_level_class_score" => $user['score'],
-            "level_class_score_chg" => $user['score']-$this->oldScore,                             // 排位分改变
+            "current_level_class" => $newRank,
+            "current_level_class_score" => $newScore,
+            "level_class_score_chg" => $newScore-$user['score'],                             // 排位分改变
             "pve_rank_score" => getReqVal('pve_rank_score', 0),
             "pve_kill_boss" => getReqVal('pve_kill_boss', 0),
             "pve_instance_id" => getReqVal('pve_instance_id', 0),
@@ -457,7 +458,6 @@ class BattleDataService extends BaseService {
     private function updateScore()
     {
             $userInfo = myself()->_getOrmUserInfo();
-            $this->oldScore = $userInfo['score'];
             $newRank = $userInfo['rank'];
             $newScore = FormulaService::calcBattleAfterRankScore($userInfo,$_REQUEST); //赛后排位积分
             $newElo = FormulaService::calcUserEloValue($userInfo,$_REQUEST);           //赛后elo积分