From 1fca42b393fdaeb572b48b42499aea62a523d56f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 5 Nov 2024 16:53:46 +0800
Subject: [PATCH] 1

---
 webapp/controller/BattleController.class.php |  1 +
 webapp/mt/CircuitTime.php                    | 10 ++++++++++
 webapp/services/RoomBattleDataService.php    |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php
index 31ee7993..480d650f 100644
--- a/webapp/controller/BattleController.class.php
+++ b/webapp/controller/BattleController.class.php
@@ -767,6 +767,7 @@ class BattleController extends BaseAuthedController {
 
     public function getNormalBattleData()
     {
+        error_log(json_encode($_REQUEST));
         $version = getReqVal('version', 0);
         $ignoreAndroid = false;
         if ($version < 1) {
diff --git a/webapp/mt/CircuitTime.php b/webapp/mt/CircuitTime.php
index 03b515c7..2a90ec5d 100644
--- a/webapp/mt/CircuitTime.php
+++ b/webapp/mt/CircuitTime.php
@@ -49,6 +49,16 @@ class CircuitTime {
         return null;
     }
 
+    public static function getCurrentBattleStage(){
+        foreach (self::getCircuitAll(self::STAGE_SEASON_TYPE) as $meta){
+            if (myself()->_getNowTime() >= strtotime($meta['start_time']) &&
+                myself()->_getNowTime() <= strtotime($meta['end_time']) + 60 * 30) {
+                return $meta;
+            }
+        }
+        return null;
+    }
+
     public static function getNextStage($season){
         $next = array();
         foreach (self::getListBySeason($season) as $meta){
diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index 4c28554f..209ad075 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -133,7 +133,7 @@ class RoomBattleDataService extends BaseService {
                     //巡回模式排位分计算
                     if ($this->mapMode == mt\MapMode::CIRCUIT_MODE){
                         $circuitMeta = mt\CircuitTime::getCurrentCircuit();
-                        $circuitStageMeta = mt\CircuitTime::getCurrentStage();
+                        $circuitStageMeta = mt\CircuitTime::getCurrentBattleStage();
                         if ($circuitMeta && $circuitStageMeta){
                             $minScore = mt\Parameter::getVal('circuit_rank_score_min',0);
                             $multConstant = mt\Parameter::getVal('circuit_score_mult_constant',1);