From c616fb5b3300663fd8e80074d3bee699502a54d9 Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Thu, 17 Oct 2024 17:05:17 +0800
Subject: [PATCH] 1

---
 webapp/controller/CircuitController.class.php | 24 ++++++++++---------
 webapp/models/CircuitTask.php                 |  3 +++
 webapp/mt/CircuitTask.php                     |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/webapp/controller/CircuitController.class.php b/webapp/controller/CircuitController.class.php
index cc351ec7..da4b8dd7 100644
--- a/webapp/controller/CircuitController.class.php
+++ b/webapp/controller/CircuitController.class.php
@@ -37,17 +37,19 @@ class CircuitController extends  BaseAuthedController {
         $circuitCircuitMeta = mt\CircuitTime::getCurrentCircuit();
         $nextCircuitMeta = mt\CircuitTime::getNextCircuit();
         $taskList = array();
-        if (!$circuitCircuitMeta && $nextCircuitMeta){
-            $circuitCircuitMeta = $nextCircuitMeta;
-        }
-        $metas = \mt\CircuitTask::getListBySeason($circuitCircuitMeta['circuit_season']);
-        if (count($metas) > 0){
-            foreach ($metas as $meta){
-                array_push($taskList, array(
-                    'task_id' => $meta['id'],
-                    'current' => CircuitTask::getCurrentVal($circuitCircuitMeta['circuit_season'],$meta['type']),
-                    'target' => $meta['target'],
-                ));
+        if (!$circuitCircuitMeta &&
+            $nextCircuitMeta &&
+            myself()->_getNowTime() > strtotime($nextCircuitMeta['task_open_time'])
+        ){
+            $metas = \mt\CircuitTask::getListBySeason($nextCircuitMeta['circuit_season']);
+            if (count($metas) > 0){
+                foreach ($metas as $meta){
+                    array_push($taskList, array(
+                        'task_id' => $meta['id'],
+                        'current' => CircuitTask::getCurrentVal($nextCircuitMeta['circuit_season'],$meta['type']),
+                        'target' => $meta['target'],
+                    ));
+                }
             }
         }
         $this->_rspData(array('list' => $taskList));
diff --git a/webapp/models/CircuitTask.php b/webapp/models/CircuitTask.php
index 80d9b4de..24753429 100644
--- a/webapp/models/CircuitTask.php
+++ b/webapp/models/CircuitTask.php
@@ -26,6 +26,9 @@ class CircuitTask extends BaseModel
         if ($circuitCircuitMeta || !$nextCircuitMeta){
             return;
         }
+        if (myself()->_getNowTime() < strtotime($nextCircuitMeta['task_open_time'])){
+            return;
+        }
         $season = $nextCircuitMeta['circuit_season'];
         SqlHelper::upsert(
             myself()->_getSelfMysql(),
diff --git a/webapp/mt/CircuitTask.php b/webapp/mt/CircuitTask.php
index 1b547868..2f829c97 100644
--- a/webapp/mt/CircuitTask.php
+++ b/webapp/mt/CircuitTask.php
@@ -12,7 +12,7 @@ class CircuitTask {
     public static function getListBySeason($season){
         $metas = array();
         foreach (self::getMetaList() as $meta){
-            if ($meta['limit_type'] == $season){
+            if ($meta['season'] == $season){
                 array_push($metas,$meta);
             }
         }