From 53ed29ea5faa32a92cb8cacf898368ce6fe8f330 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Wed, 26 Oct 2022 11:36:46 +0800
Subject: [PATCH] 1

---
 webapp/controller/BattleController.class.php | 3 ++-
 webapp/services/BattleDataService.php        | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php
index 86e900a9..ef146ba5 100644
--- a/webapp/controller/BattleController.class.php
+++ b/webapp/controller/BattleController.class.php
@@ -6,6 +6,7 @@ require_once('models/Chip.php');
 require_once('models/BattleHistory.php');
 require_once('services/BattleDataService.php');
 require_once('services/FormulaService.php');
+require_once('mt/RankSeason.php');
 
 use phpcommon\SqlHelper;
 use models\Hero;
@@ -44,7 +45,7 @@ class BattleController extends BaseAuthedController {
         $data = array(
             'reward' => $battleDataService->getReward()
         );
-        if (getReqVal('match_mode', 0) == services\BattleDataService::MATCH_MODE_MATCH){
+        if (getReqVal('match_mode', 0) == services\BattleDataService::MATCH_MODE_PVP && mt\RankSeason::getCurrentSeason()){
             $newRank = $userInfo['rank'];
             $newScore = \services\FormulaService::calcBattleAfterRankScore($userInfo,$_REQUEST);
             mt\Rank::calcNewRankAndScore( $newRank, $newScore);
diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index e2b20731..07e64aa1 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -147,8 +147,7 @@ class BattleDataService extends BaseService {
             }
         }
 
-        //录入战斗记录
-        $this->saveBattleHistory();
+
 
         switch ($matchMode) {
         case self::MATCH_MODE_PVP:
@@ -184,7 +183,8 @@ class BattleDataService extends BaseService {
         }
         break;
         }
-
+        //录入战斗记录
+        $this->saveBattleHistory();
     }
 
     private function saveBattleHistory(){