1
This commit is contained in:
parent
3512e670f0
commit
e3ba6fe330
@ -81,6 +81,7 @@ class Other(object):
|
|||||||
_common.RspHead(),
|
_common.RspHead(),
|
||||||
['!mode_list', [
|
['!mode_list', [
|
||||||
['id',0,'mapMode配置id'],
|
['id',0,'mapMode配置id'],
|
||||||
|
['task_state',0,'巡回赛状态 0:未开 1:已开,id=7(巡回模式)才有'],
|
||||||
['stage_state',0,'阶段开始状态 0:未开 1:已开,id=7(巡回模式)才有'],
|
['stage_state',0,'阶段开始状态 0:未开 1:已开,id=7(巡回模式)才有'],
|
||||||
['next_star_time',0,'下个阶段开始时间,id=7(巡回模式)才有'],
|
['next_star_time',0,'下个阶段开始时间,id=7(巡回模式)才有'],
|
||||||
['next_end_time',0,'下个阶段结束时间,id=7(巡回模式)才有'],
|
['next_end_time',0,'下个阶段结束时间,id=7(巡回模式)才有'],
|
||||||
|
@ -28,7 +28,9 @@ require_once('models/Hero.php');
|
|||||||
require_once('models/HeroSkin.php');
|
require_once('models/HeroSkin.php');
|
||||||
require_once('models/Chip.php');
|
require_once('models/Chip.php');
|
||||||
require_once('models/Bag.php');
|
require_once('models/Bag.php');
|
||||||
|
require_once('models/CircuitTask.php');
|
||||||
|
|
||||||
|
use models\CircuitTask;
|
||||||
use models\SignLog;
|
use models\SignLog;
|
||||||
use phpcommon\SqlHelper;
|
use phpcommon\SqlHelper;
|
||||||
use models\RankingSetRecord;
|
use models\RankingSetRecord;
|
||||||
@ -414,6 +416,15 @@ class OtherController extends BaseAuthedController {
|
|||||||
$temp['next_star_time'] = strtotime($nextStageMeta['start_time']);
|
$temp['next_star_time'] = strtotime($nextStageMeta['start_time']);
|
||||||
$temp['next_end_time'] = strtotime($nextStageMeta['end_time']);
|
$temp['next_end_time'] = strtotime($nextStageMeta['end_time']);
|
||||||
}
|
}
|
||||||
|
if (myself()->_switchIsOpen('circuitTask')){
|
||||||
|
if (CircuitTask::_verifyCondition($circuitTimeMeta['circuit_season'])){
|
||||||
|
$temp['task_state'] = 1;
|
||||||
|
}else{
|
||||||
|
$temp['task_state'] = 0;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
$temp['task_state'] = 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@ require_once('models/HashRate.php');
|
|||||||
require_once('models/Season.php');
|
require_once('models/Season.php');
|
||||||
require_once('models/TicketConsumeRecord.php');
|
require_once('models/TicketConsumeRecord.php');
|
||||||
require_once('models/Circuit.php');
|
require_once('models/Circuit.php');
|
||||||
require_once('models/CircuitTask.php');
|
|
||||||
|
|
||||||
require_once('mt/MapMode.php');
|
require_once('mt/MapMode.php');
|
||||||
require_once('mt/Rank.php');
|
require_once('mt/Rank.php');
|
||||||
@ -25,7 +24,6 @@ require_once('services/BattleBoxService.php');
|
|||||||
require_once('phpcommon/tglog.php');
|
require_once('phpcommon/tglog.php');
|
||||||
|
|
||||||
use models\Circuit;
|
use models\Circuit;
|
||||||
use models\CircuitTask;
|
|
||||||
use models\TicketConsumeRecord;
|
use models\TicketConsumeRecord;
|
||||||
use mt;
|
use mt;
|
||||||
use services;
|
use services;
|
||||||
@ -135,7 +133,7 @@ class RoomBattleDataService extends BaseService {
|
|||||||
//巡回模式排位分计算
|
//巡回模式排位分计算
|
||||||
if ($this->mapMode == mt\MapMode::CIRCUIT_MODE){
|
if ($this->mapMode == mt\MapMode::CIRCUIT_MODE){
|
||||||
$circuitMeta = mt\CircuitTime::getCurrentCircuit();
|
$circuitMeta = mt\CircuitTime::getCurrentCircuit();
|
||||||
if ($circuitMeta && CircuitTask::_verifyCondition($circuitMeta['circuit_season'])){
|
if ($circuitMeta ){
|
||||||
$minScore = mt\Parameter::getVal('circuit_rank_score_min',0);
|
$minScore = mt\Parameter::getVal('circuit_rank_score_min',0);
|
||||||
$multConstant = mt\Parameter::getVal('circuit_score_mult_constant',1);
|
$multConstant = mt\Parameter::getVal('circuit_score_mult_constant',1);
|
||||||
$shiftConstant = mt\Parameter::getVal('circuit_score_shift_constant',1);
|
$shiftConstant = mt\Parameter::getVal('circuit_score_shift_constant',1);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user