1
This commit is contained in:
parent
4785e2831f
commit
c616fb5b33
@ -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));
|
||||
|
@ -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(),
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user