This commit is contained in:
hujiabin 2024-10-17 17:05:17 +08:00
parent 4785e2831f
commit c616fb5b33
3 changed files with 17 additions and 12 deletions

View File

@ -37,19 +37,21 @@ class CircuitController extends BaseAuthedController {
$circuitCircuitMeta = mt\CircuitTime::getCurrentCircuit(); $circuitCircuitMeta = mt\CircuitTime::getCurrentCircuit();
$nextCircuitMeta = mt\CircuitTime::getNextCircuit(); $nextCircuitMeta = mt\CircuitTime::getNextCircuit();
$taskList = array(); $taskList = array();
if (!$circuitCircuitMeta && $nextCircuitMeta){ if (!$circuitCircuitMeta &&
$circuitCircuitMeta = $nextCircuitMeta; $nextCircuitMeta &&
} myself()->_getNowTime() > strtotime($nextCircuitMeta['task_open_time'])
$metas = \mt\CircuitTask::getListBySeason($circuitCircuitMeta['circuit_season']); ){
$metas = \mt\CircuitTask::getListBySeason($nextCircuitMeta['circuit_season']);
if (count($metas) > 0){ if (count($metas) > 0){
foreach ($metas as $meta){ foreach ($metas as $meta){
array_push($taskList, array( array_push($taskList, array(
'task_id' => $meta['id'], 'task_id' => $meta['id'],
'current' => CircuitTask::getCurrentVal($circuitCircuitMeta['circuit_season'],$meta['type']), 'current' => CircuitTask::getCurrentVal($nextCircuitMeta['circuit_season'],$meta['type']),
'target' => $meta['target'], 'target' => $meta['target'],
)); ));
} }
} }
}
$this->_rspData(array('list' => $taskList)); $this->_rspData(array('list' => $taskList));
} }

View File

@ -26,6 +26,9 @@ class CircuitTask extends BaseModel
if ($circuitCircuitMeta || !$nextCircuitMeta){ if ($circuitCircuitMeta || !$nextCircuitMeta){
return; return;
} }
if (myself()->_getNowTime() < strtotime($nextCircuitMeta['task_open_time'])){
return;
}
$season = $nextCircuitMeta['circuit_season']; $season = $nextCircuitMeta['circuit_season'];
SqlHelper::upsert( SqlHelper::upsert(
myself()->_getSelfMysql(), myself()->_getSelfMysql(),

View File

@ -12,7 +12,7 @@ class CircuitTask {
public static function getListBySeason($season){ public static function getListBySeason($season){
$metas = array(); $metas = array();
foreach (self::getMetaList() as $meta){ foreach (self::getMetaList() as $meta){
if ($meta['limit_type'] == $season){ if ($meta['season'] == $season){
array_push($metas,$meta); array_push($metas,$meta);
} }
} }